From 0ad2a19e42e400028bb28b0cfac7e0ac9636a82b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 14 Feb 2007 16:10:08 +0000 Subject: [PATCH] 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 --- src/msw/choice.cpp | 4 ++-- src/msw/combobox.cpp | 4 ++-- src/msw/listbox.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp index 8fc25f779d..0fbae50603 100644 --- a/src/msw/choice.cpp +++ b/src/msw/choice.cpp @@ -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 diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 2283515d56..3c6fe8d103 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -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 diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp index c48879e34b..e9f8db9e3a 100644 --- a/src/msw/listbox.cpp +++ b/src/msw/listbox.cpp @@ -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 /*