Added wxTreeCtrl::GetItemParent to deprecate GetParent.

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

diff --git a/include/wx/variant.h b/include/wx/variant.h
index 0e3d7388a1ad73679caef0e9956d5161de31532b..3c47bc497e7bbbcbecd494b449e4a3628d14e7ce 100644 (file)
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -12,7 +12,7 @@
 #ifndef _WX_VARIANT_H_
 #define _WX_VARIANT_H_
 
 #ifndef _WX_VARIANT_H_
 #define _WX_VARIANT_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "variant.h"
 #endif
 
 #pragma interface "variant.h"
 #endif
 


@@ -26,6 +26,12 @@
     #include "wx/date.h"
 #endif // time/date
 
     #include "wx/date.h"
 #endif // time/date
 

+#include "wx/datetime.h"
+
+#if wxUSE_ODBC
+    #include "wx/db.h"  // will #include sqltypes.h
+#endif //ODBC
+

 #include "wx/ioswrap.h"
 
 /*
 #include "wx/ioswrap.h"
 
 /*


@@ -98,6 +104,16 @@ public:
 #endif
     wxVariant(void* ptr, const wxString& name = wxEmptyString); // void* (general purpose)
     wxVariant(wxVariantData* data, const wxString& name = wxEmptyString); // User-defined data
 #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
+    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
+    wxVariant(const TIMESTAMP_STRUCT* valptr, const wxString& name = wxEmptyString); // DateTime
+#endif
+//TODO: End of Need to document
+    

     wxVariant(const wxVariant& variant);
     ~wxVariant();
 
     wxVariant(const wxVariant& variant);
     ~wxVariant();
 


@@ -105,6 +121,21 @@ public:
     // Assignment
     void operator= (const wxVariant& variant);
 
     // Assignment
     void operator= (const wxVariant& variant);
 

+//TODO: Need to document
+    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) ;
+    void operator= (const TIMESTAMP_STRUCT* value) ;
+#endif
+//TODO: End of Need to document
+

     // Assignment using data, e.g.
     // myVariant = new wxStringVariantData("hello");
     void operator= (wxVariantData* variantData);
     // Assignment using data, e.g.
     // myVariant = new wxStringVariantData("hello");
     void operator= (wxVariantData* variantData);


@@ -168,6 +199,9 @@ public:
     inline operator wxDate () const {  return GetDate(); }
 #endif
     inline operator void* () const {  return GetVoidPtr(); }
     inline operator wxDate () const {  return GetDate(); }
 #endif
     inline operator void* () const {  return GetVoidPtr(); }

+//TODO: Need to document
+    inline operator wxDateTime () const { return GetDateTime(); }
+//TODO: End of Need to document

 
 // Accessors
     // Sets/gets name
 
 // Accessors
     // Sets/gets name


@@ -206,6 +240,10 @@ public:
     wxDate GetDate() const ;
 #endif
     void* GetVoidPtr() const ;
     wxDate GetDate() const ;
 #endif
     void* GetVoidPtr() const ;

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

 
 // Operations
     // Make NULL (i.e. delete the data)
 
 // Operations
     // Make NULL (i.e. delete the data)


@@ -230,7 +268,7 @@ public:
     void ClearList();
 
 // Implementation
     void ClearList();
 
 // Implementation

-protected:
+public:

 // Type conversion
     bool Convert(long* value) const;
     bool Convert(bool* value) const;
 // Type conversion
     bool Convert(long* value) const;
     bool Convert(bool* value) const;


@@ -242,6 +280,9 @@ protected:
     bool Convert(wxTime* value) const;
     bool Convert(wxDate* value) const;
 #endif
     bool Convert(wxTime* value) const;
     bool Convert(wxDate* value) const;
 #endif

+//TODO: Need to document
+    bool Convert(wxDateTime* value) const;
+//TODO: End of Need to document

 
 // Attributes
 protected:
 
 // Attributes
 protected: