wxUSE_BUTTONBAR removed.

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

diff --git a/include/wx/variant.h b/include/wx/variant.h
index f31d4db9bcb59854f322cfa808c6e01ee7d9b6d0..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_
 
 #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"
 #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
 #include "wx/list.h"
 
 #if wxUSE_DATETIME


@@ -45,7 +46,7 @@
  * overloading wxVariant with unnecessary functionality.
  */
 
  * overloading wxVariant with unnecessary functionality.
  */
 

-class WXDLLEXPORT_BASE wxVariantData: public wxObject
+class WXDLLIMPEXP_BASE wxVariantData: public wxObject

 {
 DECLARE_ABSTRACT_CLASS(wxVariantData)
 public:
 {
 DECLARE_ABSTRACT_CLASS(wxVariantData)
 public:


@@ -79,7 +80,7 @@ public:
  * this class too much.
  */
 
  * this class too much.
  */
 

-class WXDLLEXPORT_BASE wxVariant: public wxObject
+class WXDLLIMPEXP_BASE wxVariant: public wxObject

 {
 DECLARE_DYNAMIC_CLASS(wxVariant)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxVariant)
 public:


@@ -281,10 +282,10 @@ 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));
 
                      var.GetWxObjectPtr() : NULL));
 

-extern wxVariant WXDLLEXPORT_BASE wxNullVariant;
+extern wxVariant WXDLLIMPEXP_BASE wxNullVariant;

 
 #endif
     // _WX_VARIANT_H_
 
 #endif
     // _WX_VARIANT_H_