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 34eb32c4003992bfa3043ea26ba624faf001e377..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,
@@ -106,6 +106,7 @@ public:
     wxVariant(wxVariantData* data, const wxString& name = wxEmptyString); // User-defined data
 //TODO: Need to document
     wxVariant(const wxDateTime& val, const wxString& name = wxEmptyString); // Date
+    wxVariant(const wxArrayString& val, const wxString& name = wxEmptyString); // String array
 #if wxUSE_ODBC
     wxVariant(const DATE_STRUCT* valptr, const wxString& name = wxEmptyString); // DateTime
     wxVariant(const TIME_STRUCT* valptr, const wxString& name = wxEmptyString); // DateTime
@@ -124,6 +125,10 @@ public:
     bool operator== (const wxDateTime& value) const;
     bool operator!= (const wxDateTime& value) const;
     void operator= (const wxDateTime& value) ;
+
+    bool operator== (const wxArrayString& value) const;
+    bool operator!= (const wxArrayString& value) const;
+    void operator= (const wxArrayString& value) ;
 #if wxUSE_ODBC
     void operator= (const DATE_STRUCT* value) ;
     void operator= (const TIME_STRUCT* value) ;
@@ -237,6 +242,7 @@ public:
     void* GetVoidPtr() const ;
 //TODO: Need to document
     wxDateTime GetDateTime() const ;
+    wxArrayString GetArrayString() const;
 //TODO: End of Need to document
 
 // Operations
@@ -262,7 +268,7 @@ public:
     void ClearList();
 
 // Implementation
-protected:
+public:
 // Type conversion
     bool Convert(long* value) const;
     bool Convert(bool* value) const;