X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7234425be1f8f38e4310ca40d36f45ddb0522fd2..c6212a0cb7e6285f62198a9411d91bbe8dc06e60:/include/wx/colour.h diff --git a/include/wx/colour.h b/include/wx/colour.h index c6f0e91f23..68f6845787 100644 --- 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" -DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLEXPORT) +DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLIMPEXP_CORE) #endif //----------------------------------------------------------------------------- @@ -68,7 +68,7 @@ DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLEXPORT) #define wxCOLOUR_IS_GDIOBJECT 1 #endif -class WXDLLEXPORT wxColourBase : public +class WXDLLIMPEXP_CORE wxColourBase : public #if wxCOLOUR_IS_GDIOBJECT wxGDIObject #else @@ -121,7 +121,7 @@ public: #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(); } @@ -189,7 +189,7 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxColourBase* col); #elif defined(__WXX11__) #include "wx/x11/colour.h" #elif defined(__WXMAC__) - #include "wx/mac/colour.h" + #include "wx/osx/colour.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/colour.h" #elif defined(__WXPM__)