Various changes for wxCocoa

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

diff --git a/include/wx/variant.h b/include/wx/variant.h
index 795f92b5f47b19787b1bcc29a48d47d041d08871..9375794b80eb1a90f7f721076b533b2e58b1949b 100644 (file)
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -26,7 +26,9 @@
     #include "wx/date.h"
 #endif // time/date
 
     #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
 
 #if wxUSE_ODBC
     #include "wx/db.h"  // will #include sqltypes.h


@@ -105,7 +107,9 @@ 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
     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
     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 wxArrayString& val, const wxString& name = wxEmptyString); // String array
 #if wxUSE_ODBC
     wxVariant(const DATE_STRUCT* valptr, const wxString& name = wxEmptyString); // DateTime


@@ -122,9 +126,11 @@ public:
     void operator= (const wxVariant& variant);
 
 //TODO: Need to document
     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) ;
     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;
 
     bool operator== (const wxArrayString& value) const;
     bool operator!= (const wxArrayString& value) const;


@@ -200,7 +206,9 @@ public:
 #endif
     inline operator void* () const {  return GetVoidPtr(); }
 //TODO: Need to document
 #endif
     inline operator void* () const {  return GetVoidPtr(); }
 //TODO: Need to document

+#if wxUSE_DATETIME

     inline operator wxDateTime () const { return GetDateTime(); }
     inline operator wxDateTime () const { return GetDateTime(); }

+#endif // wxUSE_DATETIME

 //TODO: End of Need to document
 
 // Accessors
 //TODO: End of Need to document
 
 // Accessors


@@ -241,7 +249,9 @@ public:
 #endif
     void* GetVoidPtr() const ;
 //TODO: Need to document
 #endif
     void* GetVoidPtr() const ;
 //TODO: Need to document

+#if wxUSE_DATETIME

     wxDateTime GetDateTime() const ;
     wxDateTime GetDateTime() const ;

+#endif // wxUSE_DATETIME

     wxArrayString GetArrayString() const;
 //TODO: End of Need to document
 
     wxArrayString GetArrayString() const;
 //TODO: End of Need to document
 


@@ -281,7 +291,9 @@ public:
     bool Convert(wxDate* value) const;
 #endif
 //TODO: Need to document
     bool Convert(wxDate* value) const;
 #endif
 //TODO: Need to document

+#if wxUSE_DATETIME

     bool Convert(wxDateTime* value) const;
     bool Convert(wxDateTime* value) const;

+#endif // wxUSE_DATETIME

 //TODO: End of Need to document
 
 // Attributes
 //TODO: End of Need to document
 
 // Attributes