Dialog unit mods; wxProp tidying

[wxWidgets.git] / src / msw / menuitem.cpp

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 4641f7d0dc912d71aab4d1d3460512d4d49b97cb..f7822a730f66148b9ed004bfb9e26bb9eefc46f0 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -38,7 +38,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 +54,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 +67,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))