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

fix after patch 802882

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-09-20 18:34:57 +00:00
parent ace3ed2ef0
commit 0ae0bb792b
1 changed files with 24 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
include/wx/ctrlsub.h
View File

@@ -115,57 +115,40 @@ protected:
wxClientDataType m_clientDataItemsType; wxClientDataType m_clientDataItemsType;
}; };
// this macro must (unfortunately) be used in any class deriving from both
// wxItemContainer and wxControl because otherwise there is ambiguity when
// calling GetClientXXX() functions -- the compiler can't choose between the
// two versions
#define wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST \
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); }
class WXDLLEXPORT wxControlWithItems : public wxControl, public wxItemContainer class WXDLLEXPORT wxControlWithItems : public wxControl, public wxItemContainer
{ {
public: public:
wxControlWithItems() { } wxControlWithItems() { }
virtual ~wxControlWithItems(); virtual ~wxControlWithItems();
// we have to redefine these functions here to avoid ambiguities in classes // we have to redefine these functions here to avoid ambiguities in classes
// deriving from us which would arise otherwise because both base classses // deriving from us which would arise otherwise because both base classses
// have the methods with the same names - hopefully, a smart compiler can // have the methods with the same names - hopefully, a smart compiler can
// optimize away these simple inline wrappers so we don't suffer much from // optimize away these simple inline wrappers so we don't suffer much from
// this // this
wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
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);
}
private: private:
DECLARE_NO_COPY_CLASS(wxControlWithItems) DECLARE_NO_COPY_CLASS(wxControlWithItems)