Wrappers for *ToText

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

diff --git a/include/wx/variant.h b/include/wx/variant.h
index eda1afbb89ec28fd4c697630a5fa55a85f14a324..ef70b0e3ae5103a2016403fdb90c1d40be375d4b 100644 (file)
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -12,7 +12,7 @@
 #ifndef _WX_VARIANT_H_
 #define _WX_VARIANT_H_
 
 #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
 
 #pragma interface "variant.h"
 #endif
 


@@ -282,7 +282,7 @@ protected:
 //a dynamic_cast /wxDynamicCast analogue.
 
 #define wxGetVariantCast(var,classname) \
 //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;
                      var.GetWxObjectPtr() : NULL));
 
 extern wxVariant WXDLLIMPEXP_BASE wxNullVariant;