fixed wxTempFile::Commit() broken by last check in

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

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index d85ba867dedab47c6a234d7d354f018ca099a38f..16fa083f6d4d11babf70ec863c86da88dc0fd3b9 100644 (file)
--- 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>
 // 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__
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -27,7 +27,7 @@
   #include "wx/dcclient.h"
 #endif
 
   #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"
 
 #include "wx/intl.h"
 #include "wx/log.h"


@@ -36,7 +36,7 @@
 #include "wx/msw/private.h"
 #include <windowsx.h>
 
 #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
 
     #include <commctrl.h>
 #endif
 


@@ -96,9 +96,11 @@ bool wxStatusBar95::Create(wxWindow *parent,
     }
     else
     {
     }
     else
     {

+#ifndef __WXWINCE__

         // may be some versions of comctl32.dll do need it - anyhow, it won't
         // do any harm
         wstyle |= SBARS_SIZEGRIP;
         // 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,
     }
 
     m_hWnd = (WXHWND)CreateStatusWindow(wstyle,


@@ -115,6 +117,8 @@ bool wxStatusBar95::Create(wxWindow *parent,
     SetFieldsCount(1);
     SubclassWin(m_hWnd);
 
     SetFieldsCount(1);
     SubclassWin(m_hWnd);
 

+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
+

     return TRUE;
 }
 
     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);
     wxASSERT_MSG( (nFields > 0) && (nFields < 255), _T("too many fields") );
 
     wxStatusBarBase::SetFieldsCount(nFields, widths);

+
+    SetFieldsWidth();

 }
 
 void wxStatusBar95::SetStatusWidths(int n, const int widths[])
 }
 
 void wxStatusBar95::SetStatusWidths(int n, const int widths[])