Compilation fix for OS/2.

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

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index 69db0764c368a8d2f0d30740ccbe34440f3e3d27..619a188d6fb235ad4d095f91b0cfab252b81efcc 100644 (file)
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -30,13 +30,13 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #if (defined( __GNUWIN32__ ) && !defined(__TWIN32__)) || defined(__MWERKS__)
-       #include <wx/msw/gnuwin32/winresrc.h>
+    #include "wx/msw/gnuwin32/winresrc.h"
 #else
-       #include <windows.h>
+    #include <windows.h>
 #endif
 
 #if defined(_WIN32_WCE)
-        #include <commctrl.h>
+    #include "wx/msw/wince/wince.rc"
 #endif
 
 //////////////////////////////////////////////////////////////////////////////
@@ -57,95 +57,6 @@ 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
@@ -190,8 +101,6 @@ wxICON_SMALL_REMOVEABLE         ICON "wx/msw/removble.ico"
 // Bitmaps
 //
 
-wxDISABLE_BUTTON_BITMAP         BITMAP  "wx/msw/disable.bmp"
-
 // For wxContextHelpButton
 csquery                 BITMAP "wx/msw/csquery.bmp"
 
@@ -203,7 +112,9 @@ 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