unneeded line removed

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

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index 4965c95ff2d1cd03e207817208546a43415a6b80..3792cd8e25edffa5e638787822b2e1ec7e78b7e8 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -27,25 +27,33 @@
   #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  <windows.h>
 #include  <windowsx.h>
 
 #include "wx/generic/statusbr.h"
 #include "wx/msw/statbr95.h"
 
 #include  <windows.h>
 #include  <windowsx.h>
 

-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__) || defined(__TWIN32__)

 #include  <commctrl.h>
 #endif
 
 #include  <commctrl.h>
 #endif
 

-#if     wxUSE_NATIVE_STATUSBAR
+#ifdef GetClassInfo
+#undef GetClassInfo
+#endif
+
+#ifdef GetClassName
+#undef GetClassName
+#endif
+
+#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


@@ -227,4 +235,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__
+