use symbolic name for the shell menu bar too; include resources.h in wince.rc directl...

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

diff --git a/include/wx/msw/wince/resources.h b/include/wx/msw/wince/resources.h
index 9f49f0fef0cf33ff57f61578201ac8097fd9c9a0..b1686a0fa35099e4ede711440f4a845cad161d64 100644 (file)
--- a/include/wx/msw/wince/resources.h
+++ b/include/wx/msw/wince/resources.h
@@ -9,6 +9,9 @@
 // License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // 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
 #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
 #define IDR_MENUBAR_LEFT_MENU    40031
 #define IDR_MENUBAR_RIGHT_MENU   40032
 #define IDR_MENUBAR_BOTH_MENUS   40033

-

diff --git a/include/wx/msw/wince/smartphone.rc b/include/wx/msw/wince/smartphone.rc
index 48f9258a58ee87947e0ec00d888ec8dd147d050c..e906236672917b4a740b15ac571ba3431a9bccb3 100644 (file)
--- a/include/wx/msw/wince/smartphone.rc
+++ b/include/wx/msw/wince/smartphone.rc
@@ -11,8 +11,6 @@
 
 #include <aygshell.h>
 
 
 #include <aygshell.h>
 

-#include "wx/msw/wince/resources.h"
-

 STRINGTABLE
 BEGIN
     IDS_EMPTY   ""
 STRINGTABLE
 BEGIN
     IDS_EMPTY   ""

diff --git a/include/wx/msw/wince/wince.rc b/include/wx/msw/wince/wince.rc
index d1f542224fa3ca6310b228dd3f85b068c6823cc7..e9c7e28ef7771d2ff0414754028a350cff4447a7 100644 (file)
--- a/include/wx/msw/wince/wince.rc
+++ b/include/wx/msw/wince/wince.rc
@@ -1,26 +1,15 @@
 #include <commctrl.h>
 #include <commctrl.h>

+#include "wx/msw/wince/resources.h"

 
 #ifdef WIN32_PLATFORM_WFSP
     #include "wx/msw/wince/smartphone.rc"
 
 #ifdef WIN32_PLATFORM_WFSP
     #include "wx/msw/wince/smartphone.rc"

-#else
+#else // !smartphone

 
 

-// Dummy menubar/toolbar for WinCE
-
-5000 RCDATA DISCARDABLE
+// Dummy empty menubar/toolbar for WinCE
+wxIDM_SHMENU RCDATA DISCARDABLE

 BEGIN
 BEGIN

-  // Popup menu name
-  5000,
-  // Count of items to put on the menu
+  wxIDM_SHMENU,

   0
 END
 
   0
 END
 

-5000 MENU DISCARDABLE
-BEGIN
-    POPUP "Dummy"
-    BEGIN
-    MENUITEM "Dummy" 99
-    END
-END
-
-#endif
-
+#endif // smartphone/!smartphone

diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp
index af64b582b757f1933e9f549414a556ef75df6590..04a1efc20f1581202ae47c55249c60780065946a 100644 (file)
--- a/src/msw/wince/tbarwce.cpp
+++ b/src/msw/wince/tbarwce.cpp
@@ -54,6 +54,7 @@
 #include <shellapi.h>
 #if defined(WINCE_WITHOUT_COMMANDBAR)
   #include <aygshell.h>
 #include <shellapi.h>
 #if defined(WINCE_WITHOUT_COMMANDBAR)
   #include <aygshell.h>

+  #include "wx/msw/wince/resources.h"

 #endif
 #include "wx/msw/wince/missing.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)
     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;
     WinStruct<SHMENUBARINFO> mbi;
 
     mbi.hwndParent = hwndParent;

-#ifdef __SMARTPHONE__
-    mbi.nToolBarId = 5002;
-#else
-    mbi.nToolBarId = 5000;
-#endif
-    mbi.dwFlags = SHCMBF_EMPTYBAR;
+    mbi.nToolBarId = wxIDM_SHMENU;

     mbi.hInstRes = wxGetInstance();
 
     mbi.hInstRes = wxGetInstance();
 

-    if (!SHCreateMenuBar(&mbi))
+    if ( !SHCreateMenuBar(&mbi) )

     {
         wxFAIL_MSG( _T("SHCreateMenuBar failed") );
         return false;
     {
         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()
 {
 // Return HMENU for the menu associated with the commandbar
 WXHMENU wxToolMenuBar::GetHMenu()
 {

-#if defined(__HANDHELDPC__)
-    return 0;
-#else
+#if !defined(__HANDHELDPC__)

     if (GetHWND())
     {
     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
 #endif

+
+    return NULL;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------