fixed warnings after GetFont prototype change

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

diff --git a/include/wx/variant.h b/include/wx/variant.h
index a52b72239cdd6617e278a3878204ea359fcfaf6b..ef70b0e3ae5103a2016403fdb90c1d40be375d4b 100644 (file)
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -12,21 +12,25 @@
 #ifndef _WX_VARIANT_H_
 #define _WX_VARIANT_H_
 
 #ifndef _WX_VARIANT_H_
 #define _WX_VARIANT_H_
 

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

 #pragma interface "variant.h"
 #endif
 
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #pragma interface "variant.h"
 #endif
 
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"

+#include "wx/arrstr.h"

 #include "wx/list.h"
 
 #include "wx/list.h"
 

-#if wxUSE_TIMEDATE
-    #include "wx/time.h"
-    #include "wx/date.h"
-#endif // time/date
+#if wxUSE_DATETIME
+    #include "wx/datetime.h"
+#endif // wxUSE_DATETIME

 
 

-#include "wx/ioswrap.h"
+#if wxUSE_ODBC
+    #include "wx/db.h"  // will #include sqltypes.h
+#endif //ODBC
+
+#include "wx/iosfwrap.h"

 
 /*
  * wxVariantData stores the actual data in a wxVariant object,
 
 /*
  * wxVariantData stores the actual data in a wxVariant object,


@@ -42,7 +46,7 @@
  * overloading wxVariant with unnecessary functionality.
  */
 
  * overloading wxVariant with unnecessary functionality.
  */
 

-class WXDLLEXPORT wxVariantData: public wxObject
+class WXDLLIMPEXP_BASE wxVariantData: public wxObject

 {
 DECLARE_ABSTRACT_CLASS(wxVariantData)
 public:
 {
 DECLARE_ABSTRACT_CLASS(wxVariantData)
 public:


@@ -54,12 +58,18 @@ public:
     // Copy to data
     virtual void Copy(wxVariantData& data) = 0;
     virtual bool Eq(wxVariantData& data) const = 0;
     // Copy to data
     virtual void Copy(wxVariantData& data) = 0;
     virtual bool Eq(wxVariantData& data) const = 0;

-    virtual bool Write(ostream& str) const = 0;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Write(wxSTD ostream& str) const = 0;
+#endif

     virtual bool Write(wxString& str) const = 0;
     virtual bool Write(wxString& str) const = 0;

-    virtual bool Read(istream& str) = 0;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& str) = 0;
+#endif

     virtual bool Read(wxString& str) = 0;
     // What type is it? Return a string name.
     virtual wxString GetType() const = 0;
     virtual bool Read(wxString& str) = 0;
     // What type is it? Return a string name.
     virtual wxString GetType() const = 0;

+    // If it based on wxObject return the ClassInfo.
+    virtual wxClassInfo* GetValueClassInfo() { return NULL; }

 };
 
 /*
 };
 
 /*


@@ -70,27 +80,38 @@ public:
  * this class too much.
  */
 
  * this class too much.
  */
 

-class WXDLLEXPORT wxVariant: public wxObject
+class WXDLLIMPEXP_BASE wxVariant: public wxObject

 {
 DECLARE_DYNAMIC_CLASS(wxVariant)
 public:
 
 // Construction & destruction
     wxVariant();
 {
 DECLARE_DYNAMIC_CLASS(wxVariant)
 public:
 
 // Construction & destruction
     wxVariant();

-    wxVariant(double val, const wxString& name = g_szNul);
-    wxVariant(long val, const wxString& name = g_szNul);
-    wxVariant(bool val, const wxString& name = g_szNul);
-    wxVariant(char val, const wxString& name = g_szNul);
-    wxVariant(const wxString& val, const wxString& name = g_szNul);
-    wxVariant(const char* val, const wxString& name = g_szNul); // Necessary or VC++ assumes bool!
-    wxVariant(const wxStringList& val, const wxString& name = g_szNul);
-    wxVariant(const wxList& val, const wxString& name = g_szNul); // List of variants
-#if wxUSE_TIMEDATE
-    wxVariant(const wxTime& val, const wxString& name = g_szNul); // Time
-    wxVariant(const wxDate& val, const wxString& name = g_szNul); // Date
+    wxVariant(double val, const wxString& name = wxEmptyString);
+    wxVariant(long val, const wxString& name = wxEmptyString);
+#ifdef HAVE_BOOL
+    wxVariant(bool val, const wxString& name = wxEmptyString);
+#endif
+    wxVariant(char val, const wxString& name = wxEmptyString);
+    wxVariant(const wxString& val, const wxString& name = wxEmptyString);
+    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
+    wxVariant(void* ptr, const wxString& name = wxEmptyString); // void* (general purpose)
+    wxVariant(wxObject* ptr, const wxString& name = wxEmptyString); //wxObject 
+    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
+    wxVariant(const TIMESTAMP_STRUCT* valptr, const wxString& name = wxEmptyString); // DateTime

 #endif
 #endif

-    wxVariant(void* ptr, const wxString& name = g_szNul); // void* (general purpose)
-    wxVariant(wxVariantData* data, const wxString& name = g_szNul); // User-defined data
+//TODO: End of Need to document
+    

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


@@ -98,6 +119,23 @@ public:
     // Assignment
     void operator= (const wxVariant& variant);
 
     // Assignment
     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) ;
+    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);


