fix access to client data of wxComboBox in wxUniv by virtualizing access to wxControlWithItems::m_clientDataItemsType
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -142,6 +142,15 @@ public:
|
||||
return GetStdInputHandler(handlerDef);
|
||||
}
|
||||
|
||||
// we delegate our client data handling to wxListBox which we use for the
|
||||
// items, so override this and other methods dealing with the client data
|
||||
virtual wxClientDataType GetClientDataType() const
|
||||
{
|
||||
return GetLBox()->GetClientDataType();
|
||||
}
|
||||
|
||||
virtual void SetClientDataType(wxClientDataType clientDataItemsType);
|
||||
|
||||
protected:
|
||||
virtual int DoInsertItems(const wxArrayStringsAdapter& items,
|
||||
unsigned int pos,
|
||||
@@ -150,6 +159,7 @@ protected:
|
||||
virtual void DoSetItemClientData(unsigned int n, void* clientData);
|
||||
virtual void* DoGetItemClientData(unsigned int n) const;
|
||||
|
||||
|
||||
// common part of all ctors
|
||||
void Init();
|
||||
|
||||
|
Reference in New Issue
Block a user