projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
erase separators shown behind the controls added to the toolbar
[wxWidgets.git]
/
src
/
msw
/
menuitem.cpp
diff --git
a/src/msw/menuitem.cpp
b/src/msw/menuitem.cpp
index c87a217ce6f8b60ec15e2c8c7e8eb647cdd48f48..33e67a5d9fe3f9cc04d1532e35348bef804ef6ea 100644
(file)
--- a/
src/msw/menuitem.cpp
+++ b/
src/msw/menuitem.cpp
@@
-72,11
+72,7
@@
// dynamic classes implementation
// ----------------------------------------------------------------------------
// 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
// ----------------------------------------------------------------------------
// wxMenuItem
@@
-99,7
+95,7
@@
wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
#if wxUSE_OWNER_DRAWN
// set default menu colors
#if wxUSE_OWNER_DRAWN
// set default menu colors
- #define SYS_COLOR(c) (wxSystemSettings::Get
System
Colour(wxSYS_COLOUR_##c))
+ #define SYS_COLOR(c) (wxSystemSettings::GetColour(wxSYS_COLOUR_##c))
SetTextColour(SYS_COLOR(MENUTEXT));
SetBackgroundColour(SYS_COLOR(MENU));
SetTextColour(SYS_COLOR(MENUTEXT));
SetBackgroundColour(SYS_COLOR(MENU));