Enable variadic macros for VC9 and later.

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

diff --git a/src/msw/statusbar.cpp b/src/msw/statusbar.cpp
index a63dcc4fb61b9b3967b15801186ec9191164b797..f4284ab52db23a0bb202685872de5a3d9e2ac86d 100644 (file)
--- a/src/msw/statusbar.cpp
+++ b/src/msw/statusbar.cpp
@@ -153,11 +153,13 @@ wxStatusBar::~wxStatusBar()
     // occupy
     PostSizeEventToParent();
 
     // occupy
     PostSizeEventToParent();
 

+#if wxUSE_TOOLTIPS

     // delete existing tooltips
     for (size_t i=0; i<m_tooltips.size(); i++)
     {
         wxDELETE(m_tooltips[i]);
     }
     // delete existing tooltips
     for (size_t i=0; i<m_tooltips.size(); i++)
     {
         wxDELETE(m_tooltips[i]);
     }

+#endif // wxUSE_TOOLTIPS

 
     wxDELETE(m_pDC);
 }
 
     wxDELETE(m_pDC);
 }


@@ -176,12 +178,9 @@ void wxStatusBar::SetFieldsCount(int nFields, const int *widths)
     // this is a Windows limitation
     wxASSERT_MSG( (nFields > 0) && (nFields < 255), "too many fields" );
 
     // this is a Windows limitation
     wxASSERT_MSG( (nFields > 0) && (nFields < 255), "too many fields" );
 

-    wxStatusBarBase::SetFieldsCount(nFields, widths);
-
-    MSWUpdateFieldsWidths();
-

     // keep in synch also our m_tooltips array
 
     // keep in synch also our m_tooltips array
 

+#if wxUSE_TOOLTIPS

     // reset all current tooltips
     for (size_t i=0; i<m_tooltips.size(); i++)
     {
     // reset all current tooltips
     for (size_t i=0; i<m_tooltips.size(); i++)
     {


@@ -189,7 +188,12 @@ void wxStatusBar::SetFieldsCount(int nFields, const int *widths)
     }
 
     // shrink/expand the array:
     }
 
     // shrink/expand the array:

-    m_tooltips.resize(m_panes.GetCount(), NULL);
+    m_tooltips.resize(nFields, NULL);
+#endif // wxUSE_TOOLTIPS
+
+    wxStatusBarBase::SetFieldsCount(nFields, widths);
+
+    MSWUpdateFieldsWidths();

 }
 
 void wxStatusBar::SetStatusWidths(int n, const int widths[])
 }
 
 void wxStatusBar::SetStatusWidths(int n, const int widths[])


@@ -229,7 +233,8 @@ void wxStatusBar::MSWUpdateFieldsWidths()
     int *pWidths = new int[count];
 
     int nCurPos = 0;
     int *pWidths = new int[count];
 
     int nCurPos = 0;

-    for ( int i = 0; i < count; i++ )
+    int i;
+    for ( i = 0; i < count; i++ )

     {
         nCurPos += widthsAbs[i] + extraWidth;
         pWidths[i] = nCurPos;
     {
         nCurPos += widthsAbs[i] + extraWidth;
         pWidths[i] = nCurPos;


@@ -245,10 +250,13 @@ void wxStatusBar::MSWUpdateFieldsWidths()
         wxLogLastError("StatusBar_SetParts");
     }
 
         wxLogLastError("StatusBar_SetParts");
     }
 

-    delete [] pWidths;
-
+    // Now that all parts have been created, set their text.
+    for ( i = 0; i < count; i++ )
+    {
+        DoUpdateStatusText(i);
+    }

 
 

-    // FIXME: we may want to call DoUpdateStatusText() here since we may need to (de)ellipsize status texts
+    delete [] pWidths;

 }
 
 void wxStatusBar::DoUpdateStatusText(int nField)
 }
 
 void wxStatusBar::DoUpdateStatusText(int nField)


@@ -314,6 +322,7 @@ void wxStatusBar::DoUpdateStatusText(int nField)
         wxLogLastError("StatusBar_SetText");
     }
 
         wxLogLastError("StatusBar_SetText");
     }
 

