Minor modifications...

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

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index c1218fc449dbd900c3cad34733410013921b7b39..e30d8f00a1af7daa3ab8e937900db92e6427797d 100644 (file)
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -46,21 +46,26 @@ class wxRadioBox: public wxControl
   public:
   
     wxRadioBox(void);
   public:
   
     wxRadioBox(void);

-    wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-      int n = 0, const wxString choices[] = NULL,
-      int majorDim = 0, long style = wxRA_HORIZONTAL,
-      const wxString &name = wxRadioBoxNameStr );
+    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 = 0, long style = wxRA_HORIZONTAL,
+             const wxValidator& val = wxDefaultValidator, 
+            const wxString& name = wxRadioBoxNameStr )
+    {
+      Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
+    }
+    ~wxRadioBox(void);

     bool Create( wxWindow *parent, wxWindowID id, const wxString& title,
     bool Create( wxWindow *parent, wxWindowID id, const wxString& title,

-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-      int n = 0, const wxString choices[] = NULL,
-      int majorDim = 0, long style = wxRA_HORIZONTAL,
-      const wxString &name = wxRadioBoxNameStr );
+             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(void) const;
     wxString GetString( int n ) const;
     int FindString( const wxString& s) const;
     void SetSelection( int n );
     int GetSelection(void) const;
     wxString GetString( int n ) const;

-    wxString GetLabel(void) const;

     void SetLabel( const wxString& label );
     void SetLabel( int item, const wxString& label );
     void SetLabel( int item, wxBitmap *bitmap );
     void SetLabel( const wxString& label );
     void SetLabel( int item, const wxString& label );
     void SetLabel( int item, wxBitmap *bitmap );


@@ -74,14 +79,19 @@ class wxRadioBox: public wxControl
     virtual int Number(void) const;
     int GetNumberOfRowsOrCols(void) const;
     void SetNumberOfRowsOrCols( int n );
     virtual int Number(void) const;
     int GetNumberOfRowsOrCols(void) const;
     void SetNumberOfRowsOrCols( int n );

-
-  private:
-  
-    GtkRadioButton *m_radio;

     
     

-  public:
-  
-    bool            m_alreadySent;
+    void SetFont( const wxFont &font );
+    void SetBackgroundColour( const wxColour &colour );
+    void OnSize( wxSizeEvent &event );
+    
+  // implementation    
+    
+    bool IsOwnGtkWindow( GdkWindow *window );
+    
+    bool             m_alreadySent;
+    wxList           m_boxes;
+    
+  DECLARE_EVENT_TABLE()    

 };
 
 #endif // __GTKRADIOBOXH__
 };
 
 #endif // __GTKRADIOBOXH__