test

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

diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h
index 3b19b4c98c962b7ba33d20951b6feab35cab1015..e7869e4f0e7de21cf8a730f7ff83690edd49c521 100644 (file)
--- a/include/wx/gtk1/control.h
+++ b/include/wx/gtk1/control.h
@@ -29,7 +29,7 @@ class wxControl;
 // wxControl
 //-----------------------------------------------------------------------------
 
 // wxControl
 //-----------------------------------------------------------------------------
 

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

 {
 public:
     wxControl();
 {
 public:
     wxControl();


@@ -46,6 +46,8 @@ public:
     virtual wxString GetLabel() const;
 
 protected:
     virtual wxString GetLabel() const;
 
 protected:

+    virtual wxSize DoGetBestSize() const;
+

     wxString   m_label;
     char       m_chAccel;  // enabled to avoid breaking binary compatibility later on
     
     wxString   m_label;
     char       m_chAccel;  // enabled to avoid breaking binary compatibility later on