+#if wxUSE_TOOLTIPS

     if (HasFlag(wxSTB_SHOW_TIPS))
     {
         wxASSERT(m_tooltips.size() == m_panes.GetCount());
     if (HasFlag(wxSTB_SHOW_TIPS))
     {
         wxASSERT(m_tooltips.size() == m_panes.GetCount());


@@ -342,6 +351,7 @@ void wxStatusBar::DoUpdateStatusText(int nField)
             //else: leave m_tooltips[nField]==NULL
         }
     }
             //else: leave m_tooltips[nField]==NULL
         }
     }

+#endif // wxUSE_TOOLTIPS

 }
 
 wxStatusBar::MSWBorders wxStatusBar::MSWGetBorders() const
 }
 
 wxStatusBar::MSWBorders wxStatusBar::MSWGetBorders() const


@@ -384,12 +394,14 @@ const wxStatusBar::MSWMetrics& wxStatusBar::MSWGetMetrics()
         // into account to make sure the text drawn by user fits inside the
         // pane. Notice that it's not the value returned by SB_GETBORDERS
         // which, at least on this Windows 2003 system, returns {0, 2, 2}
         // into account to make sure the text drawn by user fits inside the
         // pane. Notice that it's not the value returned by SB_GETBORDERS
         // which, at least on this Windows 2003 system, returns {0, 2, 2}

+#if wxUSE_UXTHEME

         if ( wxUxThemeEngine::GetIfActive() )
         {
             s_metrics.gripWidth = 20;
             s_metrics.textMargin = 8;
         }
         else // classic/unthemed look
         if ( wxUxThemeEngine::GetIfActive() )
         {
             s_metrics.gripWidth = 20;
             s_metrics.textMargin = 8;
         }
         else // classic/unthemed look

+#endif // wxUSE_UXTHEME

         {
             s_metrics.gripWidth = 18;
             s_metrics.textMargin = 4;
         {
             s_metrics.gripWidth = 18;
             s_metrics.textMargin = 4;


@@ -401,7 +413,18 @@ const wxStatusBar::MSWMetrics& wxStatusBar::MSWGetMetrics()
 
 void wxStatusBar::SetMinHeight(int height)
 {
 
 void wxStatusBar::SetMinHeight(int height)
 {

-    SendMessage(GetHwnd(), SB_SETMINHEIGHT, height + 2*GetBorderY(), 0);
+    // It looks like we need to count the border twice to really make the
+    // controls taking exactly height pixels fully fit in the status bar:
+    // at least under Windows 7 the checkbox in the custom status bar of the
+    // statbar sample gets truncated otherwise.
+    height += 4*GetBorderY();
+
+    // We need to set the size and not the size to reflect the height because
+    // wxFrame uses our size and not the minimal size as it assumes that the
+    // size of a status bar never changes anyhow.
+    SetSize(-1, height);
+
+    SendMessage(GetHwnd(), SB_SETMINHEIGHT, height, 0);

 
     // we have to send a (dummy) WM_SIZE to redraw it now
     SendMessage(GetHwnd(), WM_SIZE, 0, 0);
 
     // we have to send a (dummy) WM_SIZE to redraw it now
     SendMessage(GetHwnd(), WM_SIZE, 0, 0);


@@ -471,11 +494,10 @@ wxSize wxStatusBar::DoGetBestSize() const
         width = 2*DEFAULT_FIELD_WIDTH;
     }
 
         width = 2*DEFAULT_FIELD_WIDTH;
     }
 

-    // calculate height
-    int height;
-    wxGetCharSize(GetHWND(), NULL, &height, GetFont());
-    height = EDIT_HEIGHT_FROM_CHAR_HEIGHT(height);
-    height += borders.vert;
+    // calculate height: by default it should be just big enough to show text
+    // (see SetMinHeight() for the explanation of 4 factor)
+    int height = GetCharHeight();
+    height += 4*borders.vert;

 
     wxSize best(width, height);
     CacheBestSize(best);
 
     wxSize best(width, height);
     CacheBestSize(best);