corrected IMPLEMENT_DYNAMIC_CLASS macros to ensure that the controls are seen to derive from wxControlWithItems by the wx RTTI code (patch 1659708)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
a41b5c2fd4
commit
0ad2a19e42
@ -70,7 +70,7 @@ wxBEGIN_FLAGS( wxChoiceStyle )
|
||||
|
||||
wxEND_FLAGS( wxChoiceStyle )
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS_XTI(wxChoice, wxControl,"wx/choice.h")
|
||||
IMPLEMENT_DYNAMIC_CLASS_XTI(wxChoice, wxControlWithItems,"wx/choice.h")
|
||||
|
||||
wxBEGIN_PROPERTIES_TABLE(wxChoice)
|
||||
wxEVENT_PROPERTY( Select , wxEVT_COMMAND_CHOICE_SELECTED , wxCommandEvent )
|
||||
@ -86,7 +86,7 @@ wxEND_HANDLERS_TABLE()
|
||||
|
||||
wxCONSTRUCTOR_4( wxChoice , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
|
||||
#else
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
|
||||
#endif
|
||||
/*
|
||||
TODO PROPERTIES
|
||||
|
@ -87,7 +87,7 @@ wxBEGIN_FLAGS( wxComboBoxStyle )
|
||||
|
||||
wxEND_FLAGS( wxComboBoxStyle )
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxControl,"wx/combobox.h")
|
||||
IMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxChoice,"wx/combobox.h")
|
||||
|
||||
wxBEGIN_PROPERTIES_TABLE(wxComboBox)
|
||||
wxEVENT_PROPERTY( Select , wxEVT_COMMAND_COMBOBOX_SELECTED , wxCommandEvent )
|
||||
@ -108,7 +108,7 @@ wxCONSTRUCTOR_5( wxComboBox , wxWindow* , Parent , wxWindowID , Id , wxString ,
|
||||
|
||||
#else
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxChoice)
|
||||
|
||||
#endif
|
||||
|
||||
|
@ -80,7 +80,7 @@ wxBEGIN_FLAGS( wxListBoxStyle )
|
||||
|
||||
wxEND_FLAGS( wxListBoxStyle )
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS_XTI(wxListBox, wxControl,"wx/listbox.h")
|
||||
IMPLEMENT_DYNAMIC_CLASS_XTI(wxListBox, wxControlWithItems,"wx/listbox.h")
|
||||
|
||||
wxBEGIN_PROPERTIES_TABLE(wxListBox)
|
||||
wxEVENT_PROPERTY( Select , wxEVT_COMMAND_LISTBOX_SELECTED , wxCommandEvent )
|
||||
@ -97,7 +97,7 @@ wxEND_HANDLERS_TABLE()
|
||||
|
||||
wxCONSTRUCTOR_4( wxListBox , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
|
||||
#else
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user