X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cb172b4f12fae80b06d5936108a1bc7f2521674..70b8ab778fc3f9f89874a242bfa014f2b313c59b:/include/wx/univ/combobox.h?ds=inline diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h index ec3baf4390..afccb74711 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 /////////////////////////////////////////////////////////////////////////////// @@ -37,7 +37,7 @@ #define _WX_UNIV_COMBOBOX_H_ #ifdef __GNUG__ - #pragma implementation "univcombobox.h" + #pragma interface "univcombobox.h" #endif class WXDLLEXPORT wxComboControl; @@ -174,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(); @@ -271,6 +271,57 @@ public: virtual int GetSelection() const; void SetSelection(int n) { Select(n); } + void SetStringSelection(const wxString& s) { } + + // we have to redefine these functions here to avoid ambiguities in classes + // deriving from us which would arise otherwise because we inherit these + // methods (with different signatures) from both wxItemContainer via + // wxComboBoxBase (with "int n" parameter) and from wxEvtHandler via + // wxControl and wxComboControl (without) + // + // hopefully, a smart compiler can optimize away these simple inline + // wrappers so we don't suffer much from this + + void SetClientData(void *data) + { + wxControl::SetClientData(data); + } + + void *GetClientData() const + { + return wxControl::GetClientData(); + } + + void SetClientObject(wxClientData *data) + { + wxControl::SetClientObject(data); + } + + wxClientData *GetClientObject() const + { + return wxControl::GetClientObject(); + } + + void SetClientData(int n, void* clientData) + { + wxItemContainer::SetClientData(n, clientData); + } + + void* GetClientData(int n) const + { + return wxItemContainer::GetClientData(n); + } + + void SetClientObject(int n, wxClientData* clientData) + { + wxItemContainer::SetClientObject(n, clientData); + } + + wxClientData* GetClientObject(int n) const + { + return wxItemContainer::GetClientObject(n); + } + protected: virtual int DoAppend(const wxString& item); virtual void DoSetItemClientData(int n, void* clientData); @@ -301,7 +352,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); };