wxUSE_SOCKETS added to setup(0).h; Cygwin corrections; doc tweaks

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

diff --git a/include/wx/variant.h b/include/wx/variant.h
index 157259cc5fb82c0116c255ded6e3aabb5691dd55..a52b72239cdd6617e278a3878204ea359fcfaf6b 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,
@@ -84,20 +77,20 @@ public:
 
 // Construction & destruction
     wxVariant();
-    wxVariant(double val, const wxString& name = wxEmptyString);
-    wxVariant(long val, const wxString& name = wxEmptyString);
-    wxVariant(bool val, const wxString& name = wxEmptyString);
-    wxVariant(char val, const wxString& name = wxEmptyString);
-    wxVariant(const wxString& val, const wxString& name = wxEmptyString);
-    wxVariant(const char* 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(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 = wxEmptyString); // Time
-    wxVariant(const wxDate& val, const wxString& name = wxEmptyString); // Date
+    wxVariant(const wxTime& val, const wxString& name = g_szNul); // Time
+    wxVariant(const wxDate& val, const wxString& name = g_szNul); // Date
 #endif
-    wxVariant(void* ptr, const wxString& name = wxEmptyString); // void* (general purpose)
-    wxVariant(wxVariantData* data, const wxString& name = wxEmptyString); // User-defined data
+    wxVariant(void* ptr, const wxString& name = g_szNul); // void* (general purpose)
+    wxVariant(wxVariantData* data, const wxString& name = g_szNul); // User-defined data
     wxVariant(const wxVariant& variant);
     ~wxVariant();
 
@@ -242,7 +235,7 @@ protected:
     wxString        m_name;
 };
 
-extern wxVariant wxNullVariant;
+extern wxVariant WXDLLEXPORT wxNullVariant;
 
 #endif
     // _WX_VARIANT_H_