X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f884a0dccd6b642f35c441ac9bfc87a6d5b4d35..71ebd60b06f0c299b3f6ae3b11a8dcb4b0306493:/include/wx/colour.h?ds=sidebyside diff --git a/include/wx/colour.h b/include/wx/colour.h index ee2c023f90..b0296e860e 100644 --- a/include/wx/colour.h +++ b/include/wx/colour.h @@ -18,18 +18,21 @@ class WXDLLIMPEXP_FWD_CORE wxColour; -// the standard wxColour constructors; -// this macro avoids to repeat these lines across all colour.h files, since -// Set() is a virtual function and thus cannot be called by wxColourBase -// constructors +// A macro to define the standard wxColour constructors: +// +// It avoids the need to repeat these lines across all colour.h files, since +// Set() is a virtual function and thus cannot be called by wxColourBase ctors #define DEFINE_STD_WXCOLOUR_CONSTRUCTORS \ - wxColour( ChannelType red, ChannelType green, ChannelType blue, \ - ChannelType alpha = wxALPHA_OPAQUE ) \ - { Set(red, green, blue, alpha); } \ - wxColour( unsigned long colRGB ) { Set(colRGB); } \ - wxColour(const wxString& colourName) { Set(colourName); } \ - wxColour(const char *colourName) { Set(colourName); } \ - wxColour(const wchar_t *colourName) { Set(colourName); } + wxColour() { Init(); } \ + wxColour(ChannelType red, \ + ChannelType green, \ + ChannelType blue, \ + ChannelType alpha = wxALPHA_OPAQUE) \ + { Init(); Set(red, green, blue, alpha); } \ + wxColour(unsigned long colRGB) { Init(); Set(colRGB ); } \ + wxColour(const wxString& colourName) { Init(); Set(colourName); } \ + wxColour(const char *colourName) { Init(); Set(colourName); } \ + wxColour(const wchar_t *colourName) { Init(); Set(colourName); } // flags for wxColour -> wxString conversion (see wxColour::GetAsString) @@ -55,7 +58,18 @@ DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLEXPORT) // code redundancy in all native wxColour implementations //----------------------------------------------------------------------------- -class WXDLLEXPORT wxColourBase : public wxGDIObject +#if defined( __WXMAC__ ) || defined( __WXMSW__ ) +#define wxCOLOUR_IS_GDIOBJECT 0 +#else +#define wxCOLOUR_IS_GDIOBJECT 1 +#endif + +class WXDLLEXPORT wxColourBase : public +#if wxCOLOUR_IS_GDIOBJECT + wxGDIObject +#else + wxObject +#endif { public: // type of a single colour component @@ -101,7 +115,13 @@ public: // implemented in colourcmn.cpp virtual wxString GetAsString(long flags = wxC2S_NAME | wxC2S_CSS_SYNTAX) const; - +#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(); } +#endif // old, deprecated // --------------- @@ -112,11 +132,16 @@ public: #endif protected: + // Some ports need Init() and while we don't, provide a stub so that the + // ports which don't need it are not forced to define it + void Init() { } + virtual void InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a) = 0; virtual bool FromString(const wxString& s); +#if wxCOLOUR_IS_GDIOBJECT // wxColour doesn't use reference counted data (at least not in all ports) // so provide stubs for the functions which need to be defined if we do use // them @@ -133,6 +158,7 @@ protected: return NULL; } +#endif };