merging r60154

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_9_0_BRANCH@60155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-04-14 20:11:16 +00:00
parent 30a9c31009
commit 3c2b239b6c
4 changed files with 27 additions and 48 deletions

View File

@@ -158,6 +158,8 @@ protected:
virtual void SetClientDataType(wxClientDataType clientDataItemsType);
virtual void EnableTextChangedEvents(bool enable);
// the subcontrols
wxComboBoxText* m_text;
wxComboBoxChoice* m_choice;