compilation fixes (I wonder how did you people ever compile it...)

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

diff --git a/include/wx/gtk1/radiobox.h b/include/wx/gtk1/radiobox.h
index b28499448ea4c688337953d252059bdd256efe62..6ecfc59a1755248426bd9c6b0909ec634423daea 100644 (file)
--- a/include/wx/gtk1/radiobox.h
+++ b/include/wx/gtk1/radiobox.h
@@ -15,55 +15,46 @@
 #pragma interface
 #endif
 
-#include "wx/defs.h"
-
-#if wxUSE_RADIOBOX
-
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
 #include "wx/bitmap.h"
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxRadioBox;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxRadioBoxNameStr;
-
 //-----------------------------------------------------------------------------
 // wxRadioBox
 //-----------------------------------------------------------------------------
 
 class wxRadioBox: public wxControl
 {
-
-  DECLARE_DYNAMIC_CLASS(wxRadioBox)
-  
 public:
-    wxRadioBox();
-    inline wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title,
-             const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-             int n = 0, const wxString choices[] = (const wxString *) NULL,
-             int majorDim = 1, long style = wxRA_HORIZONTAL,
-             const wxValidator& val = wxDefaultValidator, 
-             const wxString& name = wxRadioBoxNameStr )
+    wxRadioBox() { Init(); }
+    wxRadioBox(wxWindow *parent,
+               wxWindowID id,
+               const wxString& title,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               int n = 0,
+               const wxString choices[] = (const wxString *) NULL,
+               int majorDim = 1,
+               long style = wxRA_HORIZONTAL,
+               const wxValidator& val = wxDefaultValidator, 
+               const wxString& name = wxRadioBoxNameStr)
     {
-      Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
+        Init();
+
+        Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
     }
-    ~wxRadioBox(void);
-    bool Create( wxWindow *parent, wxWindowID id, const wxString& title,
-             const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-             int n = 0, const wxString choices[] = (const wxString *) NULL,
-             int majorDim = 0, long style = wxRA_HORIZONTAL,
-             const wxValidator& val = wxDefaultValidator, 
-             const wxString& name = wxRadioBoxNameStr );
-            
+
+    ~wxRadioBox();
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                int n = 0,
+                const wxString choices[] = (const wxString *) NULL,
+                int majorDim = 0,
+                long style = wxRA_HORIZONTAL,
+                const wxValidator& val = wxDefaultValidator, 
+                const wxString& name = wxRadioBoxNameStr);
+
     int FindString( const wxString& s) const;
     void SetSelection( int n );
     int GetSelection() const;
@@ -87,26 +78,38 @@ public:
     virtual wxString GetStringSelection() const;
     virtual bool SetStringSelection( const wxString& s );
     
-    virtual int Number() const;
+    int Number() const;
+    int GetCount() const { return Number(); }
     int GetNumberOfRowsOrCols() const;
     void SetNumberOfRowsOrCols( int n );
     
-    void OnSize( wxSizeEvent &event );
-    void SetFocus();
-    
-  // implementation    
+    // implementation
+    // --------------
     
+    void SetFocus();
+    void GtkDisableEvents();
+    void GtkEnableEvents();
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
+#if wxUSE_TOOLTIPS
+    void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
+#endif // wxUSE_TOOLTIPS
     wxSize LayoutItems();
+
+    virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );
+    virtual void OnInternalIdle();
     
-    bool             m_alreadySent;
+    bool             m_hasFocus,
+                     m_lostFocus;
     int              m_majorDim;
     wxList           m_boxes;
-    
-  DECLARE_EVENT_TABLE()    
-};
 
-#endif
+protected:
+    // common part of all ctors
+    void Init();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxRadioBox)
+};
 
 #endif // __GTKRADIOBOXH__