define __GNUWIN32_OLD__ for cygwin32 too

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

diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h
index f18f219d8c691229e212d30683432ae21183302e..93b2e8256605eef3aa06dc5e5c9c01699d0db28a 100644 (file)
--- a/include/wx/gtk/control.h
+++ b/include/wx/gtk/control.h
@@ -29,10 +29,10 @@ class wxControl;
 // wxControl
 //-----------------------------------------------------------------------------
 
-class wxControl : public wxWindow
-{
-    DECLARE_DYNAMIC_CLASS(wxControl)
+extern const wxChar* wxControlNameStr;
 
+class wxControl : public wxControlBase
+{
 public:
     wxControl();
     wxControl( wxWindow *parent,
@@ -40,7 +40,17 @@ public:
                const wxPoint &pos = wxDefaultPosition,
                const wxSize &size = wxDefaultSize,
                long style = 0,
-               const wxString &name = wxPanelNameStr );
+               const wxString &name = wxControlNameStr );
+
+#if wxUSE_VALIDATORS
+    wxControl( wxWindow *parent,
+               wxWindowID id,
+               const wxPoint &pos = wxDefaultPosition,
+               const wxSize &size = wxDefaultSize,
+               long style = 0,
+               const wxValidator& validator = wxDefaultValidator,
+               const wxString &name = wxControlNameStr );
+#endif
 
     // this function will filter out '&' characters and will put the accelerator
     // char (the one immediately after '&') into m_chAccel (TODO not yet)
@@ -48,8 +58,13 @@ public:
     virtual wxString GetLabel() const;
 
 protected:
+    virtual wxSize DoGetBestSize() const;
+
     wxString   m_label;
     char       m_chAccel;  // enabled to avoid breaking binary compatibility later on
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxControl)
 };
 
 #endif // __GTKCONTROLH__