Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/infobar.h b/include/wx/infobar.h
index 3176711a7d8b277315b5c5880ada5acc8e16a59c..be390a856eed6785217a7b734dba590c8368ec01 100644 (file)
--- a/include/wx/infobar.h
+++ b/include/wx/infobar.h
@@ -3,7 +3,6 @@
 // Purpose:     declaration of wxInfoBarBase defining common API of wxInfoBar
 // Author:      Vadim Zeitlin
 // Created:     2009-07-28
 // Purpose:     declaration of wxInfoBarBase defining common API of wxInfoBar
 // Author:      Vadim Zeitlin
 // Created:     2009-07-28

-// RCS-ID:      $Id$

 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -21,7 +20,7 @@
 // wxInfoBar shows non-critical but important information to the user
 // ----------------------------------------------------------------------------
 
 // wxInfoBar shows non-critical but important information to the user
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_ADV wxInfoBarBase : public wxControl
+class WXDLLIMPEXP_CORE wxInfoBarBase : public wxControl

 {
 public:
     // real ctors are provided by the derived classes, just notice that unlike
 {
 public:
     // real ctors are provided by the derived classes, just notice that unlike


@@ -52,12 +51,9 @@ private:
 };
 
 // currently only GTK+ has a native implementation
 };
 
 // currently only GTK+ has a native implementation

-#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
-    #include <gtk/gtkversion.h>
-    #if GTK_CHECK_VERSION(2, 18, 0)
-        #include "wx/gtk/infobar.h"
-        #define wxHAS_NATIVE_INFOBAR
-    #endif
+#if defined(__WXGTK218__) && !defined(__WXUNIVERSAL__)
+    #include "wx/gtk/infobar.h"
+    #define wxHAS_NATIVE_INFOBAR

 #endif // wxGTK2
 
 // if the generic version is the only one we have, use it
 #endif // wxGTK2
 
 // if the generic version is the only one we have, use it