@@ -114,27 +152,21 @@ public:
     bool operator== (char value) const;
     bool operator!= (char value) const;
     void operator= (char value) ;
     bool operator== (char value) const;
     bool operator!= (char value) const;
     void operator= (char value) ;

+#ifdef HAVE_BOOL

     bool operator== (bool value) const;
     bool operator!= (bool value) const;
     void operator= (bool value) ;
     bool operator== (bool value) const;
     bool operator!= (bool value) const;
     void operator= (bool value) ;

+#endif

     bool operator== (const wxString& value) const;
     bool operator!= (const wxString& value) const;
     void operator= (const wxString& value) ;
     bool operator== (const wxString& value) const;
     bool operator!= (const wxString& value) const;
     void operator= (const wxString& value) ;

-    void operator= (const char* value) ; // Necessary or VC++ assumes bool!
+    void operator= (const wxChar* value) ; // Necessary or VC++ assumes bool!

     bool operator== (const wxStringList& value) const;
     bool operator!= (const wxStringList& value) const;
     void operator= (const wxStringList& value) ;
     bool operator== (const wxList& value) const;
     bool operator!= (const wxList& value) const;
     void operator= (const wxList& value) ;
     bool operator== (const wxStringList& value) const;
     bool operator!= (const wxStringList& value) const;
     void operator= (const wxStringList& value) ;
     bool operator== (const wxList& value) const;
     bool operator!= (const wxList& value) const;
     void operator= (const wxList& value) ;

-#if wxUSE_TIMEDATE
-    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) ;
     bool operator== (void* value) const;
     bool operator!= (void* value) const;
     void operator= (void* value) ;


@@ -152,11 +184,15 @@ public:
     inline operator char () const {  return GetChar(); }
     inline operator long () const {  return GetLong(); }
     inline operator bool () const {  return GetBool(); }
     inline operator char () const {  return GetChar(); }
     inline operator long () const {  return GetLong(); }
     inline operator bool () const {  return GetBool(); }

-#if wxUSE_TIMEDATE
-    inline operator wxTime () const {  return GetTime(); }
-    inline operator wxDate () const {  return GetDate(); }
-#endif

     inline operator void* () const {  return GetVoidPtr(); }
     inline operator void* () const {  return GetVoidPtr(); }

+    // No implicit conversion to wxObject, as that would really
+    //  confuse people between conversion to our contained data
+    //  and downcasting to see our base type.
+//TODO: Need to document
+#if wxUSE_DATETIME
+    inline operator wxDateTime () const { return GetDateTime(); }
+#endif // wxUSE_DATETIME
+//TODO: End of Need to document

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


@@ -174,6 +210,7 @@ public:
     wxString GetType() const;
 
     bool IsType(const wxString& type) const;
     wxString GetType() const;
 
     bool IsType(const wxString& type) const;

+    bool IsValueKindOf(const wxClassInfo* type) const;

 
     // Return the number of elements in a list
     int GetCount() const;
 
     // Return the number of elements in a list
     int GetCount() const;


@@ -188,11 +225,15 @@ public:
     wxString GetString() const ;
     wxList& GetList() const ;
     wxStringList& GetStringList() const ;
     wxString GetString() const ;
     wxList& GetList() const ;
     wxStringList& GetStringList() const ;

-#if wxUSE_TIMEDATE
-    wxTime GetTime() const ;
-    wxDate GetDate() const ;
-#endif
+

     void* GetVoidPtr() const ;
     void* GetVoidPtr() const ;

+    wxObject* GetWxObjectPtr()  ;
+//TODO: Need to document
+#if wxUSE_DATETIME
+    wxDateTime GetDateTime() const ;
+#endif // wxUSE_DATETIME
+    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)


@@ -217,17 +258,18 @@ public:
     void ClearList();
 
 // Implementation
     void ClearList();
 
 // Implementation

-protected:
+public:

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

-#if wxUSE_TIMEDATE
-    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
 protected:
 
 // Attributes
 protected:


@@ -235,7 +277,15 @@ protected:
     wxString        m_name;
 };
 
     wxString        m_name;
 };
 

-extern wxVariant WXDLLEXPORT wxNullVariant;
+//Since we want type safety wxVariant we need to fetch and dynamic_cast
+//in a seemingly safe way so the compiler can check, so we define 
+//a dynamic_cast /wxDynamicCast analogue.
+
+#define wxGetVariantCast(var,classname) \
+       ((classname*)(var.IsValueKindOf(&classname::ms_classInfo) ?\
+                     var.GetWxObjectPtr() : NULL));
+
+extern wxVariant WXDLLIMPEXP_BASE wxNullVariant;

 
 #endif
     // _WX_VARIANT_H_
 
 #endif
     // _WX_VARIANT_H_