test

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

diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h
index d3a164d27500d988b313ccf7488780c4da686f3f..e7869e4f0e7de21cf8a730f7ff83690edd49c521 100644 (file)
--- a/include/wx/gtk1/control.h
+++ b/include/wx/gtk1/control.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKCONTROLH__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKCONTROLH__


@@ -29,27 +29,30 @@ class wxControl;
 // wxControl
 //-----------------------------------------------------------------------------
 
 // wxControl
 //-----------------------------------------------------------------------------
 

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

 {
 {

-DECLARE_DYNAMIC_CLASS(wxControl)
-

 public:
 public:

-  wxControl();
-  wxControl( wxWindow *parent, wxWindowID id, 
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      long style = 0, const wxString &name = wxPanelNameStr  );
-  
-  virtual void Command( wxCommandEvent &event );
+    wxControl();
+    wxControl( wxWindow *parent,
+               wxWindowID id,
+               const wxPoint &pos = wxDefaultPosition,
+               const wxSize &size = wxDefaultSize,
+               long style = 0,
+               const wxString &name = wxPanelNameStr );

 
     // this function will filter out '&' characters and will put the accelerator
 
     // this function will filter out '&' characters and will put the accelerator

-    // char (the one immediately after '&') into m_chAccel (@@ not yet)
-  virtual void SetLabel( const wxString &label );
-  virtual wxString GetLabel() const;
-  
+    // char (the one immediately after '&') into m_chAccel (TODO not yet)
+    virtual void SetLabel( const wxString &label );
+    virtual wxString GetLabel() const;
+

 protected:
 protected:

-  wxString   m_label;
-  char       m_chAccel;  // enabled to avoid breaking binary compatibility later on
-  
+    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__
 };
 
 #endif // __GTKCONTROLH__