Further performance optimizations

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

diff --git a/include/wx/colour.h b/include/wx/colour.h
index c6f0e91f23b9e3ed5e6e42dc3f0795471bedc689..9c2fc423b758077f6242ca5ba599fb6ce42af769 100644 (file)
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -50,7 +50,7 @@ const unsigned char wxALPHA_OPAQUE = 0xff;
 
 #if wxUSE_VARIANT
 #include "wx/variant.h"
 
 #if wxUSE_VARIANT
 #include "wx/variant.h"

-DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLEXPORT)
+DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLIMPEXP_CORE)

 #endif
 
 //-----------------------------------------------------------------------------
 #endif
 
 //-----------------------------------------------------------------------------


@@ -68,7 +68,7 @@ DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLEXPORT)
 #define wxCOLOUR_IS_GDIOBJECT 1
 #endif
 
 #define wxCOLOUR_IS_GDIOBJECT 1
 #endif
 

-class WXDLLEXPORT wxColourBase : public 
+class WXDLLIMPEXP_CORE wxColourBase : public

 #if wxCOLOUR_IS_GDIOBJECT
     wxGDIObject
 #else
 #if wxCOLOUR_IS_GDIOBJECT
     wxGDIObject
 #else


@@ -121,7 +121,7 @@ public:
 
 #if !wxCOLOUR_IS_GDIOBJECT
     virtual bool IsOk() const= 0;
 
 #if !wxCOLOUR_IS_GDIOBJECT
     virtual bool IsOk() const= 0;

-    
+

     // older version, for backwards compatibility only (but not deprecated
     // because it's still widely used)
     bool Ok() const { return IsOk(); }
     // older version, for backwards compatibility only (but not deprecated
     // because it's still widely used)
     bool Ok() const { return IsOk(); }