X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d99be5f5381dad56492da02c2df1c3ec0750926..0185cd097844887c308a81fbd137676086ae8580:/include/wx/gtk1/control.h

diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h
index 45d0ea230e..93b2e82566 100644
--- a/include/wx/gtk1/control.h
+++ b/include/wx/gtk1/control.h
@@ -29,10 +29,10 @@ class wxControl;
 // wxControl
 //-----------------------------------------------------------------------------
 
+extern const wxChar* wxControlNameStr;
+
 class wxControl : public wxControlBase
 {
-    DECLARE_DYNAMIC_CLASS(wxControl)
-
 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__