unified wxTaskBarIcon behaviour: wxMSW version is not removed automatically when...

[wxWidgets.git] / include / wx / msw / wx.rc

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index 5f27ac35d83995aeedbf568de5883af8559dd597..9b30263ba5b006edd489299e97408fc1ede5ae7a 100644 (file)
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -77,11 +77,72 @@ BEGIN
     END
 END
 
     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"
 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
 
 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
 
 
 #endif
 
 


@@ -142,7 +203,9 @@ wxBITMAP_STD_COLOURS    BITMAP "wx/msw/colours.bmp"
 // Manifest file for Windows XP
 //
 
 // Manifest file for Windows XP
 //
 

+#if !defined(__WIN64__)

 #if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)
 1 24 "wx/msw/wx.manifest"
 #endif
 #if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)
 1 24 "wx/msw/wx.manifest"
 #endif

+#endif