X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c33522fca7cddc441a316f5b9fb50d7685435ba..cce10ca06ba6406cc39d14b8721f5c460b0b4cfc:/include/wx/ctrlsub.h?ds=sidebyside diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h index 109369b489..76f8353220 100644 --- a/include/wx/ctrlsub.h +++ b/include/wx/ctrlsub.h @@ -122,7 +122,7 @@ private: int AppendItems(const wxArrayStringsAdapter& items, void **clientData) { wxASSERT_MSG( GetClientDataType() != wxClientData_Object, - _T("can't mix different types of client data") ); + wxT("can't mix different types of client data") ); return AppendItems(items, clientData, wxClientData_Void); } @@ -131,7 +131,7 @@ private: wxClientData **clientData) { wxASSERT_MSG( GetClientDataType() != wxClientData_Void, - _T("can't mix different types of client data") ); + wxT("can't mix different types of client data") ); return AppendItems(items, reinterpret_cast(clientData), wxClientData_Object); @@ -142,17 +142,17 @@ private: void **clientData, wxClientDataType type) { - wxASSERT_MSG( !IsSorted(), _T("can't insert items in sorted control") ); + wxASSERT_MSG( !IsSorted(), wxT("can't insert items in sorted control") ); wxCHECK_MSG( pos <= GetCount(), wxNOT_FOUND, - _T("position out of range") ); + wxT("position out of range") ); // not all derived classes handle empty arrays correctly in // DoInsertItems() and besides it really doesn't make much sense to do // this (for append it could correspond to creating an initially empty // control but why would anybody need to insert 0 items?) wxCHECK_MSG( !items.IsEmpty(), wxNOT_FOUND, - _T("need something to insert") ); + wxT("need something to insert") ); return DoInsertItems(items, pos, clientData, type); } @@ -167,7 +167,7 @@ private: void **clientData) { wxASSERT_MSG( GetClientDataType() != wxClientData_Object, - _T("can't mix different types of client data") ); + wxT("can't mix different types of client data") ); return InsertItems(items, pos, clientData, wxClientData_Void); } @@ -177,7 +177,7 @@ private: wxClientData **clientData) { wxASSERT_MSG( GetClientDataType() != wxClientData_Void, - _T("can't mix different types of client data") ); + wxT("can't mix different types of client data") ); return InsertItems(items, pos, reinterpret_cast(clientData), @@ -296,8 +296,13 @@ public: void SetClientData(unsigned int n, void* clientData); void* GetClientData(unsigned int n) const; + // SetClientObject() takes ownership of the pointer, GetClientObject() + // returns it but keeps the ownership while DetachClientObject() expects + // the caller to delete the pointer and also resets the internally stored + // one to NULL for this item void SetClientObject(unsigned int n, wxClientData* clientData); wxClientData* GetClientObject(unsigned int n) const; + wxClientData* DetachClientObject(unsigned int n); // return the type of client data stored in this control: usually it just // returns m_clientDataItemsType but must be overridden in the controls @@ -390,41 +395,48 @@ private: 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) \ - { wxEvtHandler::SetClientData(data); } \ - void *GetClientData() const \ - { return wxEvtHandler::GetClientData(); } \ - void SetClientObject(wxClientData *data) \ - { wxEvtHandler::SetClientObject(data); } \ - wxClientData *GetClientObject() const \ - { return wxEvtHandler::GetClientObject(); } \ - void SetClientData(unsigned int n, void* clientData) \ - { wxItemContainer::SetClientData(n, clientData); } \ - void* GetClientData(unsigned int n) const \ - { return wxItemContainer::GetClientData(n); } \ - void SetClientObject(unsigned int n, wxClientData* clientData) \ - { wxItemContainer::SetClientObject(n, clientData); } \ - wxClientData* GetClientObject(unsigned int n) const \ +// Inheriting directly from a wxWindow-derived class and wxItemContainer +// unfortunately introduces an ambiguity for all GetClientXXX() methods as they +// are inherited twice: the "global" versions from wxWindow and the per-item +// versions taking the index from wxItemContainer. +// +// So we need to explicitly resolve them and this helper template class is +// provided to do it. To use it, simply inherit from wxWindowWithItems instead of Window and Container interface directly. +template +class wxWindowWithItems : public W, public C +{ +public: + typedef W BaseWindowClass; + typedef C BaseContainerInterface; + + wxWindowWithItems() { } + + void SetClientData(void *data) + { BaseWindowClass::SetClientData(data); } + void *GetClientData() const + { return BaseWindowClass::GetClientData(); } + void SetClientObject(wxClientData *data) + { BaseWindowClass::SetClientObject(data); } + wxClientData *GetClientObject() const + { return BaseWindowClass::GetClientObject(); } + + void SetClientData(unsigned int n, void* clientData) + { wxItemContainer::SetClientData(n, clientData); } + void* GetClientData(unsigned int n) const + { return wxItemContainer::GetClientData(n); } + void SetClientObject(unsigned int n, wxClientData* clientData) + { wxItemContainer::SetClientObject(n, clientData); } + wxClientData* GetClientObject(unsigned int n) const { return wxItemContainer::GetClientObject(n); } +}; -class WXDLLIMPEXP_CORE wxControlWithItemsBase : public wxControl, - public wxItemContainer +class WXDLLIMPEXP_CORE wxControlWithItemsBase : + public wxWindowWithItems { public: wxControlWithItemsBase() { } - // we have to redefine these functions here to avoid ambiguities in classes - // deriving from us which would arise otherwise because both base classses - // 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 - // this - wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST - // usually the controls like list/combo boxes have their own background // colour virtual bool ShouldInheritColours() const { return false; } @@ -437,7 +449,7 @@ protected: void InitCommandEventWithItems(wxCommandEvent& event, int n); private: - DECLARE_NO_COPY_CLASS(wxControlWithItemsBase) + wxDECLARE_NO_COPY_CLASS(wxControlWithItemsBase); }; // define the platform-specific wxControlWithItems class @@ -453,7 +465,7 @@ private: private: DECLARE_ABSTRACT_CLASS(wxControlWithItems) - DECLARE_NO_COPY_CLASS(wxControlWithItems) + wxDECLARE_NO_COPY_CLASS(wxControlWithItems); }; #endif