added wxStringOutputStream::TellO(); fixed bugs in OnSysWrite()

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

diff --git a/include/wx/variant.h b/include/wx/variant.h
index 7dcdc8ae46dd21261db98e3b5296a4df0e8b2841..ef70b0e3ae5103a2016403fdb90c1d40be375d4b 100644 (file)
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -12,13 +12,14 @@
 #ifndef _WX_VARIANT_H_
 #define _WX_VARIANT_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #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"
 
 #if wxUSE_DATETIME
@@ -281,7 +282,7 @@ protected:
 //a dynamic_cast /wxDynamicCast analogue.
 
 #define wxGetVariantCast(var,classname) \
-       ((classname*)(var.IsValueKindOf(&classname::sm_class##classname) ?\
+       ((classname*)(var.IsValueKindOf(&classname::ms_classInfo) ?\
                      var.GetWxObjectPtr() : NULL));
 
 extern wxVariant WXDLLIMPEXP_BASE wxNullVariant;