]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/statbr95.cpp
Oops, I didn't see Robert had already corrected 16bit BMP typo
[wxWidgets.git] / src / msw / statbr95.cpp
index a040fbaed1b36ab9344cafcb4bf39668df26f9c0..4c0f0991fd546ac52b9e7b02c4d5f97c9d397f75 100644 (file)
 #include "wx/generic/statusbr.h"
 #include "wx/msw/statbr95.h"
 
-#include  <windows.h>
-#include  <windowsx.h>
+#include "wx/msw/private.h"
+#include <windowsx.h>
 
 #if !defined(__GNUWIN32__) || defined(__TWIN32__)
-#include  <commctrl.h>
+#include <commctrl.h>
 #endif
 
-#ifdef GetClassInfo
-#undef GetClassInfo
-#endif
-
-#ifdef GetClassName
-#undef GetClassName
-#endif
-
-#if     wxUSE_NATIVE_STATUSBAR
+#if wxUSE_NATIVE_STATUSBAR
 
 #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
@@ -236,7 +227,9 @@ void wxStatusBar95::OnSize(wxSizeEvent& event)
   SetFieldsWidth();
 }
 
-#endif
-  // __WIN95__
-#endif
-  // wxUSE_NATIVE_STATUSBAR
+#endif  // wxUSE_NATIVE_STATUSBAR
+
+#else
+    #error "wxStatusBar95 is only available under Windows 95 and later."
+#endif // __WIN95__
+