Added a resource for Smartphone menubar

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/features.h b/include/wx/features.h
index 49deed180e524b909b4ef974a339e8f270b7b7af..144ecd2e610511cdafdf33fee4ed8689078de82b 100644 (file)
--- a/include/wx/features.h
+++ b/include/wx/features.h
@@ -27,6 +27,14 @@
     #undef wxHAS_RAW_KEY_CODES
 #endif
 
+// detect SmartPhone
+#ifdef WIN32_PLATFORM_WFSP
+    #ifdef wxUSE_SMARTPHONE
+    #undef wxUSE_SMARTPHONE
+    #endif
+    #define wxUSE_SMARTPHONE 1
+#endif
+
 // taskbar is only implemented in wxMSW and X11 ports
 #if defined(__WXMSW__) || \
         defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__)

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index 5f27ac35d83995aeedbf568de5883af8559dd597..69db0764c368a8d2f0d30740ccbe34440f3e3d27 100644 (file)
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -77,11 +77,72 @@ BEGIN
     END
 END
 
+// A menubar for Smartphone, which can only have 1 or 2 menu buttons.
+
+#define IDR_SMARTPHONE_MENUBAR          5002
+#define ID_FIRST_BUTTON                 40001
+#define ID_SECOND_BUTTON                40002
+#define IDS_CAP_MENU                    40003
+#define ID_MENU_TEST                    40004
+#define IDS_DONE                        40006
+
 STRINGTABLE DISCARDABLE
 BEGIN
     5001      "Dummy menu"
+    IDS_DONE            "Done"
+    IDS_CAP_MENU        "Menu"
+END
+
+#ifndef I_IMAGENONE
+        #define I_IMAGENONE            (-2)
+#endif
+#ifndef NOMENU
+        #define NOMENU                 0xFFFF
+#endif
+
+#ifndef wxID_EXIT
+#define wxID_EXIT 5006
+#endif
+
+// A resource for a one-button menubar
+/*
+IDR_SMARTPHONE_MENUBAR MENU DISCARDABLE
+BEGIN
+    MENUITEM "Done",                          wxID_EXIT
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_DONE            "Done"
+    IDS_CAP_MENU        "Menu"
 END
 
+IDR_SMARTPHONE_MENUBAR RCDATA DISCARDABLE
+BEGIN
+    IDR_SMARTPHONE_MENUBAR, 1,
+    I_IMAGENONE, wxID_EXIT, TBSTATE_ENABLED, TBSTYLE_AUTOSIZE, IDS_DONE, 0, NOMENU,
+END
+*/
+
+// A resource for a two-button menubar
+
+IDR_SMARTPHONE_MENUBAR MENU DISCARDABLE
+BEGIN
+    MENUITEM "Done",                          wxID_EXIT
+    POPUP "Menu"
+    BEGIN
+        MENUITEM "OK",                          wxID_EXIT
+    END
+END
+
+IDR_SMARTPHONE_MENUBAR RCDATA DISCARDABLE
+BEGIN
+    IDR_SMARTPHONE_MENUBAR, 2,
+    I_IMAGENONE, wxID_EXIT, TBSTATE_ENABLED, TBSTYLE_AUTOSIZE, IDS_DONE, 0, NOMENU,
+    I_IMAGENONE, ID_SECOND_BUTTON, TBSTATE_ENABLED, TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_MENU, 0, 1,
+END
+
+
 #endif