X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd0a76e228b5ce47c648c2e52857e77cf79e6ae5..6b5a2b6fe96bb791c685c671f348d2710e4a4ab4:/include/wx/gtk/radiobox.h

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index 0791f740c3..1c9de3b9de 100644
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -7,21 +7,16 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKRADIOBOXH__
 #define __GTKRADIOBOXH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
 #include "wx/bitmap.h"
 
 //-----------------------------------------------------------------------------
 // wxRadioBox
 //-----------------------------------------------------------------------------
 
-class wxRadioBox: public wxControl
+class WXDLLIMPEXP_CORE wxRadioBox: public wxControl
 {
 public:
     wxRadioBox() { Init(); }
@@ -80,34 +75,26 @@ public:
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 
-    int FindString( const wxString& s) const;
+    virtual int FindString(const wxString& s, bool bCase = false) const;
     void SetSelection( int n );
     int GetSelection() const;
 
     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;
 
-    // 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 );
+    virtual bool Show( bool show = true );
+    virtual bool Enable( bool enable = true );
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
@@ -124,11 +111,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,
@@ -137,12 +119,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)
 };