Changed [] parameters to be unsigned.

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

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index 477716f8236c40938bacdb9dddbf91a54f33422b..4c0f0991fd546ac52b9e7b02c4d5f97c9d397f75 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -13,14 +13,6 @@
 #pragma implementation "statbr95.h"
 #endif
 
 #pragma implementation "statbr95.h"
 #endif
 

-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-

 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -35,25 +27,25 @@
   #include "wx/dcclient.h"
 #endif
 
   #include "wx/dcclient.h"
 #endif
 

-#include "wx/log.h"
+#ifdef __WIN95__

 
 

+#include "wx/log.h"

 #include "wx/generic/statusbr.h"
 #include "wx/msw/statbr95.h"
 
 #include "wx/generic/statusbr.h"
 #include "wx/msw/statbr95.h"
 

-#include  <windows.h>
-#include  <windowsx.h>
+#include "wx/msw/private.h"
+#include <windowsx.h>

 
 

-#ifndef __GNUWIN32__
-#include  <commctrl.h>
+#if !defined(__GNUWIN32__) || defined(__TWIN32__)
+#include <commctrl.h>

 #endif
 
 #endif
 

-#if     wxUSE_NATIVE_STATUSBAR
+#if wxUSE_NATIVE_STATUSBAR

 
 #if     !USE_SHARED_LIBRARY
   IMPLEMENT_DYNAMIC_CLASS(wxStatusBar95, wxStatusBar);
 
   BEGIN_EVENT_TABLE(wxStatusBar95, wxStatusBar)
 
 #if     !USE_SHARED_LIBRARY
   IMPLEMENT_DYNAMIC_CLASS(wxStatusBar95, wxStatusBar);
 
   BEGIN_EVENT_TABLE(wxStatusBar95, wxStatusBar)

-    EVT_PAINT(wxWindow::OnPaint)

     EVT_SIZE(wxStatusBar95::OnSize)
   END_EVENT_TABLE()
 #endif  //USE_SHARED_LIBRARY
     EVT_SIZE(wxStatusBar95::OnSize)
   END_EVENT_TABLE()
 #endif  //USE_SHARED_LIBRARY


@@ -235,4 +227,9 @@ void wxStatusBar95::OnSize(wxSizeEvent& event)
   SetFieldsWidth();
 }
 
   SetFieldsWidth();
 }
 

-#endif  //USE_NATIVE_STATUSBAR
\ No newline at end of file
+#endif  // wxUSE_NATIVE_STATUSBAR
+
+#else
+    #error "wxStatusBar95 is only available under Windows 95 and later."
+#endif // __WIN95__
+