Remove duplicated typedef depending on header file version.

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

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index 1ca1d48c6d123ddf95297c730fb51c5f08695ed9..9b30263ba5b006edd489299e97408fc1ede5ae7a 100644 (file)
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -35,39 +35,9 @@
        #include <windows.h>
 #endif
 
-//////////////////////////////////////////////////////////////////////////////
-//
-// Dummy Dialog for all wxCAPTION Dialog boxes
-//
-
-wxResizeableDialog DIALOG DISCARDABLE  34, 22, 144, 75
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
-CAPTION ""
-BEGIN
-#ifdef __WATCOMC__
-       LTEXT "", -1,-2,-2,1,1
+#if defined(_WIN32_WCE)
+        #include <commctrl.h>
 #endif
-END
-
-wxCaptionDialog DIALOG DISCARDABLE  34, 22, 144, 75
-STYLE DS_MODALFRAME | WS_CAPTION | WS_POPUP | WS_SYSMENU
-CAPTION "Dummy dialog"
-BEGIN
-#ifdef __WATCOMC__
-       LTEXT "", -1,-2,-2,1,1
-#endif
-END
-
-//
-// Dummy dialog for dialog boxes without caption & with thin frame
-//
-wxNoCaptionDialog DIALOG 34, 22, 144, 75
-STYLE WS_POPUP
-BEGIN
-#ifdef __WATCOMC__
-       LTEXT "", -1,-2,-2,1,1
-#endif
-END
 
 //////////////////////////////////////////////////////////////////////////////
 //
@@ -87,6 +57,95 @@ BEGIN
     END
 END
 
+#ifdef _WIN32_WCE
+
+// Dummy menubar/toolbar for WinCE
+
+5000 RCDATA DISCARDABLE
+BEGIN
+  // Popup menu name
+  5000,
+  // Count of items to put on the menu
+  0
+END
+
+5000 MENU DISCARDABLE
+BEGIN
+    POPUP "Dummy"
+    BEGIN
+    MENUITEM "Dummy" 99
+    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
+
+
 //////////////////////////////////////////////////////////////////////////////
 //
 // Standard wxWindows Cursors
@@ -97,7 +156,6 @@ WXCURSOR_BULLSEYE       CURSOR  DISCARDABLE     "wx/msw/bullseye.cur"
 WXCURSOR_PENCIL         CURSOR  DISCARDABLE     "wx/msw/pencil.cur"
 WXCURSOR_MAGNIFIER      CURSOR  DISCARDABLE     "wx/msw/magnif1.cur"
 WXCURSOR_NO_ENTRY       CURSOR  DISCARDABLE     "wx/msw/noentry.cur"
-WXCURSOR_SIZING         CURSOR  DISCARDABLE     "wx/msw/size.cur"
 WXCURSOR_ROLLER         CURSOR  DISCARDABLE     "wx/msw/roller.cur"
 WXCURSOR_WATCH          CURSOR  DISCARDABLE     "wx/msw/watch1.cur"
 WXCURSOR_PBRUSH         CURSOR  DISCARDABLE     "wx/msw/pbrush.cur"
@@ -105,6 +163,8 @@ WXCURSOR_PLEFT          CURSOR  DISCARDABLE     "wx/msw/pntleft.cur"
 WXCURSOR_PRIGHT         CURSOR  DISCARDABLE     "wx/msw/pntright.cur"
 WXCURSOR_QARROW         CURSOR  DISCARDABLE     "wx/msw/query.cur"
 WXCURSOR_BLANK          CURSOR  DISCARDABLE     "wx/msw/blank.cur"
+WXCURSOR_RIGHT_ARROW    CURSOR  DISCARDABLE     "wx/msw/rightarr.cur"
+
 
 //////////////////////////////////////////////////////////////////////////////
 //
@@ -115,21 +175,37 @@ WXCURSOR_BLANK          CURSOR  DISCARDABLE     "wx/msw/blank.cur"
 //wxDEFAULT_MDIPARENTFRAME      ICON "wx/msw/mdi.ico"
 //wxDEFAULT_MDICHILDFRAME       ICON "wx/msw/child.ico"
 
-// Standard icons
-wxICON_QUESTION                ICON "wx/msw/question.ico"
-wxICON_WARNING         ICON "wx/msw/warning.ico"
-wxICON_ERROR           ICON "wx/msw/error.ico"
-wxICON_INFO            ICON "wx/msw/info.ico"
-wxICON_TIP             ICON "wx/msw/tip.ico"
+// Standard small icons
+wxICON_SMALL_CLOSED_FOLDER      ICON "wx/msw/folder1.ico"
+wxICON_SMALL_OPEN_FOLDER        ICON "wx/msw/folder2.ico"
+wxICON_SMALL_FILE               ICON "wx/msw/file1.ico"
+wxICON_SMALL_COMPUTER           ICON "wx/msw/computer.ico"
+wxICON_SMALL_DRIVE              ICON "wx/msw/drive.ico"
+wxICON_SMALL_CDROM              ICON "wx/msw/cdrom.ico"
+wxICON_SMALL_FLOPPY             ICON "wx/msw/floppy.ico"
+wxICON_SMALL_REMOVEABLE         ICON "wx/msw/removble.ico"
 
 //////////////////////////////////////////////////////////////////////////////
 //
 // Bitmaps
 //
 
-#ifdef __SALFORDC__
-wxDISABLE_BUTTON_BITMAP         BITMAP  WXINCDIR"wx/msw/disable.bmp"
-#else
 wxDISABLE_BUTTON_BITMAP         BITMAP  "wx/msw/disable.bmp"
+
+// For wxContextHelpButton
+csquery                 BITMAP "wx/msw/csquery.bmp"
+
+// For obtaining the RGB values of standard colours
+wxBITMAP_STD_COLOURS    BITMAP "wx/msw/colours.bmp"
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Manifest file for Windows XP
+//
+
+#if !defined(__WIN64__)
+#if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)
+1 24 "wx/msw/wx.manifest"
+#endif
 #endif