fix several bugs in index/position translation code between wx and MSW

[wxWidgets.git] / src / msw / wince / tbarwce.cpp

diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp
index 173dbd249ee2f1fbbbd43f25014e82c9b46cc7ee..ce45117cf40ba03f216efab6bec83268ffbaa4d8 100644 (file)
--- a/src/msw/wince/tbarwce.cpp
+++ b/src/msw/wince/tbarwce.cpp
@@ -28,7 +28,10 @@
 // with a WinCE earlier than 4, or we wish to emulate a PocketPC-style UI
 #if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE && (_WIN32_WCE < 400 || defined(__POCKETPC__) || defined(__SMARTPHONE__))
 
 // with a WinCE earlier than 4, or we wish to emulate a PocketPC-style UI
 #if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE && (_WIN32_WCE < 400 || defined(__POCKETPC__) || defined(__SMARTPHONE__))
 

+#include "wx/toolbar.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"

     #include "wx/dynarray.h"
     #include "wx/frame.h"
     #include "wx/log.h"
     #include "wx/dynarray.h"
     #include "wx/frame.h"
     #include "wx/log.h"


@@ -39,15 +42,10 @@
     #include "wx/control.h"
 #endif
 
     #include "wx/control.h"
 #endif
 

-#include "wx/toolbar.h"
-
-#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
+#if !defined(__GNUWIN32__)

     #include "malloc.h"
 #endif
 
     #include "malloc.h"
 #endif
 

-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-

 #include "wx/msw/private.h"
 #include <windows.h>
 #include <windowsx.h>
 #include "wx/msw/private.h"
 #include <windows.h>
 #include <windowsx.h>


@@ -56,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"
 


@@ -98,8 +97,8 @@ public:
         m_bitmapIndex = -1;
     }
 
         m_bitmapIndex = -1;
     }
 

-    wxToolMenuBarTool(wxToolBar *tbar, wxControl *control)
-        : wxToolBarToolBase(tbar, control)
+    wxToolMenuBarTool(wxToolBar *tbar, wxControl *control, const wxString& label)
+        : wxToolBarToolBase(tbar, control, label)

     {
         m_nSepCount = 1;
         m_bitmapIndex = -1;
     {
         m_nSepCount = 1;
         m_bitmapIndex = -1;


@@ -153,9 +152,10 @@ wxToolBarToolBase *wxToolMenuBar::CreateTool(int id,
                              clientData, shortHelp, longHelp);
 }
 
                              clientData, shortHelp, longHelp);
 }
 

-wxToolBarToolBase *wxToolMenuBar::CreateTool(wxControl *control)
+wxToolBarToolBase *
+wxToolMenuBar::CreateTool(wxControl *control, const wxString& label)

 {
 {

-    return new wxToolMenuBarTool(this, control);
+    return new wxToolMenuBarTool(this, control, label);

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


@@ -193,30 +193,26 @@ bool wxToolMenuBar::Create(wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

-bool wxToolMenuBar::MSWCreateToolbar(const wxPoint& WXUNUSED(pos), const wxSize& WXUNUSED(size), wxMenuBar* menuBar)
+bool wxToolMenuBar::MSWCreateToolbar(const wxPoint& WXUNUSED(pos),
+                                     const wxSize& WXUNUSED(size),
+                                     wxMenuBar *menuBar)

 {
     SetMenuBar(menuBar);
     if (m_menuBar)
         m_menuBar->SetToolBar(this);
 
 {
     SetMenuBar(menuBar);
     if (m_menuBar)
         m_menuBar->SetToolBar(this);
 

+    HWND hwndParent = GetHwndOf(GetParent());
+    wxCHECK_MSG( hwndParent, false, _T("should have valid parent HWND") );
+

 #if defined(WINCE_WITHOUT_COMMANDBAR)
 #if defined(WINCE_WITHOUT_COMMANDBAR)

-    // Create the menubar.
-    SHMENUBARINFO mbi;
-
-    memset (&mbi, 0, sizeof (SHMENUBARINFO));
-    mbi.cbSize     = sizeof (SHMENUBARINFO);
-    mbi.hwndParent = (HWND) GetParent()->GetHWND();
-#ifdef __SMARTPHONE__
-    mbi.nToolBarId = 5002;
-#else
-    mbi.nToolBarId = 5000;
-#endif
-    mbi.nBmpId     = 0;
-    mbi.cBmpImages = 0;
-    mbi.dwFlags = 0 ; // SHCMBF_EMPTYBAR;
+    // create the menubar.
+    WinStruct<SHMENUBARINFO> mbi;
+
+    mbi.hwndParent = hwndParent;
+    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;


@@ -224,7 +220,7 @@ bool wxToolMenuBar::MSWCreateToolbar(const wxPoint& WXUNUSED(pos), const wxSize&
 
     SetHWND((WXHWND) mbi.hwndMB);
 #else
 
     SetHWND((WXHWND) mbi.hwndMB);
 #else

-    HWND hWnd = CommandBar_Create(wxGetInstance(), (HWND) GetParent()->GetHWND(), GetId());
+    HWND hWnd = CommandBar_Create(wxGetInstance(), hwndParent, GetId());

     SetHWND((WXHWND) hWnd);
 #endif
 
     SetHWND((WXHWND) hWnd);
 #endif
 


@@ -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;

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


@@ -405,7 +399,7 @@ bool wxToolMenuBar::Realize()
                     const wxString& label = tool->GetLabel();
                     if ( !label.empty() )
                     {
                     const wxString& label = tool->GetLabel();
                     if ( !label.empty() )
                     {

-                        button.iString = (int)label.c_str();
+                        button.iString = (int)label.wx_str();

                     }
                 }
 
                     }
                 }
 


@@ -488,24 +482,28 @@ bool wxToolMenuBar::Realize()
     return true;
 }
 
     return true;
 }
 

-bool wxToolMenuBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id)
+bool wxToolMenuBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id_)

 {
 {

-    wxToolBarToolBase *tool = FindById((int)id);
+    const int id = (signed short)id_;
+
+    wxToolBarToolBase *tool = FindById(id);

     if ( !tool )
     {
     if ( !tool )
     {

-        if (m_menuBar)
+        bool checked = false;
+        if ( m_menuBar )

         {
             wxMenuItem *item = m_menuBar->FindItem(id);
         {
             wxMenuItem *item = m_menuBar->FindItem(id);

-            if (item && item->IsCheckable())
+            if ( item && item->IsCheckable() )

             {
                 item->Toggle();
             {
                 item->Toggle();

+                checked = item->IsChecked();

             }
         }
 
         wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED);
         event.SetEventObject(this);
         event.SetId(id);
             }
         }
 
         wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED);
         event.SetEventObject(this);
         event.SetId(id);

-        event.SetInt(id);
+        event.SetInt(checked);

 
         return GetEventHandler()->ProcessEvent(event);
     }
 
         return GetEventHandler()->ProcessEvent(event);
     }