X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/789f6795165f19cd16f0ba9f799add6a92720454..da9e956384a0619a0ecaa0bd1e4ba26b133b60a9:/include/wx/gtk1/radiobox.h diff --git a/include/wx/gtk1/radiobox.h b/include/wx/gtk1/radiobox.h index 14fdae0c8b..1c9de3b9de 100644 --- a/include/wx/gtk1/radiobox.h +++ b/include/wx/gtk1/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,7 +75,7 @@ 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; @@ -95,13 +90,6 @@ public: 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 ); @@ -123,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, @@ -136,9 +119,6 @@ public: wxList m_boxes; protected: - // implement some base class methods - virtual wxSize DoGetBestSize() const; - // common part of all ctors void Init();