use wxCopyRectToRECT instead of duplicating it

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

diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp
index 173dbd249ee2f1fbbbd43f25014e82c9b46cc7ee..0ff004bae357bb403193dacf4617b8dc8530c5a3 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__)
     #include "malloc.h"
 #endif
 
 #if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
     #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>


@@ -98,8 +96,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 +151,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);

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


@@ -493,19 +492,21 @@ bool wxToolMenuBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id)
     wxToolBarToolBase *tool = FindById((int)id);
     if ( !tool )
     {
     wxToolBarToolBase *tool = FindById((int)id);
     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);
     }