renamed m_boxes to m_buttons because, well, it contains the radio buttons and not...

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

diff --git a/include/wx/control.h b/include/wx/control.h
index 5fd882ce0c3210a246fd2da3fd23769f0c602726..1432d67e5cf14169993ddac808546f18b19bac71 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -16,27 +16,22 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "controlbase.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_CONTROLS
 
 #include "wx/window.h"      // base class
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxControlNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxControl is the base class for all controls
 // ----------------------------------------------------------------------------
 
-
 class WXDLLEXPORT wxControlBase : public wxWindow
 {
 public:
-    wxControlBase() { Init(); }
+    wxControlBase() { }
 
     virtual ~wxControlBase();
 
@@ -64,16 +59,13 @@ public:
     // if the button was clicked)
     virtual void Command(wxCommandEvent &event);
 
-        
-    virtual void SetLabel(const wxString& label);
+    virtual void SetLabel( const wxString &label );
     virtual bool SetFont(const wxFont& font);
-    virtual bool GetAdjustMinSizeFlag() const { return m_adjustMinSize; }
-    void SetAdjustMinSizeFlag(bool adjust) { m_adjustMinSize = adjust; }
-    
-    
+
+    // wxControl-specific processing after processing the update event
+    virtual void DoUpdateWindowUI(wxUpdateUIEvent& event);
+
 protected:
-    void Init();
-    
     // creates the control (calls wxWindowBase::CreateBase inside) and adds it
     // to the list of parents children
     bool CreateControl(wxWindowBase *parent,
@@ -98,9 +90,6 @@ protected:
         SetBestSize(size);
     }
 
-    // should minsize and size be adjusted when font or label change?
-    bool        m_adjustMinSize;  
-    
     DECLARE_NO_COPY_CLASS(wxControlBase)
 };
 
@@ -110,12 +99,16 @@ protected:
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/control.h"
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/control.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/control.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/control.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/control.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/control.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/control.h"
 #elif defined(__WXCOCOA__)