fix monodll build

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

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index 6ecfc59a1755248426bd9c6b0909ec634423daea..97a318bdcd09d93dd72e9a85514204ae2508d039 100644 (file)
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -1,17 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        radiobox.h
+// Name:        wx/gtk/radiobox.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:           wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKRADIOBOXH__
 #define __GTKRADIOBOXH__
 
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKRADIOBOXH__
 #define __GTKRADIOBOXH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -34,7 +34,7 @@ public:
                const wxString choices[] = (const wxString *) NULL,
                int majorDim = 1,
                long style = wxRA_HORIZONTAL,
                const wxString choices[] = (const wxString *) NULL,
                int majorDim = 1,
                long style = wxRA_HORIZONTAL,

-               const wxValidator& val = wxDefaultValidator, 
+               const wxValidator& val = wxDefaultValidator,

                const wxString& name = wxRadioBoxNameStr)
     {
         Init();
                const wxString& name = wxRadioBoxNameStr)
     {
         Init();


@@ -42,7 +42,7 @@ public:
         Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
     }
 
         Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
     }
 

-    ~wxRadioBox();
+    virtual ~wxRadioBox();

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


@@ -52,40 +52,43 @@ public:
                 const wxString choices[] = (const wxString *) NULL,
                 int majorDim = 0,
                 long style = wxRA_HORIZONTAL,
                 const wxString choices[] = (const wxString *) NULL,
                 int majorDim = 0,
                 long style = wxRA_HORIZONTAL,

-                const wxValidator& val = wxDefaultValidator, 
+                const wxValidator& val = wxDefaultValidator,

                 const wxString& name = wxRadioBoxNameStr);
 
     int FindString( const wxString& s) const;
     void SetSelection( int n );
     int GetSelection() const;
                 const wxString& name = wxRadioBoxNameStr);
 
     int FindString( const wxString& s) const;
     void SetSelection( int n );
     int GetSelection() const;

-    
+

     wxString GetString( int n ) 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 );
-    
-    bool Show( bool show );
+    void SetString( int n, const wxString& label );
+

     void Show( int item, bool show );
     void Show( int item, bool show );

-    
-    bool Enable( bool enable );

     void Enable( int item, bool enable );
     void Enable( int item, bool enable );

-    
+

     virtual wxString GetStringSelection() const;
     virtual bool SetStringSelection( const wxString& s );
     virtual wxString GetStringSelection() const;
     virtual bool SetStringSelection( const wxString& s );

-    
-    int Number() const;
-    int GetCount() const { return Number(); }
+
+    int GetCount() const;

     int GetNumberOfRowsOrCols() const;
     void SetNumberOfRowsOrCols( int n );
     int GetNumberOfRowsOrCols() const;
     void SetNumberOfRowsOrCols( int n );

-    
+
+    // for compatibility only, don't use these methods in new code!
+#if WXWIN_COMPATIBILITY_2_2
+    int Number() const { return GetCount(); }
+    wxString GetLabel(int n) const { return GetString(n); }
+    void SetLabel( int item, const wxString& label )
+        { SetString(item, label); }
+#endif // WXWIN_COMPATIBILITY_2_2
+
+    // we have to override those to avoid virtual function name hiding
+    virtual wxString GetLabel() const { return wxControl::GetLabel(); }
+    virtual void SetLabel( const wxString& label );
+    virtual bool Show( bool show = TRUE );
+    virtual bool Enable( bool enable = TRUE );
+

     // implementation
     // --------------
     // implementation
     // --------------

-    
+

     void SetFocus();
     void GtkDisableEvents();
     void GtkEnableEvents();
     void SetFocus();
     void GtkDisableEvents();
     void GtkEnableEvents();


@@ -98,7 +101,7 @@ public:
 
     virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );
     virtual void OnInternalIdle();
 
     virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );
     virtual void OnInternalIdle();

-    
+

     bool             m_hasFocus,
                      m_lostFocus;
     int              m_majorDim;
     bool             m_hasFocus,
                      m_lostFocus;
     int              m_majorDim;