X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d8268a1d64de58aab194e4d8ae800c755990aad..4d53859584e0fb987fef609c620937e46b0f751a:/include/wx/mac/carbon/combobox.h?ds=inline diff --git a/include/wx/mac/carbon/combobox.h b/include/wx/mac/carbon/combobox.h index b72509253d..4e2520991c 100644 --- a/include/wx/mac/carbon/combobox.h +++ b/include/wx/mac/carbon/combobox.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: combobox.h +// Name: wx/mac/carbon/combobox.h // Purpose: wxComboBox class // Author: Stefan Csomor // Modified by: @@ -12,10 +12,6 @@ #ifndef _WX_COMBOBOX_H_ #define _WX_COMBOBOX_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "combobox.h" -#endif - #include "wx/choice.h" WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr; @@ -91,13 +87,12 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase virtual void Clear(); virtual int GetSelection() const ; + int GetCurrentSelection() const { return GetSelection(); } virtual void SetSelection(int n); - virtual void Select(int n) { SetSelection(n) ; } - virtual int FindString(const wxString& s) const; + virtual int FindString(const wxString& s, bool bCase = false) const; virtual wxString GetString(int n) const ; virtual wxString GetStringSelection() const ; virtual void SetString(int n, const wxString& s) ; - virtual bool SetStringSelection(const wxString& sel); // Text field functions virtual wxString GetValue() const ;