make wxChoice and wxListBox inherit from wxControlWithItems and not wxControl for...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/cocoa/choice.mm b/src/cocoa/choice.mm
index dbc2ce597fff1b98d8f4cef9f2229e181a740792..334444cdcb06d8a33fc0048312c1b6dae64841fb 100644 (file)
--- a/src/cocoa/choice.mm
+++ b/src/cocoa/choice.mm
@@ -29,7 +29,7 @@
 #import <Foundation/NSNotification.h>
 #import <Foundation/NSDictionary.h>
 
-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 08603883be013dda4e254806ef2d073b06f14911..13ca565a905300fbddc363f70a2c1b15fa3f07c1 100644 (file)
--- a/src/cocoa/listbox.mm
+++ b/src/cocoa/listbox.mm
@@ -29,7 +29,7 @@
 #import <AppKit/NSTableView.h>
 #import <AppKit/NSTableColumn.h>
 
-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 7dfecca77ad0d22963e4f111305c97a059ac6755..fbe064f3e0d249d37b02cef7c4eb4391d9014d45 100644 (file)
--- 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 3517dd9f71d6dad6cb9881682fab587addf483ac..b3f4a76682c27c727145c74817bae8a2afc8a8e5 100644 (file)
--- 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 adf1d0410169c2172227bce35513a7ff2e4fd3cb..0d50df554f9a5bc86ed56d9068352c34251c17a5 100644 (file)
--- 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 93815ed498c7e74d37900ab990322024a9e59619..d5fcf07764f1b973d85c0fbae9072ea8311b3177 100644 (file)
--- 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 13a5f77c37c8be1d40a0fe1f6f55071a31870931..a3e049f59369b6af17b7023e880f721b3ab6739e 100644 (file)
--- 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 74efe70511a6b1387fdbb7c4565dedbd4eb68879..7bd1442a2346fc3306a923702b3443e22d79d239 100644 (file)
--- 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 bb1181f4fd422802fe5cd200d79e5169ba7adf64..040553316233f6a45b66b88888758ba6ceaae638 100644 (file)
--- 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 d20f37dfcbca2c2cc7db756ae881a92d0ca0223b..3d138f64353bee572dc91cc81c658f89403a24e6 100644 (file)
--- 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 e91486c6d7038413cfab7e39f9f73b2d95fb7303..18650fc4f86de3f991a228a9f9461cc241c51d87 100644 (file)
--- 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 3755c4109eb9af56b2db9e742e0cef0c81ce8e7a..334fd18f48bfff955857d7c7ef9f2ed13112f8ed 100644 (file)
--- 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 c6c100fc0ac104857341ffcbf4dd903e66e2361d..7fbc1096f1190d75d91323128d3cd3e510c8915c 100644 (file)
--- 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 de22719ab66922e1e4b2b23ab5db8ddc8d9b4069..34d50d070c24ddf13321c77bd87cc295ac92987f 100644 (file)
--- 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 e8237fef8f742a6a56f1441b054d2e09564101b5..d1d5312f36b6e21fe0cd68105ee4d095e1fc0658 100644 (file)
--- 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 7c1ca6dcca6e543a792130da99fb32595728a051..c26aafb29eed8022f3d019b43c76ec13cb7db036 100644 (file)
--- 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)