Added size hints to dialog,
Corrected client data "code" for wxChoice, git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -53,8 +53,7 @@ public:
|
||||
wxString GetString( int n ) const;
|
||||
|
||||
// implementation
|
||||
wxList m_clientDataList;
|
||||
wxList m_clientObjectList;
|
||||
wxList m_clientList;
|
||||
|
||||
void DisableEvents();
|
||||
void EnableEvents();
|
||||
@@ -69,6 +68,16 @@ protected:
|
||||
virtual void DoSetClientObject( int n, wxClientData* clientData );
|
||||
virtual wxClientData* DoGetClientObject( int n ) const;
|
||||
|
||||
// the above virtuals hide these virtuals in wxChoiceBase
|
||||
virtual void DoSetClientData(void* clientData )
|
||||
{ wxWindowBase::DoSetClientData(clientData); };
|
||||
virtual void* DoGetClientData() const
|
||||
{ return(wxWindowBase::DoGetClientData()); };
|
||||
virtual void DoSetClientObject( wxClientData* clientData )
|
||||
{ wxWindowBase::DoSetClientObject(clientData); };
|
||||
virtual wxClientData* DoGetClientObject() const
|
||||
{ return(wxWindowBase::DoGetClientObject()); };
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxChoice)
|
||||
};
|
||||
|
Reference in New Issue
Block a user