X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/498fd97d9e8eafbc1c12b8721bc739c492bdf22e..f35746ceeda33434574d667f81d7e6e8b18b7c46:/src/msw/statbr95.cpp

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index d85ba867de..16fa083f6d 100644
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -6,7 +6,7 @@
 // Created:     04.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -27,7 +27,7 @@
   #include "wx/dcclient.h"
 #endif
 
-#if defined(__WIN95__) && wxUSE_NATIVE_STATUSBAR
+#if wxUSE_STATUSBAR && defined(__WIN95__) && wxUSE_NATIVE_STATUSBAR
 
 #include "wx/intl.h"
 #include "wx/log.h"
@@ -36,7 +36,7 @@
 #include "wx/msw/private.h"
 #include <windowsx.h>
 
-#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
+#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
     #include <commctrl.h>
 #endif
 
@@ -96,9 +96,11 @@ bool wxStatusBar95::Create(wxWindow *parent,
     }
     else
     {
+#ifndef __WXWINCE__
         // may be some versions of comctl32.dll do need it - anyhow, it won't
         // do any harm
         wstyle |= SBARS_SIZEGRIP;
+#endif
     }
 
     m_hWnd = (WXHWND)CreateStatusWindow(wstyle,
@@ -115,6 +117,8 @@ bool wxStatusBar95::Create(wxWindow *parent,
     SetFieldsCount(1);
     SubclassWin(m_hWnd);
 
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
+
     return TRUE;
 }
 
@@ -128,6 +132,8 @@ void wxStatusBar95::SetFieldsCount(int nFields, const int *widths)
     wxASSERT_MSG( (nFields > 0) && (nFields < 255), _T("too many fields") );
 
     wxStatusBarBase::SetFieldsCount(nFields, widths);
+
+    SetFieldsWidth();
 }
 
 void wxStatusBar95::SetStatusWidths(int n, const int widths[])