prefix implementation methods of wxBitmapButton with 'GTK' to prevent shadowing of...

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

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index c17ff4cc5744291e70b89437143cf806a3e147c7..0913dbf5aa068f54b505030fba53664c741da06b 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -99,10 +99,17 @@ bool wxStatusBar95::Create(wxWindow *parent,
 #endif
     }
 
-    m_hWnd = (WXHWND)CreateStatusWindow(wstyle,
-                                        wxEmptyString,
-                                        GetHwndOf(parent),
-                                        m_windowId);
+    m_hWnd = CreateWindow
+             (
+                STATUSCLASSNAME,
+                _T(""),
+                wstyle,
+                0, 0, 0, 0,
+                GetHwndOf(parent),
+                (HMENU)m_windowId.GetValue(),
+                wxGetInstance(),
+                NULL
+             );
     if ( m_hWnd == 0 )
     {
         wxLogSysError(_("Failed to create a status bar."));
@@ -189,6 +196,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)
@@ -212,7 +225,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"));
     }
@@ -290,6 +303,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() )
@@ -320,7 +380,7 @@ void wxStatusBar95::DoMoveWindow(int x, int y, int width, int height)
     {
         wxSizeEvent event(GetClientSize(), m_windowId);
         event.SetEventObject(this);
-        GetEventHandler()->ProcessEvent(event);
+        HandleWindowEvent(event);
     }
 }
 
@@ -351,7 +411,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"));
         }