compilation fix for wxUSE_ON_FATAL_EXCEPTION == 0

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

diff --git a/src/msw/wince/menuce.cpp b/src/msw/wince/menuce.cpp
index 10c97cd142c1f4e3d5506ac806425425e9b41c0f..707bcc9af59cbd52ee4620a5744e2620738dfe8b 100644 (file)
--- a/src/msw/wince/menuce.cpp
+++ b/src/msw/wince/menuce.cpp
@@ -38,7 +38,7 @@
     #include "wx/menu.h"
 #endif //WX_PRECOMP
 
-#ifdef __SMARTPHONE__
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
 
 #include <windows.h>
 #include <ole2.h>
@@ -48,6 +48,8 @@
 
 #include "wx/msw/wince/resources.h"
 
+#include "wx/stockitem.h"
+
 wxTopLevelWindowMSW::ButtonMenu::ButtonMenu()
 {
     m_id = wxID_ANY;
@@ -81,7 +83,10 @@ void wxTopLevelWindowMSW::ButtonMenu::SetButton(int id, const wxString& label, w
 {
     m_assigned = true;
     m_id = id;
-    m_label = label;
+    if(label.empty() && wxIsStockID(id))
+        m_label = wxGetStockLabel(id, false);
+    else
+        m_label = label;
     m_menu = subMenu;
 }
 
@@ -257,5 +262,5 @@ bool wxTopLevelWindowMSW::HandleCommand(WXWORD id, WXWORD WXUNUSED(cmd), WXHWND
     return false;
 }
 
-#endif // __SMARTPHONE__
+#endif // __SMARTPHONE__ && __WXWINCE__