X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..5cce8340b28be2eecea1822434eeff7055840f9c:/src/univ/combobox.cpp?ds=inline diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp index 413a6cdc36..f995bd06d0 100644 --- a/src/univ/combobox.cpp +++ b/src/univ/combobox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: univ/combobox.cpp +// Name: src/univ/combobox.cpp // Purpose: wxComboControl and wxComboBox implementation // Author: Vadim Zeitlin // Modified by: @@ -127,6 +127,11 @@ public: virtual void SetSelection(int n) { DoSetSelection(n, true); } void SetSelection(int n, bool select) { DoSetSelection(n, select); } + // used to process wxUniv actions + bool PerformAction(const wxControlAction& action, + long numArg, + const wxString& strArg); + protected: // we shouldn't return height too big from here virtual wxSize DoGetBestClientSize() const; @@ -140,11 +145,6 @@ protected: // called whenever the user selects or activates a listbox item void OnSelect(wxCommandEvent& event); - // used to process wxUniv actions - bool PerformAction(const wxControlAction& action, - long numArg, - const wxString& strArg); - private: // has the mouse been released on this control? bool m_clicked; @@ -825,9 +825,9 @@ void wxComboBox::SetString(int n, const wxString& s) GetLBox()->SetString(n, s); } -int wxComboBox::FindString(const wxString& s) const +int wxComboBox::FindString(const wxString& s, bool bCase) const { - return GetLBox()->FindString(s); + return GetLBox()->FindString(s, bCase); } void wxComboBox::SetSelection(int n)