Added dataxpm.c to avoid name clash; removed ifdefing around wxDummyChar

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

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index 5f98b771806a05e87707defc36f02bbbe5a571be..312fabcea26fd0bb9f76a9bbe6c2206f924884fd 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -30,18 +30,25 @@
 #ifdef __WIN95__
 
 #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>
 

-#if !defined(__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);
 
 #if     !USE_SHARED_LIBRARY
   IMPLEMENT_DYNAMIC_CLASS(wxStatusBar95, wxStatusBar);


@@ -229,7 +236,9 @@ void wxStatusBar95::OnSize(wxSizeEvent& event)
   SetFieldsWidth();
 }
 
   SetFieldsWidth();
 }
 

-#endif
-  // __WIN95__
-#endif
-  // wxUSE_NATIVE_STATUSBAR
+#endif  // wxUSE_NATIVE_STATUSBAR
+
+#else
+    #error "wxStatusBar95 is only available under Windows 95 and later."
+#endif // __WIN95__
+