IMPLEMENT_DYNAMIC_CLASS fixes

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 77ac32a68d628eda479bca2fe4829be9ae5e9139..bb7b59ef46cc6181ac0c277432ebd775d4b8a63e 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -667,7 +667,7 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
 // wxMenuItem
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase)
+IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuObject)
 
 wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
                                 int id,

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 77ac32a68d628eda479bca2fe4829be9ae5e9139..bb7b59ef46cc6181ac0c277432ebd775d4b8a63e 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -667,7 +667,7 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
 // wxMenuItem
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase)
+IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuObject)
 
 wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
                                 int id,

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index d84d6c2aa488a6c5e6d97dfee1c4ff192a1a6241..09ab2ba32e6e7a8356dbe72eb43d6785d2d2bf75 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -52,7 +52,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxCursorBase)
+IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxGDIObject)
 
 // ----------------------------------------------------------------------------
 // globals

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index 3ead2479d1d150bc10f7df5accefc8037c70a6f8..38a1d16db2a0cf34000a3ca2c8b235c2a34b57ca 100644 (file)
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -175,10 +175,10 @@ private:
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-    IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
-    IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
-    IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxGDIImageHandler)
-    IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxGDIImageHandler)
+IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
+IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
+IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject)
 
 // ----------------------------------------------------------------------------
 // private functions

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index ea5e89cf86d7913e3d2b9cedcc610330cb70f81e..75be5af8526257f7a88c98e4df3f2d14fc941115 100644 (file)
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -49,7 +49,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxIconBase)
+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject)
 
 // ============================================================================
 // implementation

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 0686c08269a43e3b0422f594a2aa40df77d6fe7a..33e67a5d9fe3f9cc04d1532e35348bef804ef6ea 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -72,11 +72,7 @@
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 
-#if wxUSE_OWNER_DRAWN
-    IMPLEMENT_DYNAMIC_CLASS2(wxMenuItem, wxMenuItemBase, wxOwnerDrawn)
-#else   //!USE_OWNER_DRAWN
-    IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase)
-#endif  //USE_OWNER_DRAWN
+IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
 
 // ----------------------------------------------------------------------------
 // wxMenuItem

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 116e2e5647b1e15c84ff6ed1f5954e8fbe0c1e03..e72bb09b172b3f4338a75a70059c624fe36724cc 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -37,7 +37,7 @@
     #include <commctrl.h>
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxSlider95, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
 
 // Slider
 wxSlider95::wxSlider95()