X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4ca49cde3c56f0f7b249fc62925df3d99ab3c58..1d54b9d29706dbb43de5624bdf4a2aaa74b2350b:/include/wx/gtk/radiobox.h

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index cfdcef9c94..3eeb57552b 100644
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -21,7 +21,7 @@
 // wxRadioBox
 //-----------------------------------------------------------------------------
 
-class wxRadioBox: public wxControl
+class WXDLLIMPEXP_CORE wxRadioBox: public wxControl
 {
 public:
     wxRadioBox() { Init(); }
@@ -87,29 +87,29 @@ public:
     wxString GetString( int n ) const;
     void SetString( int n, const wxString& label );
 
-    void Show( int item, bool show );
-    void Enable( int item, bool enable );
+    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 );
 
     int GetCount() const;
-    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); }
+    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 );
+    virtual bool Show( bool show = true );
+    virtual bool Enable( bool enable = true );
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     // implementation
     // --------------
@@ -118,16 +118,11 @@ public:
     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
 
-    // reposition the radio buttons correctly unless justCalc == true and
-    // reutrn the total size needed to accomodate them
-    wxSize LayoutItems(bool justCalc) const;
-
-    virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );
     virtual void OnInternalIdle();
 
     bool             m_hasFocus,
@@ -136,12 +131,13 @@ public:
     wxList           m_boxes;
 
 protected:
-    // implement some base class methods
-    virtual wxSize DoGetBestSize() const;
-
     // 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)
 };