Further style preview fix

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

diff --git a/src/msw/toolbar.cpp b/src/msw/toolbar.cpp
index 7e0a93f4edeb8e535cbd286954356ef0ad79d484..e8c47e5ed3e09a7ec923a530ca2bcf1e785f5a94 100644 (file)
--- a/src/msw/toolbar.cpp
+++ b/src/msw/toolbar.cpp
@@ -219,6 +219,33 @@ private:
     DECLARE_NO_COPY_CLASS(wxToolBarTool)
 };
 
     DECLARE_NO_COPY_CLASS(wxToolBarTool)
 };
 

+// ----------------------------------------------------------------------------
+// helper functions
+// ----------------------------------------------------------------------------
+
+// return the rectangle of the item at the given index
+//
+// returns an empty (0, 0, 0, 0) rectangle if fails so the caller may compare
+// r.right or r.bottom with 0 to check for this
+static RECT wxGetTBItemRect(HWND hwnd, int index)
+{
+    RECT r;
+
+    // note that we use TB_GETITEMRECT and not TB_GETRECT because the latter
+    // only appeared in v4.70 of comctl32.dll
+    if ( !::SendMessage(hwnd, TB_GETITEMRECT, index, (LPARAM)&r) )
+    {
+        wxLogLastError(wxT("TB_GETITEMRECT"));
+
+        r.top =
+        r.left =
+        r.right =
+        r.bottom = 0;
+    }
+
+    return r;
+}
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -401,13 +428,27 @@ wxSize wxToolBar::DoGetBestSize() const
             sizeBest.y = t;
         }
     }
             sizeBest.y = t;
         }
     }

-    else
+    else // TB_GETMAXSIZE succeeded

     {
     {

+        // but it could still return an incorrect result due to what appears to
+        // be a bug in old comctl32.dll versions which don't handle controls in
+        // the toolbar correctly, so work around it (see SF patch 1902358)
+        if ( !IsVertical() && wxApp::GetComCtl32Version() < 600 )
+        {
+            // calculate the toolbar width in alternative way
+            const RECT rcFirst = wxGetTBItemRect(GetHwnd(), 0);
+            const RECT rcLast = wxGetTBItemRect(GetHwnd(), GetToolsCount() - 1);
+
+            const int widthAlt = rcLast.right - rcFirst.left;
+            if ( widthAlt > size.cx )
+                size.cx = widthAlt;
+        }
+

         sizeBest.x = size.cx;
         sizeBest.y = size.cy;
     }
 
         sizeBest.x = size.cx;
         sizeBest.y = size.cy;
     }
 

-    if (!IsVertical())
+    if ( !IsVertical() )

     {
         // Without the extra height, DoGetBestSize can report a size that's
         // smaller than the actual window, causing windows to overlap slightly
     {
         // Without the extra height, DoGetBestSize can report a size that's
         // smaller than the actual window, causing windows to overlap slightly


@@ -473,7 +514,8 @@ WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const
 // adding/removing tools
 // ----------------------------------------------------------------------------
 
 // adding/removing tools
 // ----------------------------------------------------------------------------
 

-bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)
+bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
+                             wxToolBarToolBase * WXUNUSED(tool))

 {
     // nothing special to do here - we really create the toolbar buttons in
     // Realize() later
 {
     // nothing special to do here - we really create the toolbar buttons in
     // Realize() later


@@ -510,11 +552,7 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
     size_t nButtonsToDelete = 1;
 
     // get the size of the button we're going to delete
     size_t nButtonsToDelete = 1;
 
     // get the size of the button we're going to delete

-    RECT r;
-    if ( !::SendMessage(GetHwnd(), TB_GETITEMRECT, pos, (LPARAM)&r) )
-    {
-        wxLogLastError(_T("TB_GETITEMRECT"));
-    }
+    const RECT r = wxGetTBItemRect(GetHwnd(), pos);

 
     int width = r.right - r.left;
 
 
     int width = r.right - r.left;
 


@@ -543,13 +581,15 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
         wxToolBarTool *tool2 = (wxToolBarTool*)node->GetData();
         if ( tool2->IsControl() )
         {
         wxToolBarTool *tool2 = (wxToolBarTool*)node->GetData();
         if ( tool2->IsControl() )
         {

+            wxControl * const control = tool2->GetControl();
+

             int x;
             int x;

-            wxControl *control = tool2->GetControl();

             control->GetPosition(&x, NULL);
             control->Move(x - width, wxDefaultCoord);
 
             control->GetPosition(&x, NULL);
             control->Move(x - width, wxDefaultCoord);
 

-            wxStaticText* staticText = tool2->GetStaticText();
-            staticText->Move(x - width, wxDefaultCoord);
+            wxStaticText * const staticText = tool2->GetStaticText();
+            if ( staticText )
+                staticText->Move(x - width, wxDefaultCoord);

         }
     }
 
         }
     }
 


