simpler implementation

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

diff --git a/include/wx/variant.h b/include/wx/variant.h
index 8f3648547404faed3d187d39d4ff37915b32bcca..37ecf447d3f1a5b4f84ea21d2d52c3d0357bd8da 100644 (file)
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -68,15 +68,15 @@ public:
 
     // Override these to provide common functionality
     virtual bool Eq(wxVariantData& data) const = 0;
 
     // Override these to provide common functionality
     virtual bool Eq(wxVariantData& data) const = 0;

-    
+

 #if wxUSE_STD_IOSTREAM
 #if wxUSE_STD_IOSTREAM

-    virtual bool Write(wxSTD ostream& str) const { return false; }
+    virtual bool Write(wxSTD ostream& WXUNUSED(str)) const { return false; }

 #endif
 #endif

-    virtual bool Write(wxString& str) const { return false; }
+    virtual bool Write(wxString& WXUNUSED(str)) const { return false; }

 #if wxUSE_STD_IOSTREAM
 #if wxUSE_STD_IOSTREAM

-    virtual bool Read(wxSTD istream& str) { return false; }
+    virtual bool Read(wxSTD istream& WXUNUSED(str)) { return false; }

 #endif
 #endif

-    virtual bool Read(wxString& str) { return false; }
+    virtual bool Read(wxString& WXUNUSED(str)) { return false; }

     // What type is it? Return a string name.
     virtual wxString GetType() const = 0;
     // If it based on wxObject return the ClassInfo.
     // What type is it? Return a string name.
     virtual wxString GetType() const = 0;
     // If it based on wxObject return the ClassInfo.


@@ -99,7 +99,7 @@ protected:
 
 private:
     int     m_count;
 
 private:
     int     m_count;

-    
+

 private:
     DECLARE_ABSTRACT_CLASS(wxVariantData)
 };
 private:
     DECLARE_ABSTRACT_CLASS(wxVariantData)
 };


