AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

IMPLEMENT_DYNAMIC_CLASS fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2002-02-06 01:42:02 +00:00
parent 1f42894286
commit 621b3e2127
7 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gtk/menu.cpp
View File

@ -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,

2
src/gtk1/menu.cpp
View File

@ -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,

2
src/msw/cursor.cpp
View File

@ -52,7 +52,7 @@
// wxWin macros
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxCursorBase)
IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxGDIObject)
// ----------------------------------------------------------------------------
// globals

8
src/msw/gdiimage.cpp
View File

@ -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

2
src/msw/icon.cpp
View File

@ -49,7 +49,7 @@
// wxWin macros
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxIconBase)
IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject)
// ============================================================================
// implementation

6
src/msw/menuitem.cpp
View File

@ -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

2
src/msw/slider95.cpp
View File

@ -37,7 +37,7 @@
#include <commctrl.h>
#endif
IMPLEMENT_DYNAMIC_CLASS(wxSlider95, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
// Slider
wxSlider95::wxSlider95()