catch unhandled exceptions in POSIX threads implementation the same way wxMSW does

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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index b766b3f2bc07e9aa1c83c52ab5406cbc97f8ae63..b12dd40b5f599a77fc069769e10338872ea227e1 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -303,8 +303,17 @@ bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size)
     // toolbar-specific post initialisation
     ::SendMessage(GetHwnd(), TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
 
     // toolbar-specific post initialisation
     ::SendMessage(GetHwnd(), TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
 

+#ifdef TB_SETEXTENDEDSTYLE

     if ( wxApp::GetComCtl32Version() >= 471 )
         ::SendMessage(GetHwnd(), TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_DRAWDDARROWS);
     if ( wxApp::GetComCtl32Version() >= 471 )
         ::SendMessage(GetHwnd(), TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_DRAWDDARROWS);

+#endif
+
+    // Fix a bug on e.g. the Silver theme on WinXP where control backgrounds
+    // are incorrectly drawn, by forcing the background to a specific colour.
+    int majorVersion, minorVersion;
+    wxGetOsVersion(& majorVersion, & minorVersion);
+    if (majorVersion < 6)
+        SetBackgroundColour(GetBackgroundColour());

 
     return true;
 }
 
     return true;
 }


@@ -403,8 +412,16 @@ wxSize wxToolBar::DoGetBestSize() const
         sizeBest.y = size.cy;
     }
 
         sizeBest.y = size.cy;
     }
 

-    if (!IsVertical() && !(GetWindowStyle() & wxTB_NODIVIDER))
-        sizeBest.y += 1;
+    if (!IsVertical())
+    {
+        // Without the extra height, DoGetBestSize can report a size that's
+        // smaller than the actual window, causing windows to overlap slightly
+        // in some circumstances, leading to missing borders (especially noticeable
+        // in AUI layouts).
+        if (!(GetWindowStyle() & wxTB_NODIVIDER))
+            sizeBest.y += 2;
+        sizeBest.y ++;
+    }

 
     CacheBestSize(sizeBest);
 
 
     CacheBestSize(sizeBest);
 


@@ -930,7 +947,7 @@ bool wxToolBar::Realize()
                                 DoToggleTool(tool, true);
                             }
                         }
                                 DoToggleTool(tool, true);
                             }
                         }

-                        else if (tool->IsToggled())
+                        else if ( tool->IsToggled() )

                         {
                             wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious();
                             int prevIndex = i - 1;
                         {
                             wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious();
                             int prevIndex = i - 1;


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

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

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


@@ -1168,9 +1185,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;
 


@@ -1192,7 +1214,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);


@@ -1548,7 +1570,7 @@ void wxToolBar::OnEraseBackground(wxEraseEvent& event)
     }
 
     // Only draw a rebar theme on Vista, since it doesn't jive so well with XP
     }
 
     // Only draw a rebar theme on Vista, since it doesn't jive so well with XP

-    if ( !UseBgCol() && majorVersion >= 6)
+    if ( !UseBgCol() && majorVersion >= 6 )

     {
         wxUxThemeEngine *theme = wxUxThemeEngine::GetIfActive();
         if ( theme )
     {
         wxUxThemeEngine *theme = wxUxThemeEngine::GetIfActive();
         if ( theme )


@@ -1727,16 +1749,7 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
                 // does it intersect the control?
                 wxRect rectItem;
                 wxCopyRECTToRect(r, rectItem);
                 // does it intersect the control?
                 wxRect rectItem;
                 wxCopyRECTToRect(r, rectItem);

-                if ( rectCtrl.Intersects(rectItem) )
-                {
-                    // yes, do erase it!
-                    dc.DrawRectangle(rectItem);
-
-                    // 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 ( rectCtrl.Intersects(rectItem) || (staticText && rectStaticText.Intersects(rectItem)))

                 {
                     // yes, do erase it!
 
                 {
                     // yes, do erase it!
 


@@ -1747,7 +1760,7 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
                     {
                         // Don't use DrawThemeBackground
                     }
                     {
                         // Don't use DrawThemeBackground
                     }

-                    else if (!UseBgCol() && majorVersion >= 6)
+                    else if ( !UseBgCol() && majorVersion >= 6 )

                     {
                         wxUxThemeEngine *theme = wxUxThemeEngine::GetIfActive();
                         if ( theme )
                     {
                         wxUxThemeEngine *theme = wxUxThemeEngine::GetIfActive();
                         if ( theme )


@@ -1772,7 +1785,17 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
 
                     if (!haveRefreshed)
                         dc.DrawRectangle(rectItem);
 
                     if (!haveRefreshed)
                         dc.DrawRectangle(rectItem);

+                }

 
 

+                if ( rectCtrl.Intersects(rectItem) )
+                {
+                    // 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) )
+                {

                     // Necessary in case we use a no-paint-on-size
                     // style in the parent: the controls can disappear
                     staticText->Refresh(false);
                     // Necessary in case we use a no-paint-on-size
                     // style in the parent: the controls can disappear
                     staticText->Refresh(false);