Visualage C++ V4.0 has a native long long data type.

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

diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h
index 3b19b4c98c962b7ba33d20951b6feab35cab1015..93b2e8256605eef3aa06dc5e5c9c01699d0db28a 100644 (file)
--- a/include/wx/gtk/control.h
+++ b/include/wx/gtk/control.h
@@ -29,7 +29,9 @@ class wxControl;
 // wxControl
 //-----------------------------------------------------------------------------
 
-class wxControl : public wxWindow
+extern const wxChar* wxControlNameStr;
+
+class wxControl : public wxControlBase
 {
 public:
     wxControl();
@@ -38,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)
@@ -46,9 +58,11 @@ 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)
 };