removed _WIN_IE from here, we normally shouldn't need it as it was moved to wrapcctl.h

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

diff --git a/include/wx/variant.h b/include/wx/variant.h
index 7c1b224c80405454631326c08d68e8a7af2064b5..eda1afbb89ec28fd4c697630a5fa55a85f14a324 100644 (file)
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -19,6 +19,7 @@
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
+#include "wx/arrstr.h"
 #include "wx/list.h"
 
 #if wxUSE_DATETIME
@@ -45,7 +46,7 @@
  * overloading wxVariant with unnecessary functionality.
  */
 
-class WXDLLEXPORT wxVariantData: public wxObject
+class WXDLLIMPEXP_BASE wxVariantData: public wxObject
 {
 DECLARE_ABSTRACT_CLASS(wxVariantData)
 public:
@@ -79,7 +80,7 @@ public:
  * this class too much.
  */
 
-class WXDLLEXPORT wxVariant: public wxObject
+class WXDLLIMPEXP_BASE wxVariant: public wxObject
 {
 DECLARE_DYNAMIC_CLASS(wxVariant)
 public:
@@ -284,7 +285,7 @@ protected:
        ((classname*)(var.IsValueKindOf(&classname::sm_class##classname) ?\
                      var.GetWxObjectPtr() : NULL));
 
-extern wxVariant WXDLLEXPORT wxNullVariant;
+extern wxVariant WXDLLIMPEXP_BASE wxNullVariant;
 
 #endif
     // _WX_VARIANT_H_