X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/823b6635f6be00ef24a858b9766c601d9227b920..cc24bf919256e8e1d317dbb8e67df6d007d641ea:/src/msw/statbr95.cpp?ds=sidebyside

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index 52d64680ee..9b310fcf23 100644
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -218,7 +218,7 @@ void wxStatusBar95::SetStatusText(const wxString& strText, int nField)
 
     // Pass both field number and style. MSDN library doesn't mention
     // that nField and style have to be 'ORed'
-    if ( !StatusBar_SetText(GetHwnd(), nField | style, strText) )
+    if ( !StatusBar_SetText(GetHwnd(), nField | style, strText.wx_str()) )
     {
         wxLogLastError(wxT("StatusBar_SetText"));
     }
@@ -296,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() )
@@ -357,7 +404,7 @@ void wxStatusBar95::SetStatusStyles(int n, const int styles[])
         // the fields' styles. MSDN library doesn't mention
         // that nField and style have to be 'ORed'
         wxString text = GetStatusText(i);
-        if (!StatusBar_SetText(GetHwnd(), style | i, text))
+        if (!StatusBar_SetText(GetHwnd(), style | i, text.wx_str()))
         {
             wxLogLastError(wxT("StatusBar_SetText"));
         }