X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40eb3606eb203081057e7716b697f6617a95c2d3..c59f6793fb6c116e6b9abdaca4de0c4a08a0e5b0:/include/wx/gtk1/choice.h diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h index f3c28565c9..5b0526a275 100644 --- a/include/wx/gtk1/choice.h +++ b/include/wx/gtk1/choice.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: choice.h +// Name: wx/gtk/choice.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -10,10 +10,6 @@ #ifndef __GTKCHOICEH__ #define __GTKCHOICEH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "choice.h" -#endif - class WXDLLIMPEXP_BASE wxSortedArrayString; class WXDLLIMPEXP_BASE wxArrayString; @@ -70,13 +66,11 @@ public: void Clear(); int GetSelection() const; -#if wxABI_VERSION >= 20602 int GetCurrentSelection() const { return GetSelection(); } -#endif void SetSelection( int n ); virtual int GetCount() const; - int FindString( const wxString& string ) const; + virtual int FindString(const wxString& s, bool bCase = false) const; wxString GetString( int n ) const; void SetString( int n, const wxString& string ); @@ -108,8 +102,8 @@ private: wxSortedArrayString *m_strings; public: - // this circumvents a GTK+ 2.0 bug so that the selection is - // invalidated properly + // this circumvents a GTK+ 2.0 bug so that the selection is + // invalidated properly int m_selection_hack; private: