X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bddd7a8d8953cf4c09e56c13e1bfcc594ba0267e..948c96efa139d919e03cfa699d3d4a4258876d82:/include/wx/variant.h diff --git a/include/wx/variant.h b/include/wx/variant.h index 7dcdc8ae46..ef70b0e3ae 100644 --- 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;