wxClipboard::IsOpened() and wxCLipboardLocker helper class added

[wxWidgets.git] / include / wx / gtk1 / control.h

diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h
index f18f219d8c691229e212d30683432ae21183302e..5ae7c44043a9344245116db3befa4c6bba48dee0 100644 (file)
--- a/include/wx/gtk1/control.h
+++ b/include/wx/gtk1/control.h
@@ -29,10 +29,8 @@ class wxControl;
 // wxControl
 //-----------------------------------------------------------------------------
 
 // wxControl
 //-----------------------------------------------------------------------------
 

-class wxControl : public wxWindow
+class wxControl : public wxControlBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxControl)
-

 public:
     wxControl();
     wxControl( wxWindow *parent,
 public:
     wxControl();
     wxControl( wxWindow *parent,


@@ -50,6 +48,9 @@ public:
 protected:
     wxString   m_label;
     char       m_chAccel;  // enabled to avoid breaking binary compatibility later on
 protected:
     wxString   m_label;
     char       m_chAccel;  // enabled to avoid breaking binary compatibility later on

+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxControl)

 };
 
 #endif // __GTKCONTROLH__
 };
 
 #endif // __GTKCONTROLH__