moved definition of TARGET_CARBON to generated setup.h when compiling with

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

diff --git a/include/wx/variant.h b/include/wx/variant.h
index 72db3faae97c86048eb220446385a4f14f3966cc..795f92b5f47b19787b1bcc29a48d47d041d08871 100644 (file)
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -12,7 +12,7 @@
 #ifndef _WX_VARIANT_H_
 #define _WX_VARIANT_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "variant.h"
 #endif
 
@@ -32,7 +32,7 @@
     #include "wx/db.h"  // will #include sqltypes.h
 #endif //ODBC
 
-#include "wx/ioswrap.h"
+#include "wx/iosfwrap.h"
 
 /*
  * wxVariantData stores the actual data in a wxVariant object,
@@ -268,7 +268,7 @@ public:
     void ClearList();
 
 // Implementation
-protected:
+public:
 // Type conversion
     bool Convert(long* value) const;
     bool Convert(bool* value) const;