fixed memory leak in wxXmlResource introduced when fixing wxVector<> usage (patch...

[wxWidgets.git] / src / msw / tbar95.cpp

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 7966a6cd196f389d3f73cb1c0d42dd81a68b4332..21ab3d581f57d818c867407bfaf675744d9337c2 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -44,6 +44,7 @@
 #endif
 
 #include "wx/sysopt.h"
 #endif
 
 #include "wx/sysopt.h"

+#include "wx/dcclient.h"

 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 


@@ -414,7 +415,7 @@ wxSize wxToolBar::DoGetBestSize() const
         if (!(GetWindowStyle() & wxTB_NODIVIDER))
             sizeBest.y += 2;
         sizeBest.y ++;
         if (!(GetWindowStyle() & wxTB_NODIVIDER))
             sizeBest.y += 2;
         sizeBest.y ++;

-       }
+    }

 
     CacheBestSize(sizeBest);
 
 
     CacheBestSize(sizeBest);
 


@@ -954,7 +955,7 @@ bool wxToolBar::Realize()
                                 if ( tool->Toggle(false) )
                                     DoToggleTool(tool, false);
 
                                 if ( tool->Toggle(false) )
                                     DoToggleTool(tool, false);
 

-                                prevButton.fsState &= TBSTATE_CHECKED;
+                                prevButton.fsState &= ~TBSTATE_CHECKED;

                                 nodePrev = nodePrev->GetPrevious();
                                 prevIndex--;
                             }
                                 nodePrev = nodePrev->GetPrevious();
                                 prevIndex--;
                             }


@@ -1178,9 +1179,14 @@ bool wxToolBar::Realize()
 // message handlers
 // ----------------------------------------------------------------------------
 
 // message handlers
 // ----------------------------------------------------------------------------
 

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

 {
 {

-    wxToolBarToolBase *tool = FindById((int)id);
+    // cast to signed is important as we compare this id with (signed) ints in
+    // FindById() and without the cast we'd get a positive int from a
+    // "negative" (i.e. > 32767) WORD
+    const int id = (signed short)id_;
+
+    wxToolBarToolBase *tool = FindById(id);

     if ( !tool )
         return false;
 
     if ( !tool )
         return false;
 


@@ -1202,7 +1208,7 @@ bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id)
 
     // OnLeftClick() can veto the button state change - for buttons which
     // may be toggled only, of couse
 
     // OnLeftClick() can veto the button state change - for buttons which
     // may be toggled only, of couse

-    if ( !OnLeftClick((int)id, toggled) && tool->CanBeToggled() )
+    if ( !OnLeftClick(id, toggled) && tool->CanBeToggled() )

     {
         // revert back
         tool->Toggle(!toggled);
     {
         // revert back
         tool->Toggle(!toggled);


@@ -1223,7 +1229,7 @@ bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
         LPNMTOOLBAR tbhdr = (LPNMTOOLBAR)lParam;
 
         wxCommandEvent evt(wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, tbhdr->iItem);
         LPNMTOOLBAR tbhdr = (LPNMTOOLBAR)lParam;
 
         wxCommandEvent evt(wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, tbhdr->iItem);

-        if ( GetEventHandler()->ProcessEvent(evt) )
+        if ( HandleWindowEvent(evt) )

         {
             // Event got handled, don't display default popup menu
             return false;
         {
             // Event got handled, don't display default popup menu
             return false;


@@ -1531,7 +1537,11 @@ void wxToolBar::OnMouseEvent(wxMouseEvent& event)
 void wxToolBar::OnEraseBackground(wxEraseEvent& event)
 {
     RECT rect = wxGetClientRect(GetHwnd());
 void wxToolBar::OnEraseBackground(wxEraseEvent& event)
 {
     RECT rect = wxGetClientRect(GetHwnd());

-    HDC hdc = GetHdcOf((*event.GetDC()));
+    
+    wxDC *dc = event.GetDC();
+    if (!dc) return;
+    wxMSWDCImpl *impl = (wxMSWDCImpl*) dc->GetImpl();
+    HDC hdc = GetHdcOf(*impl);

 
     int majorVersion, minorVersion;
     wxGetOsVersion(& majorVersion, & minorVersion);
 
     int majorVersion, minorVersion;
     wxGetOsVersion(& majorVersion, & minorVersion);


@@ -1763,8 +1773,9 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
                             r.right = clientSize.x;
                             r.top = 0;
                             r.bottom = clientSize.y;
                             r.right = clientSize.x;
                             r.top = 0;
                             r.bottom = clientSize.y;

-
-                            HRESULT hr = theme->DrawThemeBackground(hTheme, (HDC) dc.GetHDC(), 0, 0, & r, & clipRect);
+                            
+                            wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
+                            HRESULT hr = theme->DrawThemeBackground(hTheme, GetHdcOf(*impl), 0, 0, & r, & clipRect);

                             if ( hr == S_OK )
                                 haveRefreshed = true;
                         }
                             if ( hr == S_OK )
                                 haveRefreshed = true;
                         }


@@ -1780,7 +1791,7 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
                     // Necessary in case we use a no-paint-on-size
                     // style in the parent: the controls can disappear
                     control->Refresh(false);
                     // Necessary in case we use a no-paint-on-size
                     // style in the parent: the controls can disappear
                     control->Refresh(false);

-                               }
+                }

 
                 if ( staticText && rectStaticText.Intersects(rectItem) )
                 {
 
                 if ( staticText && rectStaticText.Intersects(rectItem) )
                 {