header changes for the fixes commited previously

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

diff --git a/include/wx/variant.h b/include/wx/variant.h
index 78f41fc575710f0b0db4d6117665c9cd8bb37137..58f4bf23800fea1241f40ea713bffca4aa60fc37 100644 (file)
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -6,7 +6,7 @@
 // Created:     10/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VARIANT_H_
@@ -22,18 +22,11 @@
 #include "wx/list.h"
 
 #if wxUSE_TIMEDATE
-#include "wx/time.h"
-#include "wx/date.h"
-#endif
+    #include "wx/time.h"
+    #include "wx/date.h"
+#endif // time/date
 
-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#else
-#include <iostream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
-#endif
+#include "wx/ioswrap.h"
 
 /*
  * wxVariantData stores the actual data in a wxVariant object,
@@ -86,7 +79,9 @@ public:
     wxVariant();
     wxVariant(double val, const wxString& name = g_szNul);
     wxVariant(long val, const wxString& name = g_szNul);
+#ifdef HAVE_BOOL
     wxVariant(bool val, const wxString& name = g_szNul);
+#endif
     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!
@@ -121,9 +116,11 @@ public:
     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) ;
+#endif
     bool operator== (const wxString& value) const;
     bool operator!= (const wxString& value) const;
     void operator= (const wxString& value) ;
@@ -242,7 +239,7 @@ protected:
     wxString        m_name;
 };
 
-extern wxVariant wxNullVariant;
+extern wxVariant WXDLLEXPORT wxNullVariant;
 
 #endif
     // _WX_VARIANT_H_