From b1294ada8e87725409f290328da02306e5c8f4eb Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 15 Aug 2007 20:31:06 +0000 Subject: [PATCH] make wxChoice and wxListBox inherit from wxControlWithItems and not wxControl for all ports git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/cocoa/choice.mm | 2 +- src/cocoa/listbox.mm | 2 +- src/gtk/choice.cpp | 2 +- src/gtk/listbox.cpp | 2 +- src/gtk1/choice.cpp | 2 +- src/gtk1/listbox.cpp | 2 +- src/mac/carbon/choice.cpp | 2 +- src/mac/carbon/listbox.cpp | 2 +- src/motif/choice.cpp | 2 +- src/motif/listbox.cpp | 2 +- src/os2/choice.cpp | 2 +- src/os2/listbox.cpp | 2 +- src/palmos/choice.cpp | 2 +- src/palmos/listbox.cpp | 2 +- src/univ/choice.cpp | 2 +- src/univ/listbox.cpp | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/cocoa/choice.mm b/src/cocoa/choice.mm index dbc2ce597f..334444cdcb 100644 --- a/src/cocoa/choice.mm +++ b/src/cocoa/choice.mm @@ -29,7 +29,7 @@ #import #import -IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems) BEGIN_EVENT_TABLE(wxChoice, wxChoiceBase) END_EVENT_TABLE() // WX_IMPLEMENT_COCOA_OWNER(wxChoice,NSButton,NSControl,NSView) diff --git a/src/cocoa/listbox.mm b/src/cocoa/listbox.mm index 08603883be..13ca565a90 100644 --- a/src/cocoa/listbox.mm +++ b/src/cocoa/listbox.mm @@ -29,7 +29,7 @@ #import #import -IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems) BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase) END_EVENT_TABLE() WX_IMPLEMENT_COCOA_OWNER(wxListBox,NSTableView,NSControl,NSView) diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp index 7dfecca77a..fbe064f3e0 100644 --- a/src/gtk/choice.cpp +++ b/src/gtk/choice.cpp @@ -70,7 +70,7 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice * // wxChoice //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems) wxChoice::wxChoice() { diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index 3517dd9f71..b3f4a76682 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -272,7 +272,7 @@ static gboolean gtk_listbox_searchequal_callback(GtkTreeModel* model, // wxListBox //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems) // ---------------------------------------------------------------------------- // construction diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp index adf1d04101..0d50df554f 100644 --- a/src/gtk1/choice.cpp +++ b/src/gtk1/choice.cpp @@ -86,7 +86,7 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice * // wxChoice //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems) wxChoice::wxChoice() { diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp index 93815ed498..d5fcf07764 100644 --- a/src/gtk1/listbox.cpp +++ b/src/gtk1/listbox.cpp @@ -450,7 +450,7 @@ gtk_listbox_realized_callback( GtkWidget *m_widget, wxListBox *win ) // wxListBox //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems) // ---------------------------------------------------------------------------- // construction diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp index 13a5f77c37..a3e049f593 100644 --- a/src/mac/carbon/choice.cpp +++ b/src/mac/carbon/choice.cpp @@ -24,7 +24,7 @@ extern MenuHandle NewUniqueMenu() ; -IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems) wxChoice::~wxChoice() diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp index 74efe70511..7bd1442a23 100644 --- a/src/mac/carbon/listbox.cpp +++ b/src/mac/carbon/listbox.cpp @@ -24,7 +24,7 @@ #include "wx/dcclient.h" #endif -IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems) BEGIN_EVENT_TABLE(wxListBox, wxControl) END_EVENT_TABLE() diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp index bb1181f4fd..0405533162 100644 --- a/src/motif/choice.cpp +++ b/src/motif/choice.cpp @@ -43,7 +43,7 @@ #define WIDTH_OVERHEAD_SUBTRACT 40 #define HEIGHT_OVERHEAD 15 -IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems) void wxChoiceCallback (Widget w, XtPointer clientData, XtPointer ptr); diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp index d20f37dfcb..3d138f6435 100644 --- a/src/motif/listbox.cpp +++ b/src/motif/listbox.cpp @@ -38,7 +38,7 @@ #endif #include "wx/motif/private.h" - IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems) static void wxListBoxCallback(Widget w, XtPointer clientData, diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp index e91486c6d7..18650fc4f8 100644 --- a/src/os2/choice.cpp +++ b/src/os2/choice.cpp @@ -24,7 +24,7 @@ #include "wx/os2/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems) bool wxChoice::Create( wxWindow* pParent diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp index 3755c4109e..334fd18f48 100644 --- a/src/os2/listbox.cpp +++ b/src/os2/listbox.cpp @@ -38,7 +38,7 @@ #include "wx/ownerdrw.h" #endif - IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems) // ============================================================================ // list box item declaration and implementation diff --git a/src/palmos/choice.cpp b/src/palmos/choice.cpp index c6c100fc0a..7fbc1096f1 100644 --- a/src/palmos/choice.cpp +++ b/src/palmos/choice.cpp @@ -85,7 +85,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 // ============================================================================ diff --git a/src/palmos/listbox.cpp b/src/palmos/listbox.cpp index de22719ab6..34d50d070c 100644 --- a/src/palmos/listbox.cpp +++ b/src/palmos/listbox.cpp @@ -95,7 +95,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 // ============================================================================ diff --git a/src/univ/choice.cpp b/src/univ/choice.cpp index e8237fef8f..d1d5312f36 100644 --- a/src/univ/choice.cpp +++ b/src/univ/choice.cpp @@ -31,7 +31,7 @@ #include "wx/arrstr.h" #endif -IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems) BEGIN_EVENT_TABLE(wxChoice, wxComboBox) EVT_COMBOBOX(wxID_ANY, wxChoice::OnComboBox) diff --git a/src/univ/listbox.cpp b/src/univ/listbox.cpp index 7c1ca6dcca..c26aafb29e 100644 --- a/src/univ/listbox.cpp +++ b/src/univ/listbox.cpp @@ -97,7 +97,7 @@ protected: // implementation of wxListBox // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems) BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase) EVT_SIZE(wxListBox::OnSize) -- 2.45.2