use symbolic name for the shell menu bar too; include resources.h in wince.rc directly instead of only doing it from smartphone.rc

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/msw/wince/resources.h

@@ -9,6 +9,9 @@
 // License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
+// Windows CE dummy menu for SHCreateMenuBar()
+#define wxIDM_SHMENU             40000
+
 #define IDM_LEFT                 40001
 #define IDM_RIGHT                40002
 #define IDM_ITEM                 40003
@@ -22,4 +25,3 @@
 #define IDR_MENUBAR_LEFT_MENU    40031
 #define IDR_MENUBAR_RIGHT_MENU   40032
 #define IDR_MENUBAR_BOTH_MENUS   40033
-

include/wx/msw/wince/smartphone.rc

@@ -11,8 +11,6 @@
 
 #include <aygshell.h>
 
-#include "wx/msw/wince/resources.h"
-
 STRINGTABLE
 BEGIN
     IDS_EMPTY   ""

include/wx/msw/wince/wince.rc

@@ -1,26 +1,15 @@
 #include <commctrl.h>
+#include "wx/msw/wince/resources.h"
 
 #ifdef WIN32_PLATFORM_WFSP
     #include "wx/msw/wince/smartphone.rc"
-#else
+#else // !smartphone
 
-// Dummy menubar/toolbar for WinCE
+// Dummy empty menubar/toolbar for WinCE
-
+wxIDM_SHMENU RCDATA DISCARDABLE
-5000 RCDATA DISCARDABLE
 BEGIN
-  // Popup menu name
+  wxIDM_SHMENU,
-  5000,
-  // Count of items to put on the menu
   0
 END
 
-5000 MENU DISCARDABLE
+#endif // smartphone/!smartphone
-BEGIN
-    POPUP "Dummy"
-    BEGIN
-    MENUITEM "Dummy" 99
-    END
-END
-
-#endif
-

src/msw/wince/tbarwce.cpp

@@ -54,6 +54,7 @@
 #include <shellapi.h>
 #if defined(WINCE_WITHOUT_COMMANDBAR)
   #include <aygshell.h>
+  #include "wx/msw/wince/resources.h"
 #endif
 #include "wx/msw/wince/missing.h"
 
@@ -204,19 +205,14 @@ bool wxToolMenuBar::MSWCreateToolbar(const wxPoint& WXUNUSED(pos),
     wxCHECK_MSG( hwndParent, false, _T("should have valid parent HWND") );
 
 #if defined(WINCE_WITHOUT_COMMANDBAR)
-    // Create the menubar.
+    // create the menubar.
     WinStruct<SHMENUBARINFO> mbi;
 
     mbi.hwndParent = hwndParent;
-#ifdef __SMARTPHONE__
+    mbi.nToolBarId = wxIDM_SHMENU;
-    mbi.nToolBarId = 5002;
-#else
-    mbi.nToolBarId = 5000;
-#endif
-    mbi.dwFlags = SHCMBF_EMPTYBAR;
     mbi.hInstRes = wxGetInstance();
 
-    if (!SHCreateMenuBar(&mbi))
+    if ( !SHCreateMenuBar(&mbi) )
     {
         wxFAIL_MSG( _T("SHCreateMenuBar failed") );
         return false;
@@ -251,16 +247,14 @@ wxToolMenuBar::~wxToolMenuBar()
 // Return HMENU for the menu associated with the commandbar
 WXHMENU wxToolMenuBar::GetHMenu()
 {
-#if defined(__HANDHELDPC__)
+#if !defined(__HANDHELDPC__)
-    return 0;
-#else
     if (GetHWND())
     {
-        return (WXHMENU) (HMENU)::SendMessage((HWND) GetHWND(), SHCMBM_GETMENU, (WPARAM)0, (LPARAM)0);
+        return (WXHMENU)::SendMessage(GetHwnd(), SHCMBM_GETMENU, 0, 0);
     }
-    else
-        return 0;
 #endif
+
+    return NULL;
 }
 
 // ----------------------------------------------------------------------------