Don't use wxCHECK_W32API_VERSION() in #if when it can be undefined.

[wxWidgets.git] / src / msw / wince / menuce.cpp

diff --git a/src/msw/wince/menuce.cpp b/src/msw/wince/menuce.cpp
index 18db3904041c1afc06f49ecc2440035df741cbcd..6231ea1e2209bccd18a569ef1a939b4606c63848 100644 (file)
--- a/src/msw/wince/menuce.cpp
+++ b/src/msw/wince/menuce.cpp
@@ -6,7 +6,7 @@
 // Created:     28.05.2004
 // RCS-ID:      $Id$
 // Copyright:   (c) Wlodzimierz Skiba
 // Created:     28.05.2004
 // RCS-ID:      $Id$
 // Copyright:   (c) Wlodzimierz Skiba

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -37,6 +37,7 @@
 #include <shellapi.h>
 #include <aygshell.h>
 #include <tpcshell.h>
 #include <shellapi.h>
 #include <aygshell.h>
 #include <tpcshell.h>

+#include <tpcuser.h>

 #include "wx/msw/wince/missing.h"
 
 #include "wx/msw/wince/resources.h"
 #include "wx/msw/wince/missing.h"
 
 #include "wx/msw/wince/resources.h"


@@ -53,11 +54,7 @@ wxTopLevelWindowMSW::ButtonMenu::ButtonMenu()
 
 wxTopLevelWindowMSW::ButtonMenu::~ButtonMenu()
 {
 
 wxTopLevelWindowMSW::ButtonMenu::~ButtonMenu()
 {

-    if(m_menu)
-    {
-        delete m_menu;
-        m_menu = NULL;
-    };
+    wxDELETE(m_menu);

 }
 
 void wxTopLevelWindowMSW::SetLeftMenu(int id, const wxString& label, wxMenu *subMenu)
 }
 
 void wxTopLevelWindowMSW::SetLeftMenu(int id, const wxString& label, wxMenu *subMenu)


@@ -77,7 +74,7 @@ void wxTopLevelWindowMSW::ButtonMenu::SetButton(int id, const wxString& label, w
     m_assigned = true;
     m_id = id;
     if(label.empty() && wxIsStockID(id))
     m_assigned = true;
     m_id = id;
     if(label.empty() && wxIsStockID(id))

-        m_label = wxGetStockLabel(id, false);
+        m_label = wxGetStockLabel(id, wxSTOCK_NOFLAGS);

     else
         m_label = label;
     m_menu = subMenu;
     else
         m_label = label;
     m_menu = subMenu;


@@ -224,7 +221,7 @@ void wxTopLevelWindowMSW::ReloadAllButtons()
 
     if (!SHCreateMenuBar(&menu_bar))
     {
 
     if (!SHCreateMenuBar(&menu_bar))
     {

-        wxFAIL_MSG( _T("SHCreateMenuBar failed") );
+        wxFAIL_MSG( wxT("SHCreateMenuBar failed") );

         return;
     }
 
         return;
     }