More broken compilers with enum/wxString& ambiguity.

[wxWidgets.git] / include / wx / statusbr.h

diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index 626b57de706e0a831bfc717df51f068e32e48852..96fd34d3d13c23a10960d784a5229bf18ab25fbc 100644 (file)
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -5,14 +5,14 @@
 // Modified by:
 // Created:     05.02.00
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     05.02.00
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATUSBR_H_BASE_
 #define _WX_STATUSBR_H_BASE_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATUSBR_H_BASE_
 #define _WX_STATUSBR_H_BASE_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "statbar.h"
 #endif
 
     #pragma interface "statbar.h"
 #endif
 


@@ -122,23 +122,19 @@ protected:
 
 #if defined(__WXUNIVERSAL__)
     #define wxStatusBarUniv wxStatusBar
 
 #if defined(__WXUNIVERSAL__)
     #define wxStatusBarUniv wxStatusBar

-    #define sm_classwxStatusBarUniv sm_classwxStatusBar

 
     #include "wx/univ/statusbr.h"
 #elif defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR
     #define wxStatusBar95 wxStatusBar
 
     #include "wx/univ/statusbr.h"
 #elif defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR
     #define wxStatusBar95 wxStatusBar

-    #define sm_classwxStatusBar95 sm_classwxStatusBar

 
     #include "wx/msw/statbr95.h"
 #elif defined(__WXMAC__)
     #define wxStatusBarMac wxStatusBar
 
     #include "wx/msw/statbr95.h"
 #elif defined(__WXMAC__)
     #define wxStatusBarMac wxStatusBar

-    #define sm_classwxStatusBarMac sm_classwxStatusBar

 
     #include "wx/generic/statusbr.h"
     #include "wx/mac/statusbr.h"
 #else
     #define wxStatusBarGeneric wxStatusBar
 
     #include "wx/generic/statusbr.h"
     #include "wx/mac/statusbr.h"
 #else
     #define wxStatusBarGeneric wxStatusBar

-    #define sm_classwxStatusBarGeneric sm_classwxStatusBar

 
     #include "wx/generic/statusbr.h"
 #endif
 
     #include "wx/generic/statusbr.h"
 #endif