use wxRenderer::DrawCheckBox() instead of doing it manually

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

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index 9099fb4b2b35751a78afb08ac27e10a8e8f824d4..2fd1936449d3d6ffcaa81b641de85bd8651ba2d4 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -21,20 +21,17 @@
 #include "wx/statusbr.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/frame.h"
     #include "wx/settings.h"
     #include "wx/dcclient.h"
     #include "wx/intl.h"
+    #include "wx/log.h"
 #endif
 
-#include "wx/log.h"
-
 #include "wx/msw/private.h"
 #include <windowsx.h>
 
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
 #if wxUSE_UXTHEME
     #include "wx/msw/uxtheme.h"
 #endif
@@ -192,6 +189,12 @@ void wxStatusBar95::SetStatusText(const wxString& strText, int nField)
     wxCHECK_RET( (nField >= 0) && (nField < m_nFields),
                  _T("invalid statusbar field index") );
 
+    if ( strText == GetStatusText(nField) )
+    {
+       // don't call StatusBar_SetText() to avoid flicker
+       return;
+    }
+
     // Get field style, if any
     int style;
     if (m_statusStyles)
@@ -293,6 +296,53 @@ bool wxStatusBar95::GetFieldRect(int i, wxRect& rect) const
     return true;
 }
 
+// no idea for a default width, just choose something
+#define DEFAULT_FIELD_WIDTH 25
+
+wxSize wxStatusBar95::DoGetBestSize() const
+{
+    int borders[3];
+    SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)borders);
+
+    // calculate width
+    int width = 0;
+    for ( int i = 0; i < m_nFields; ++i )
+    {
+        int widthField = m_statusWidths ? m_statusWidths[i]
+                                        : DEFAULT_FIELD_WIDTH;
+        if ( widthField >= 0 )
+        {
+            width += m_statusWidths[i];
+        }
+        else
+        {
+            // variable width field, its width is really a proportion
+            // related to the other fields
+            width += -widthField*DEFAULT_FIELD_WIDTH;
+        }
+
+        // add the space between fields
+        width += borders[2];
+    }
+
+    if ( !width )
+    {
+        // still need something even for an empty status bar
+        width = 2*DEFAULT_FIELD_WIDTH;
+    }
+
+
+    // calculate height
+    int height;
+    wxGetCharSize(GetHWND(), NULL, &height, GetFont());
+    height = EDIT_HEIGHT_FROM_CHAR_HEIGHT(height);
+    height += borders[1];
+
+    wxSize best(width, height);
+    CacheBestSize(best);
+    return best;
+}
+
 void wxStatusBar95::DoMoveWindow(int x, int y, int width, int height)
 {
     if ( GetParent()->IsSizeDeferred() )