From 12ed316d02733e7111a6967f6ae41e2c0ceaa57a Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Fri, 6 Oct 2000 16:52:29 +0000
Subject: [PATCH] Added DECLARE/IMLEMENT_CLASS for wxToolBarBase

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/tbarbase.h      | 1 +
 src/common/tbarbase.cpp    | 2 ++
 src/generic/tbarsmpl.cpp   | 2 +-
 src/gtk/tbargtk.cpp        | 2 +-
 src/gtk1/tbargtk.cpp       | 2 +-
 src/mac/carbon/toolbar.cpp | 2 +-
 src/mac/toolbar.cpp        | 2 +-
 src/motif/toolbar.cpp      | 2 +-
 src/msw/tbar95.cpp         | 2 +-
 src/msw/tbarmsw.cpp        | 2 +-
 10 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 94d46d6589..7abcc57a46 100644
--- 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 3bb374eecb..d904ff9194 100644
--- 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 f5fd33d741..53f382c402 100644
--- 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 80802da42e..d36704d513 100644
--- 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 80802da42e..d36704d513 100644
--- 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 e118add0ed..23dd7761b5 100644
--- 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 e118add0ed..23dd7761b5 100644
--- 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 d77b72b954..b38f1c3929 100644
--- 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 2a1a5e7ce1..589df6cf67 100644
--- 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 5de16db0f8..e51c302c1c 100644
--- 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)
-- 
2.47.2