Added DECLARE/IMLEMENT_CLASS for wxToolBarBase

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-10-06 16:52:29 +00:00
parent 6955ce29ed
commit 12ed316d02
10 changed files with 11 additions and 8 deletions

View File

@@ -467,6 +467,7 @@ protected:
private: private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
DECLARE_CLASS(wxToolBarBase)
}; };
#endif #endif

View File

@@ -53,6 +53,8 @@
END_EVENT_TABLE() END_EVENT_TABLE()
#endif #endif
IMPLEMENT_CLASS(wxToolBarBase, wxControl)
#include "wx/listimpl.cpp" #include "wx/listimpl.cpp"
WX_DEFINE_LIST(wxToolBarToolsList); WX_DEFINE_LIST(wxToolBarToolsList);

View File

@@ -83,7 +83,7 @@ public:
// wxWin macros // wxWin macros
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxToolBarBase)
BEGIN_EVENT_TABLE(wxToolBarSimple, wxToolBarBase) BEGIN_EVENT_TABLE(wxToolBarSimple, wxToolBarBase)
EVT_SIZE(wxToolBarSimple::OnSize) EVT_SIZE(wxToolBarSimple::OnSize)

View File

@@ -82,7 +82,7 @@ protected:
// wxWin macros // wxWin macros
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
// ============================================================================ // ============================================================================
// implementation // implementation

View File

@@ -82,7 +82,7 @@ protected:
// wxWin macros // wxWin macros
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
// ============================================================================ // ============================================================================
// implementation // implementation

View File

@@ -21,7 +21,7 @@
#include "wx/tabctrl.h" #include "wx/tabctrl.h"
#if !USE_SHARED_LIBRARY #if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
EVT_MOUSE_EVENTS( wxToolBar::OnMouse ) EVT_MOUSE_EVENTS( wxToolBar::OnMouse )

View File

@@ -21,7 +21,7 @@
#include "wx/tabctrl.h" #include "wx/tabctrl.h"
#if !USE_SHARED_LIBRARY #if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
EVT_MOUSE_EVENTS( wxToolBar::OnMouse ) EVT_MOUSE_EVENTS( wxToolBar::OnMouse )

View File

@@ -51,7 +51,7 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARY #if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
#endif #endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

View File

@@ -115,7 +115,7 @@ static void wxMapBitmap(HBITMAP hBitmap, int width, int height);
// wxWin macros // wxWin macros
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent) EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)

View File

@@ -119,7 +119,7 @@ public:
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARY #if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
EVT_PAINT(wxToolBar::OnPaint) EVT_PAINT(wxToolBar::OnPaint)