@@ -113,7 +113,7 @@ class WXDLLIMPEXP_BASE wxVariant: public wxObject
 {
 public:
     wxVariant();
 {
 public:
     wxVariant();

-    
+

     wxVariant(const wxVariant& variant);
     wxVariant(wxVariantData* data, const wxString& name = wxEmptyString);
     virtual ~wxVariant();
     wxVariant(const wxVariant& variant);
     wxVariant(wxVariantData* data, const wxString& name = wxEmptyString);
     virtual ~wxVariant();


@@ -124,7 +124,7 @@ public:
     // 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);

-    
+

     bool operator== (const wxVariant& variant) const;
     bool operator!= (const wxVariant& variant) const;
 
     bool operator== (const wxVariant& variant) const;
     bool operator!= (const wxVariant& variant) const;
 


@@ -133,7 +133,7 @@ public:
     inline const wxString& GetName() const { return m_name; }
 
     // Tests whether there is data
     inline const wxString& GetName() const { return m_name; }
 
     // Tests whether there is data

-    bool IsNull() const; 
+    bool IsNull() const;

 
     // For compatibility with wxWidgets <= 2.6, this doesn't increase
     // reference count.
 
     // For compatibility with wxWidgets <= 2.6, this doesn't increase
     // reference count.


@@ -148,10 +148,10 @@ public:
 
     // Make NULL (i.e. delete the data)
     void MakeNull();
 
     // Make NULL (i.e. delete the data)
     void MakeNull();

-    
+

     // Delete data and name
     void Clear();
     // Delete data and name
     void Clear();

-    
+

     // Returns a string representing the type of the variant,
     // e.g. "string", "bool", "stringlist", "list", "double", "long"
     wxString GetType() const;
     // Returns a string representing the type of the variant,
     // e.g. "string", "bool", "stringlist", "list", "double", "long"
     wxString GetType() const;


@@ -159,9 +159,9 @@ public:
     bool IsType(const wxString& type) const;
     bool IsValueKindOf(const wxClassInfo* type) const;
 
     bool IsType(const wxString& type) const;
     bool IsValueKindOf(const wxClassInfo* type) const;
 

-    // write contents to a string (e.g. for debugging)    
+    // write contents to a string (e.g. for debugging)

     wxString MakeString() const;
     wxString MakeString() const;

-    
+

     // double
     wxVariant(double val, const wxString& name = wxEmptyString);
     bool operator== (double value) const;
     // double
     wxVariant(double val, const wxString& name = wxEmptyString);
     bool operator== (double value) const;


@@ -170,7 +170,7 @@ public:
     inline operator double () const {  return GetDouble(); }
     inline double GetReal() const { return GetDouble(); }
     double GetDouble() const;
     inline operator double () const {  return GetDouble(); }
     inline double GetReal() const { return GetDouble(); }
     double GetDouble() const;

-    
+

     // long
     wxVariant(long val, const wxString& name = wxEmptyString);
     wxVariant(int val, const wxString& name = wxEmptyString);
     // long
     wxVariant(long val, const wxString& name = wxEmptyString);
     wxVariant(int val, const wxString& name = wxEmptyString);


@@ -181,8 +181,8 @@ public:
     inline operator long () const {  return GetLong(); }
     inline long GetInteger() const { return GetLong(); }
     long GetLong() const;
     inline operator long () const {  return GetLong(); }
     inline long GetInteger() const { return GetLong(); }
     long GetLong() const;

-    
-    // bool    
+
+    // bool

 #ifdef HAVE_BOOL
     wxVariant(bool val, const wxString& name = wxEmptyString);
     bool operator== (bool value) const;
 #ifdef HAVE_BOOL
     wxVariant(bool val, const wxString& name = wxEmptyString);
     bool operator== (bool value) const;


@@ -194,7 +194,7 @@ public:
 
     // wxDateTime
 #if wxUSE_DATETIME
 
     // wxDateTime
 #if wxUSE_DATETIME

-    wxVariant(const wxDateTime& val, const wxString& name = wxEmptyString); 
+    wxVariant(const wxDateTime& val, const wxString& name = wxEmptyString);

 #if wxUSE_ODBC
     wxVariant(const DATE_STRUCT* valptr, const wxString& name = wxEmptyString);
     wxVariant(const TIME_STRUCT* valptr, const wxString& name = wxEmptyString);
 #if wxUSE_ODBC
     wxVariant(const DATE_STRUCT* valptr, const wxString& name = wxEmptyString);
     wxVariant(const TIME_STRUCT* valptr, const wxString& name = wxEmptyString);


@@ -229,7 +229,7 @@ public:
     void operator= (wxChar value) ;
     inline operator wxChar () const { return GetChar(); }
     wxChar GetChar() const ;
     void operator= (wxChar value) ;
     inline operator wxChar () const { return GetChar(); }
     wxChar GetChar() const ;

-    
+

     // wxArrayString
     wxVariant(const wxArrayString& val, const wxString& name = wxEmptyString);
     bool operator== (const wxArrayString& value) const;
     // wxArrayString
     wxVariant(const wxArrayString& val, const wxString& name = wxEmptyString);
     bool operator== (const wxArrayString& value) const;


@@ -277,7 +277,7 @@ public:
 
     // Return the number of elements in a list
     size_t GetCount() const;
 
     // Return the number of elements in a list
     size_t GetCount() const;

-    
+

     // Make empty list
     void NullList();
 
     // Make empty list
     void NullList();
 


@@ -302,7 +302,7 @@ public:
     bool Convert(bool* value) const;
     bool Convert(double* value) const;
     bool Convert(wxString* value) const;
     bool Convert(bool* value) const;
     bool Convert(double* value) const;
     bool Convert(wxString* value) const;

-    bool Convert(char* value) const;
+    bool Convert(wxChar* value) const;

 #if wxUSE_DATETIME
     bool Convert(wxDateTime* value) const;
 #endif // wxUSE_DATETIME
 #if wxUSE_DATETIME
     bool Convert(wxDateTime* value) const;
 #endif // wxUSE_DATETIME


@@ -311,17 +311,28 @@ public:
 protected:
     wxVariantData*  m_data;
     wxString        m_name;
 protected:
     wxVariantData*  m_data;
     wxString        m_name;

-    
+

 private:
     DECLARE_DYNAMIC_CLASS(wxVariant)
 };
 
 private:
     DECLARE_DYNAMIC_CLASS(wxVariant)
 };
 