@@ -1011,15 +1051,7 @@ bool wxToolBar::Realize()
         if ( !isControl && !IsVertical() )
             continue;
 
         if ( !isControl && !IsVertical() )
             continue;
 

-        // note that we use TB_GETITEMRECT and not TB_GETRECT because the
-        // latter only appeared in v4.70 of comctl32.dll
-        RECT r;
-        if ( !::SendMessage(GetHwnd(), TB_GETITEMRECT,
-                            index, (LPARAM)(LPRECT)&r) )
-        {
-            wxLogLastError(wxT("TB_GETITEMRECT"));
-        }
-
+        const RECT r = wxGetTBItemRect(GetHwnd(), index);

         if ( !isControl )
         {
             // can only be control if isVertical
         if ( !isControl )
         {
             // can only be control if isVertical


@@ -1239,8 +1271,8 @@ bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
             return false;
 
         // Display popup menu below button
             return false;
 
         // Display popup menu below button

-        RECT r;
-        if (::SendMessage(GetHwnd(), TB_GETITEMRECT, GetToolPos(tbhdr->iItem), (LPARAM)&r))
+        const RECT r = wxGetTBItemRect(GetHwnd(), GetToolPos(tbhdr->iItem));
+        if ( r.right )

             PopupMenu(menu, r.left, r.bottom);
 
         return true;
             PopupMenu(menu, r.left, r.bottom);
 
         return true;


@@ -1612,48 +1644,50 @@ void wxToolBar::OnEraseBackground(wxEraseEvent& event)
 
 bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
 {
 
 bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
 {

+    // wait until we have some tools
+    if ( !GetToolsCount() )
+        return false;
+

     // calculate our minor dimension ourselves - we're confusing the standard
     // logic (TB_AUTOSIZE) with our horizontal toolbars and other hacks
     // calculate our minor dimension ourselves - we're confusing the standard
     // logic (TB_AUTOSIZE) with our horizontal toolbars and other hacks

-    RECT r;
-    if ( ::SendMessage(GetHwnd(), TB_GETITEMRECT, 0, (LPARAM)&r) )
-    {
-        int w, h;
+    const RECT r = wxGetTBItemRect(GetHwnd(), 0);
+    if ( !r.right )
+        return false;

 
 

-        if ( IsVertical() )
+    int w, h;
+
+    if ( IsVertical() )
+    {
+        w = r.right - r.left;
+        if ( m_maxRows )

         {
         {

-            w = r.right - r.left;
-            if ( m_maxRows )
-            {
-                w *= (m_nButtons + m_maxRows - 1)/m_maxRows;
-            }
-            h = HIWORD(lParam);
+            w *= (m_nButtons + m_maxRows - 1)/m_maxRows;

         }
         }

+        h = HIWORD(lParam);
+    }
+    else
+    {
+        w = LOWORD(lParam);
+        if (HasFlag( wxTB_FLAT ))
+            h = r.bottom - r.top - 3;

         else
         else

+            h = r.bottom - r.top;
+        if ( m_maxRows )

         {
         {

-            w = LOWORD(lParam);
-            if (HasFlag( wxTB_FLAT ))
-                h = r.bottom - r.top - 3;
-            else
-                h = r.bottom - r.top;
-            if ( m_maxRows )
-            {
-                // FIXME: hardcoded separator line height...
-                h += HasFlag(wxTB_NODIVIDER) ? 4 : 6;
-                h *= m_maxRows;
-            }
-        }
-
-        if ( MAKELPARAM(w, h) != lParam )
-        {
-            // size really changed
-            SetSize(w, h);
+            // FIXME: hardcoded separator line height...
+            h += HasFlag(wxTB_NODIVIDER) ? 4 : 6;
+            h *= m_maxRows;

         }
         }

+    }

 
 

-        // message processed
-        return true;
+    if ( MAKELPARAM(w, h) != lParam )
+    {
+        // size really changed
+        SetSize(w, h);

     }
 
     }
 

-    return false;
+    // message processed
+    return true;

 }
 
 bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
 }
 
 bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)


@@ -1734,14 +1768,9 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
                     continue;
 
                 // get the bounding rect of the separator
                     continue;
 
                 // get the bounding rect of the separator

-                RECT r;
-                if ( !::SendMessage(GetHwnd(), TB_GETITEMRECT,
-                                    n, (LPARAM)&r) )
-                {
-                    wxLogDebug(_T("TB_GETITEMRECT failed?"));
-
+                RECT r = wxGetTBItemRect(GetHwnd(), n);
+                if ( !r.right )

                     continue;
                     continue;

-                }

 
                 // does it intersect the control?
                 wxRect rectItem;
 
                 // does it intersect the control?
                 wxRect rectItem;