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 cf76a447e56a85b4694df6bcb215adb02102aea4..3eeb57552b72425e60e4eb4314373ca8b28fe942 100644 (file)
--- 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,7 +87,7 @@ public:
     wxString GetString( int n ) const;
     void SetString( int n, const wxString& label );
 
-    void Show( int item, bool show );
+    virtual bool Show( int item, bool show = true );
     virtual bool Enable( int item, bool enable = true );
 
     virtual wxString GetStringSelection() const;
@@ -123,11 +123,6 @@ public:
     void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
 #endif // wxUSE_TOOLTIPS
 
-    // reposition the radio buttons correctly unless justCalc == true and
-    // return the total size needed to accommodate 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)
 };