+/* Fake macro parameter value */
+#ifdef EMPTY_PARAMETER_VALUE
+    #undef EMPTY_PARAMETER_VALUE
+#endif
+#define EMPTY_PARAMETER_VALUE

 
 #define DECLARE_VARIANT_OBJECT(classname) \
 
 #define DECLARE_VARIANT_OBJECT(classname) \

-classname& operator << ( classname &object, const wxVariant &variant ); \
-wxVariant& operator << ( wxVariant &variant, const classname &object );
+    DECLARE_VARIANT_OBJECT_EXPORTED(classname,EMPTY_PARAMETER_VALUE)
+
+#define DECLARE_VARIANT_OBJECT_EXPORTED(classname,expdecl) \
+expdecl classname& operator << ( classname &object, const wxVariant &variant ); \
+expdecl wxVariant& operator << ( wxVariant &variant, const classname &object );

 
 #define IMPLEMENT_VARIANT_OBJECT(classname) \
 
 #define IMPLEMENT_VARIANT_OBJECT(classname) \

+    IMPLEMENT_VARIANT_OBJECT_EXPORTED(classname,EMPTY_PARAMETER_VALUE)
+
+#define IMPLEMENT_VARIANT_OBJECT_EXPORTED(classname,expdecl) \

 class classname##VariantData: public wxVariantData \
 { \
 public:\
 class classname##VariantData: public wxVariantData \
 { \
 public:\


@@ -363,7 +374,7 @@ wxClassInfo* classname##VariantData::GetValueClassInfo()\
     return m_value.GetClassInfo();\
 }\
 \
     return m_value.GetClassInfo();\
 }\
 \

-classname& operator << ( classname &value, const wxVariant &variant )\
+expdecl classname& operator << ( classname &value, const wxVariant &variant )\

 {\
     wxASSERT( wxIsKindOf( variant.GetData(), classname##VariantData ) );\
     \
 {\
     wxASSERT( wxIsKindOf( variant.GetData(), classname##VariantData ) );\
     \


@@ -372,27 +383,13 @@ classname& operator << ( classname &value, const wxVariant &variant )\
     return value;\
 }\
 \
     return value;\
 }\
 \

-wxVariant& operator << ( wxVariant &variant, const classname &value )\
+expdecl wxVariant& operator << ( wxVariant &variant, const classname &value )\

 {\
     classname##VariantData *data = new classname##VariantData( value );\
     variant.SetData( data );\
     return variant;\
 }
 
 {\
     classname##VariantData *data = new classname##VariantData( value );\
     variant.SetData( data );\
     return variant;\
 }
 

-#include "wx/colour.h"
-#include "wx/pen.h"
-#include "wx/brush.h"
-#include "wx/image.h"
-#include "wx/icon.h"
-#include "wx/bitmap.h"
-
-DECLARE_VARIANT_OBJECT(wxColour)
-DECLARE_VARIANT_OBJECT(wxPen)
-DECLARE_VARIANT_OBJECT(wxBrush)
-DECLARE_VARIANT_OBJECT(wxImage)
-DECLARE_VARIANT_OBJECT(wxIcon)
-DECLARE_VARIANT_OBJECT(wxBitmap)
-

 // 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.
 // 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.