X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c089c47f344926e2f95a8aa342992ed844fe609..858f7d664166563a7725f3487249eed7f30e2f31:/src/msw/menuitem.cpp?ds=sidebyside

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 4641f7d0dc..916819d272 100644
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -9,9 +9,9 @@
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
-// ============================================================================
-// headers & declarations
-// ============================================================================
+#ifdef __GNUG__
+#pragma implementation "menuitem.h"
+#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
@@ -22,6 +22,10 @@
 
 #ifndef WX_PRECOMP
 #include "wx/menu.h"
+#include "wx/font.h"
+#include "wx/bitmap.h"
+#include "wx/settings.h"
+#include "wx/font.h"
 #endif
 
 #include "wx/ownerdrw.h"
@@ -29,6 +33,14 @@
 
 #include <windows.h>
 
+#ifdef GetClassInfo
+#undef GetClassInfo
+#endif
+
+#ifdef GetClassName
+#undef GetClassName
+#endif
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -38,7 +50,7 @@
 // ----------------------------------------------------------------------------
 
 #if     !defined(USE_SHARED_LIBRARY) || !USE_SHARED_LIBRARY
-#if USE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN
   IMPLEMENT_DYNAMIC_CLASS2(wxMenuItem, wxObject, wxOwnerDrawn)
 #else   //!USE_OWNER_DRAWN
   IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
@@ -54,10 +66,10 @@
 // -----------
 
 wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,
-                       const wxTString& strName, const wxTString& strHelp,
+                       const wxString& strName, const wxString& strHelp,
                        bool bCheckable,
                        wxMenu *pSubMenu) :
-#if USE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN
                         wxOwnerDrawn(strName, bCheckable),
 #else   //no owner drawn support
                         m_bCheckable(bCheckable),
@@ -67,7 +79,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,
 {
   wxASSERT( pParentMenu != NULL );
 
-#if  USE_OWNER_DRAWN
+#if  wxUSE_OWNER_DRAWN
     // set default menu colors
     #define SYS_COLOR(c) (wxSystemSettings::GetSystemColour(wxSYS_COLOUR_##c))