Changed the "delete win" to the more proper "win->Destroy()" in

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

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 3cde92823209a29f6352c2d65bbd1d6fbbb1ec02..293ae516088fec8460ac2d35c8a34cabe035ab2b 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -9,9 +9,9 @@
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// headers & declarations
-// ============================================================================
+#ifdef __GNUG__
+#pragma implementation "menuitem.h"
+#endif

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"


@@ -38,7 +38,7 @@
 // ----------------------------------------------------------------------------
 
 #if     !defined(USE_SHARED_LIBRARY) || !USE_SHARED_LIBRARY
 // ----------------------------------------------------------------------------
 
 #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)
   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,
 // -----------
 
 wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,

-                       const wxTString& strName, const wxTString& strHelp,
+                       const wxString& strName, const wxString& strHelp,

                        bool bCheckable,
                        wxMenu *pSubMenu) :
                        bool bCheckable,
                        wxMenu *pSubMenu) :

-#if USE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN

                         wxOwnerDrawn(strName, bCheckable),
 #else   //no owner drawn support
                         m_bCheckable(bCheckable),
                         wxOwnerDrawn(strName, bCheckable),
 #else   //no owner drawn support
                         m_bCheckable(bCheckable),


@@ -67,7 +67,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,
 {
   wxASSERT( pParentMenu != NULL );
 
 {
   wxASSERT( pParentMenu != NULL );
 

-#ifdef  USE_OWNER_DRAWN
+#if  wxUSE_OWNER_DRAWN

     // set default menu colors
     #define SYS_COLOR(c) (wxSystemSettings::GetSystemColour(wxSYS_COLOUR_##c))
     
     // set default menu colors
     #define SYS_COLOR(c) (wxSystemSettings::GetSystemColour(wxSYS_COLOUR_##c))