Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

derive wxComboBox from wxItemContainer (via wxComboBoxBase) in wxGTK (patch 802882)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-09-20 16:31:06 +00:00
parent a6fc611aa1
commit 6f6f938f3a
6 changed files with 99 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
include/wx/univ/combobox.h
View File

@@ -279,54 +279,7 @@ public:
void SetStringSelection(const wxString& WXUNUSED(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);
}
wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
protected:
virtual int DoAppend(const wxString& item);