Explicit casting/instantiation to resolve ambiguous overload.

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

diff --git a/include/wx/gtk1/radiobox.h b/include/wx/gtk1/radiobox.h
index 1477aaadd2fe02cd15b395bcd09cac90ffc81b30..a73c1a608e49cdf0a52bb1b63f900ce26f44d4d9 100644 (file)
--- a/include/wx/gtk1/radiobox.h
+++ b/include/wx/gtk1/radiobox.h
@@ -2,10 +2,9 @@
 // Name:        radiobox.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -43,50 +42,66 @@ 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[] = NULL,
-             int majorDim = 0, long style = wxRA_HORIZONTAL,
+             int n = 0, const wxString choices[] = (const wxString *) NULL,
+             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 );
     }
+    ~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[] = NULL,
+             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(void) 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 );
-
-  private:
-  
-    GtkRadioButton *m_radio;
     
-  public:
-  
-    bool            m_alreadySent;
+    void OnSize( wxSizeEvent &event );
+    void SetFocus();
+    
+  // implementation    
+    
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void ApplyWidgetStyle();
+    wxSize LayoutItems();
+    
+    bool             m_alreadySent;
+    int              m_majorDim;
+    wxList           m_boxes;
+    
+  DECLARE_EVENT_TABLE()    
 };
 
 #endif // __GTKRADIOBOXH__