X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b292e2f512fa9b25e2d2928604ab884b00e6c6bf..559fe022dbd5d4d961402b5c973e5225fa91f17f:/include/wx/gtk1/radiobox.h?ds=sidebyside

diff --git a/include/wx/gtk1/radiobox.h b/include/wx/gtk1/radiobox.h
index cfd3a0242a..06402b021a 100644
--- a/include/wx/gtk1/radiobox.h
+++ b/include/wx/gtk1/radiobox.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -16,6 +16,9 @@
 #endif
 
 #include "wx/defs.h"
+
+#if wxUSE_RADIOBOX
+
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
@@ -39,18 +42,14 @@ extern const char *wxRadioBoxNameStr;
 
 class wxRadioBox: public wxControl
 {
-
-  DECLARE_DYNAMIC_CLASS(wxRadioBox)
-  
-  public:
-  
-    wxRadioBox(void);
+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 = 0, long style = wxRA_HORIZONTAL,
+             int majorDim = 1, long style = wxRA_HORIZONTAL,
              const wxValidator& val = wxDefaultValidator, 
-	     const wxString& name = wxRadioBoxNameStr )
+             const wxString& name = wxRadioBoxNameStr )
     {
       Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
     }
@@ -60,37 +59,54 @@ class wxRadioBox: public wxControl
              int n = 0, const wxString choices[] = (const wxString *) NULL,
              int majorDim = 0, long style = wxRA_HORIZONTAL,
              const wxValidator& val = wxDefaultValidator, 
-	     const wxString& name = wxRadioBoxNameStr );
+             const wxString& name = wxRadioBoxNameStr );
+	     
     int FindString( const wxString& s) const;
     void SetSelection( int n );
-    int GetSelection(void) const;
+    int GetSelection() const;
+    
     wxString GetString( int n ) const;
+    
+    wxString GetLabel( int item ) const;
+    wxString GetLabel() const { return wxControl::GetLabel(); }
     void SetLabel( const wxString& label );
     void SetLabel( int item, const wxString& label );
+    
+    /* doesn't work */
     void SetLabel( int item, wxBitmap *bitmap );
-    wxString GetLabel( int item ) const;
+    
     bool Show( bool show );
-    void Enable( bool enable );
-    void Enable( int item, bool enable );
     void Show( int item, bool show );
-    virtual wxString GetStringSelection(void) const;
+    
+    bool Enable( bool enable );
+    void Enable( int item, bool enable );
+    
+    virtual wxString GetStringSelection() const;
     virtual bool SetStringSelection( const wxString& s );
-    virtual int Number(void) const;
-    int GetNumberOfRowsOrCols(void) const;
+    
+    virtual int Number() const;
+    int GetNumberOfRowsOrCols() const;
     void SetNumberOfRowsOrCols( int n );
     
-    void OnSize( wxSizeEvent &event );
     void SetFocus();
     
   // implementation    
     
+    void DisableEvents();
+    void EnableEvents();
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
+    wxSize LayoutItems();
+    void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );
     
     bool             m_alreadySent;
+    int              m_majorDim;
     wxList           m_boxes;
     
-  DECLARE_EVENT_TABLE()    
+private:
+    DECLARE_DYNAMIC_CLASS(wxRadioBox)
 };
 
+#endif
+
 #endif // __GTKRADIOBOXH__