always draw toolbar background ourselves under XP as it isn't drawn correctly with...

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

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index 2fd1936449d3d6ffcaa81b641de85bd8651ba2d4..f06e0e7c05a245e0f9746639c67f236f180a141a 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -99,10 +99,17 @@ bool wxStatusBar95::Create(wxWindow *parent,
 #endif
     }
 
 #endif
     }
 

-    m_hWnd = (WXHWND)CreateStatusWindow(wstyle,
-                                        wxEmptyString,
-                                        GetHwndOf(parent),
-                                        m_windowId);
+    m_hWnd = CreateWindow
+             (
+                STATUSCLASSNAME,
+                _T(""),
+                wstyle,
+                0, 0, 0, 0,
+                GetHwndOf(parent),
+                (HMENU)wxUIntToPtr(m_windowId.GetValue()),
+                wxGetInstance(),
+                NULL
+             );

     if ( m_hWnd == 0 )
     {
         wxLogSysError(_("Failed to create a status bar."));
     if ( m_hWnd == 0 )
     {
         wxLogSysError(_("Failed to create a status bar."));


@@ -218,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'
 
     // 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"));
     }
     {
         wxLogLastError(wxT("StatusBar_SetText"));
     }


@@ -373,7 +380,7 @@ void wxStatusBar95::DoMoveWindow(int x, int y, int width, int height)
     {
         wxSizeEvent event(GetClientSize(), m_windowId);
         event.SetEventObject(this);
     {
         wxSizeEvent event(GetClientSize(), m_windowId);
         event.SetEventObject(this);

-        GetEventHandler()->ProcessEvent(event);
+        HandleWindowEvent(event);

     }
 }
 
     }
 }
 


@@ -404,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);
         // 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"));
         }
         {
             wxLogLastError(wxT("StatusBar_SetText"));
         }