X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2dace059ee7aefeea0f2b843f1808b117f112795..4c3ebca927cea2742ec128c9c3ef3676d1ecae01:/include/wx/msw/wx.rc

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index 2a9681b78c..5f27ac35d8 100644
--- 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_POPUP | WS_SYSMENU | WS_THICKFRAME
-CAPTION ""
-BEGIN
-#ifdef __WATCOMC__
-	LTEXT "", -1,-2,-2,1,1
-#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
+#if defined(_WIN32_WCE)
+        #include <commctrl.h>
 #endif
-END
 
 //////////////////////////////////////////////////////////////////////////////
 //
@@ -87,6 +57,34 @@ 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
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    5001      "Dummy menu"
+END
+
+#endif
+
+
 //////////////////////////////////////////////////////////////////////////////
 //
 // Standard wxWindows Cursors
@@ -97,7 +95,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 +102,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,15 +114,6 @@ WXCURSOR_BLANK          CURSOR  DISCARDABLE     "wx/msw/blank.cur"
 //wxDEFAULT_MDIPARENTFRAME      ICON "wx/msw/mdi.ico"
 //wxDEFAULT_MDICHILDFRAME       ICON "wx/msw/child.ico"
 
-// Standard large icons
-/* we don't use these files any more, use Windows standard icons instead
-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"
@@ -139,16 +129,7 @@ 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"
-#endif
-
-
-// For src/generic/proplist.cpp
-tick_bmp                BITMAP  "wx/msw/tick.bmp"
-cross_bmp               BITMAP  "wx/msw/cross.bmp"
 
 // For wxContextHelpButton
 csquery                 BITMAP "wx/msw/csquery.bmp"
@@ -156,3 +137,12 @@ 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(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)
+1 24 "wx/msw/wx.manifest"
+#endif
+