Added DECLARE/IMLEMENT_CLASS for wxToolBarBase

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

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 94d46d65890359c2b933daac73e95e1bded2ee41..7abcc57a46f4120fdc2ba99c2deac41a1c86c3c4 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -467,6 +467,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
+    DECLARE_CLASS(wxToolBarBase)
 };
 
 #endif

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 3bb374eecb3138ed312a4dc8d3a4b12bf097f4c9..d904ff91949b1412732f40df617a08c293fc47f7 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -53,6 +53,8 @@
     END_EVENT_TABLE()
 #endif
 
+IMPLEMENT_CLASS(wxToolBarBase, wxControl)
+
 #include "wx/listimpl.cpp"
 
 WX_DEFINE_LIST(wxToolBarToolsList);

diff --git a/src/generic/tbarsmpl.cpp b/src/generic/tbarsmpl.cpp
index f5fd33d74141bf11543429d206d63bec3ea02ad6..53f382c4021c609cb56c3f8f2af02588b5a9396b 100644 (file)
--- a/src/generic/tbarsmpl.cpp
+++ b/src/generic/tbarsmpl.cpp
@@ -83,7 +83,7 @@ public:
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxToolBarBase)
 
 BEGIN_EVENT_TABLE(wxToolBarSimple, wxToolBarBase)
     EVT_SIZE(wxToolBarSimple::OnSize)

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index 80802da42e08f8b5a40257837e1b85d964f14646..d36704d5138eb212854bb2c471693ad2dc39764f 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -82,7 +82,7 @@ protected:
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
 
 // ============================================================================
 // implementation

diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp
index 80802da42e08f8b5a40257837e1b85d964f14646..d36704d5138eb212854bb2c471693ad2dc39764f 100644 (file)
--- a/src/gtk1/tbargtk.cpp
+++ b/src/gtk1/tbargtk.cpp
@@ -82,7 +82,7 @@ protected:
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
 
 // ============================================================================
 // implementation

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index e118add0ed08f5fa423d714fa181fe2c5e119bec..23dd7761b54d9d582d47c0426c6a074e45449e16 100644 (file)
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -21,7 +21,7 @@
 #include "wx/tabctrl.h"
 
 #if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
        EVT_MOUSE_EVENTS( wxToolBar::OnMouse ) 

diff --git a/src/mac/toolbar.cpp b/src/mac/toolbar.cpp
index e118add0ed08f5fa423d714fa181fe2c5e119bec..23dd7761b54d9d582d47c0426c6a074e45449e16 100644 (file)
--- a/src/mac/toolbar.cpp
+++ b/src/mac/toolbar.cpp
@@ -21,7 +21,7 @@
 #include "wx/tabctrl.h"
 
 #if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
        EVT_MOUSE_EVENTS( wxToolBar::OnMouse ) 

diff --git a/src/motif/toolbar.cpp b/src/motif/toolbar.cpp
index d77b72b954f1a484627488a7b1e5a11654de8970..b38f1c392981d3fa859a3da2cc5b1a2519ec16e7 100644 (file)
--- a/src/motif/toolbar.cpp
+++ b/src/motif/toolbar.cpp
@@ -51,7 +51,7 @@
 // ----------------------------------------------------------------------------
 
 #if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
 #endif
 
 // ----------------------------------------------------------------------------

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 2a1a5e7ce19cd523c15aff0514068fd71ecf353e..589df6cf6767abbdeace793076c1505e004d48db 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -115,7 +115,7 @@ static void wxMapBitmap(HBITMAP hBitmap, int width, int height);
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)

diff --git a/src/msw/tbarmsw.cpp b/src/msw/tbarmsw.cpp
index 5de16db0f8c58cf4db37ac1ea9fa05508aa8cab3..e51c302c1c0e86e44f4ec6dcb24114749c48435a 100644 (file)
--- a/src/msw/tbarmsw.cpp
+++ b/src/msw/tbarmsw.cpp
@@ -119,7 +119,7 @@ public:
 // ----------------------------------------------------------------------------
 
 #if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
        EVT_PAINT(wxToolBar::OnPaint)