Resources changes

svn-id: r6557

3 files changed, 92 insertions, 6 deletions

diff --git a/backends/wince/PocketSCUMM.rc b/backends/wince/PocketSCUMM.rc
index c9c223ec64..71d7ca85de 100644
--- a/backends/wince/PocketSCUMM.rc
+++ b/backends/wince/PocketSCUMM.rc
@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include "newres.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -28,7 +28,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_ICON1               ICON    DISCARDABLE     "scumm_icon.ico"
+IDI_POCKETSCUMM         ICON    DISCARDABLE     "scumm_icon.ico"
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -43,7 +43,7 @@ END
 
 2 TEXTINCLUDE DISCARDABLE 
 BEGIN
-    "#include ""afxres.h""\r\n"
+    "#include ""newres.h""\r\n"
     "\0"
 END
 
@@ -55,6 +55,69 @@ END
 
 #endif    // APSTUDIO_INVOKED
 
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menubar
+//
+
+IDR_SMARTFON_MENUBAR_GAMES MENU DISCARDABLE 
+BEGIN
+    POPUP "Games"
+    BEGIN
+        POPUP "Play"
+        BEGIN
+            MENUITEM SEPARATOR
+        END
+        MENUITEM SEPARATOR
+        MENUITEM "Scan",                        IDM_SMARTFON_SCAN
+        MENUITEM SEPARATOR
+        MENUITEM "Quit",                        IDM_SMARTFON_QUIT
+    END
+    POPUP "Options"
+    BEGIN
+        POPUP "Keys Mapping"
+        BEGIN
+            MENUITEM SEPARATOR
+        END
+        MENUITEM "Music",                       IDM_SMARTFON_MUSIC
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Data
+//
+
+IDR_SMARTFON_MENUBAR_GAMES SHMENUBAR DISCARDABLE 
+BEGIN
+    IDR_SMARTFON_MENUBAR_GAMES, 2,
+    I_IMAGENONE, ID_MENU_GAMES, TBSTATE_ENABLED, 
+    TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_MENUITEM40002, 0, 0,
+    I_IMAGENONE, ID_MENU_OPTIONS, TBSTATE_ENABLED, 
+    TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_OPTIONS, 0, 1,
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_LOGO                BITMAP  DISCARDABLE     "logo.bmp"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_CAP_MENUITEM40002   "Games"
+    IDS_CAP_OPTIONS         "Options"
+END
+
 #endif    // French (France) resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/backends/wince/newres.h b/backends/wince/newres.h
index 57f429fa45..a02ab23955 100644
--- a/backends/wince/newres.h
+++ b/backends/wince/newres.h
@@ -1,6 +1,18 @@
+///////////////////////////////////////////////////////////////////////////////
+//  THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
+//  ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+//  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
+//  PARTICULAR PURPOSE.
+//
+//  This is "Sample Code" and is distributable subject to the terms of the 
+//  end user license agreement.
+///////////////////////////////////////////////////////////////////////////////
+
 #ifndef __NEWRES_H__
 #define __NEWRES_H__
 
+#include "windows.h"
+
 #if !defined(UNDER_CE)
 #define UNDER_CE _WIN32_WCE
 #endif
@@ -11,7 +23,7 @@
 	#endif
 	#include <commctrl.h>
 	#define  SHMENUBAR RCDATA
-	#if defined(WIN32_PLATFORM_PSPC) && (_WIN32_WCE >= 300)
+	#if defined(WIN32_PLATFORM_WFSP) && (_WIN32_WCE >= 300)
 		#include <aygshell.h>
 		#define AFXCE_IDR_SCRATCH_SHMENU  28700
 	#else
diff --git a/backends/wince/resource.h b/backends/wince/resource.h
index 004a574a00..d8db1f9d36 100644
--- a/backends/wince/resource.h
+++ b/backends/wince/resource.h
@@ -3,13 +3,24 @@
 // Used by PocketSCUMM.rc
 //
 #define IDI_ICON1                       101
+#define IDI_POCKETSCUMM                 101
+#define IDR_SMARTFON_MENUBAR_GAMES      102
+#define IDR_SMARTFON_MENUBAR_OPTIONS    103
+#define IDB_LOGO                        106
+#define IDS_CAP_MENUITEM40002           40003
+#define ID_MENU_GAMES                   40006
+#define IDM_SMARTFON_SCAN               40007
+#define IDM_SMARTFON_QUIT               40009
+#define IDS_CAP_OPTIONS                 40015
+#define ID_MENU_OPTIONS                 40016
+#define IDM_SMARTFON_MUSIC              40017
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        102
-#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_RESOURCE_VALUE        107
+#define _APS_NEXT_COMMAND_VALUE         40021
 #define _APS_NEXT_CONTROL_VALUE         1000
 #define _APS_NEXT_SYMED_VALUE           101
 #endif