another compilation fix for over-optimized #includes

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

diff --git a/include/wx/variant.h b/include/wx/variant.h
index 34eb32c4003992bfa3043ea26ba624faf001e377..9375794b80eb1a90f7f721076b533b2e58b1949b 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
 
@@ -26,13 +26,15 @@
     #include "wx/date.h"
 #endif // time/date
 
-#include "wx/datetime.h"
+#if wxUSE_DATETIME
+    #include "wx/datetime.h"
+#endif // wxUSE_DATETIME
 
 #if wxUSE_ODBC
     #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,
@@ -105,7 +107,10 @@ public:
     wxVariant(void* ptr, const wxString& name = wxEmptyString); // void* (general purpose)
     wxVariant(wxVariantData* data, const wxString& name = wxEmptyString); // User-defined data
 //TODO: Need to document
+#if wxUSE_DATETIME
     wxVariant(const wxDateTime& val, const wxString& name = wxEmptyString); // Date
+#endif // wxUSE_DATETIME
+    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
@@ -121,9 +126,15 @@ public:
     void operator= (const wxVariant& variant);
 
 //TODO: Need to document
+#if wxUSE_DATETIME
     bool operator== (const wxDateTime& value) const;
     bool operator!= (const wxDateTime& value) const;
     void operator= (const wxDateTime& value) ;
+#endif // wxUSE_DATETIME
+
+    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) ;
@@ -195,7 +206,9 @@ public:
 #endif
     inline operator void* () const {  return GetVoidPtr(); }
 //TODO: Need to document
+#if wxUSE_DATETIME
     inline operator wxDateTime () const { return GetDateTime(); }
+#endif // wxUSE_DATETIME
 //TODO: End of Need to document
 
 // Accessors
@@ -236,7 +249,10 @@ public:
 #endif
     void* GetVoidPtr() const ;
 //TODO: Need to document
+#if wxUSE_DATETIME
     wxDateTime GetDateTime() const ;
+#endif // wxUSE_DATETIME
+    wxArrayString GetArrayString() const;
 //TODO: End of Need to document
 
 // Operations
@@ -262,7 +278,7 @@ public:
     void ClearList();
 
 // Implementation
-protected:
+public:
 // Type conversion
     bool Convert(long* value) const;
     bool Convert(bool* value) const;
@@ -275,7 +291,9 @@ protected:
     bool Convert(wxDate* value) const;
 #endif
 //TODO: Need to document
+#if wxUSE_DATETIME
     bool Convert(wxDateTime* value) const;
+#endif // wxUSE_DATETIME
 //TODO: End of Need to document
 
 // Attributes