fixed virtual function hiding for LoadBitmap()

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

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index 16af2a266897c550427181753a5ebfb06461943d..3eeb57552b72425e60e4eb4314373ca8b28fe942 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(NO_GCC_PRAGMA)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -21,7 +21,7 @@
 // wxRadioBox
 //-----------------------------------------------------------------------------
 
 // wxRadioBox
 //-----------------------------------------------------------------------------
 

-class wxRadioBox: public wxControl
+class WXDLLIMPEXP_CORE wxRadioBox: public wxControl

 {
 public:
     wxRadioBox() { Init(); }
 {
 public:
     wxRadioBox() { Init(); }


@@ -34,15 +34,30 @@ 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();
 
         Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
     }
                const wxString& name = wxRadioBoxNameStr)
     {
         Init();
 
         Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
     }

+    wxRadioBox(wxWindow *parent,
+               wxWindowID id,
+               const wxString& title,
+               const wxPoint& pos,
+               const wxSize& size,
+               const wxArrayString& choices,
+               int majorDim = 1,
+               long style = wxRA_HORIZONTAL,
+               const wxValidator& val = wxDefaultValidator,
+               const wxString& name = wxRadioBoxNameStr)
+    {
+        Init();
+
+        Create( parent, id, title, pos, size, 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,54 +67,64 @@ 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);
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                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;
                 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 Show( int item, bool show );
-    
-    bool Enable( bool enable );
-    void Enable( int item, bool enable );
-    
+    void SetString( int n, const wxString& label );
+
+    virtual bool Show( int item, bool show = true );
+    virtual bool Enable( int item, bool enable = true );
+

     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 GetNumberOfRowsOrCols() const;
-    void SetNumberOfRowsOrCols( int n );
-    
+
+    int GetCount() const;
+
+    // for compatibility only, don't use these methods in new code!
+#if WXWIN_COMPATIBILITY_2_2
+    wxDEPRECATED( int Number() const );
+    wxDEPRECATED( wxString GetLabel(int n) const );
+    wxDEPRECATED( void SetLabel( int item, const wxString& 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 );
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+

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

-    
+

     void SetFocus();
     void GtkDisableEvents();
     void GtkEnableEvents();
     bool IsOwnGtkWindow( GdkWindow *window );
     void SetFocus();
     void GtkDisableEvents();
     void GtkEnableEvents();
     bool IsOwnGtkWindow( GdkWindow *window );

-    void ApplyWidgetStyle();
+    void DoApplyWidgetStyle(GtkRcStyle *style);

 #if wxUSE_TOOLTIPS
     void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
 #endif // wxUSE_TOOLTIPS
 #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();
     virtual void OnInternalIdle();

-    
-    bool             m_alreadySent;
+

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


@@ -109,6 +134,10 @@ protected:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

+    // check that the index is valid
+    // FIXME: remove once GTK will derive from wxRadioBoxBase
+    inline bool IsValid(int n) const { return n >= 0 && n < GetCount(); }
+

 private:
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 };