X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..8366ae934aab9f835747b0c2e456231e8795fe78:/include/wx/univ/combobox.h diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h index 2b8c141588..e37418390a 100644 --- a/include/wx/univ/combobox.h +++ b/include/wx/univ/combobox.h @@ -5,7 +5,7 @@ // Modified by: // Created: 30.08.00 // RCS-ID: $Id$ -// Copyright: (c) 2000 Vadim Zeitlin +// Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -43,6 +43,8 @@ class WXDLLEXPORT wxComboControl; class WXDLLEXPORT wxListBox; class WXDLLEXPORT wxPopupComboWindow; +class WXDLLEXPORT wxTextCtrl; +class WXDLLEXPORT wxButton; // ---------------------------------------------------------------------------- // the actions supported by this control @@ -172,7 +174,7 @@ protected: const wxString& strArg = wxEmptyString); // event handlers - void OnKey(wxCommandEvent& event); + void OnKey(wxKeyEvent& event); // common part of all ctors void Init(); @@ -268,6 +270,8 @@ public: virtual void Select(int n); virtual int GetSelection() const; void SetSelection(int n) { Select(n); } + + void SetStringSelection(const wxString& s) { } protected: virtual int DoAppend(const wxString& item); @@ -299,7 +303,7 @@ class WXDLLEXPORT wxStdComboBoxInputHandler : public wxStdInputHandler public: wxStdComboBoxInputHandler(wxInputHandler *inphand); - virtual bool HandleKey(wxControl *control, + virtual bool HandleKey(wxInputConsumer *consumer, const wxKeyEvent& event, bool pressed); };