X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65f19af139b997f2140fd739256b002ccf82eef7..4a7ec775feb4f125cbeffe641a8e48b0a42848eb:/include/wx/variant.h

diff --git a/include/wx/variant.h b/include/wx/variant.h
index 795f92b5f4..e751dde6c1 100644
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -21,12 +21,9 @@
 #include "wx/string.h"
 #include "wx/list.h"
 
-#if wxUSE_TIMEDATE
-    #include "wx/time.h"
-    #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
@@ -97,15 +94,12 @@ public:
     wxVariant(const wxChar* val, const wxString& name = wxEmptyString); // Necessary or VC++ assumes bool!
     wxVariant(const wxStringList& val, const wxString& name = wxEmptyString);
     wxVariant(const wxList& val, const wxString& name = wxEmptyString); // List of variants
-// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
-#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
-    wxVariant(const wxTime& val, const wxString& name = wxEmptyString); // Time
-    wxVariant(const wxDate& val, const wxString& name = wxEmptyString); // Date
-#endif
     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
@@ -122,9 +116,11 @@ 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;
@@ -167,15 +163,6 @@ public:
     bool operator== (const wxList& value) const;
     bool operator!= (const wxList& value) const;
     void operator= (const wxList& value) ;
-// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
-#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
-    bool operator== (const wxTime& value) const;
-    bool operator!= (const wxTime& value) const;
-    void operator= (const wxTime& value) ;
-    bool operator== (const wxDate& value) const;
-    bool operator!= (const wxDate& value) const;
-    void operator= (const wxDate& value) ;
-#endif
     bool operator== (void* value) const;
     bool operator!= (void* value) const;
     void operator= (void* value) ;
@@ -193,14 +180,11 @@ public:
     inline operator char () const {  return GetChar(); }
     inline operator long () const {  return GetLong(); }
     inline operator bool () const {  return GetBool(); }
-// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
-#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
-    inline operator wxTime () const {  return GetTime(); }
-    inline operator wxDate () const {  return GetDate(); }
-#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
@@ -234,14 +218,11 @@ public:
     wxList& GetList() const ;
     wxStringList& GetStringList() const ;
 
-// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
-#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
-    wxTime GetTime() const ;
-    wxDate GetDate() const ;
-#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
 
@@ -275,13 +256,10 @@ public:
     bool Convert(double* value) const;
     bool Convert(wxString* value) const;
     bool Convert(char* value) const;
-// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
-#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
-    bool Convert(wxTime* value) const;
-    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