X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/27d2cd5c96c9b7e34dd5319321cb6be145f0c751..88f23fdd8366d57d15cba42d152539ff9ccbdd39:/src/msw/statbr95.cpp diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp index 5889081a5f..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 -// 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 -#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) +#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)) #include #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; }