#include "wx/gdiobj.h"
-class WXDLLEXPORT wxColour;
+class WXDLLIMPEXP_FWD_CORE wxColour;
// the standard wxColour constructors;
// this macro avoids to repeat these lines across all colour.h files, since
ChannelType alpha = wxALPHA_OPAQUE ) \
{ Set(red, green, blue, alpha); } \
wxColour( unsigned long colRGB ) { Set(colRGB); } \
- wxColour(const wxString &colourName) { Set(colourName); } \
- wxColour(const wxChar *colourName) { Set(colourName); }
+ wxColour(const wxString& colourName) { Set(colourName); } \
+ wxColour(const char *colourName) { Set(colourName); } \
+ wxColour(const wchar_t *colourName) { Set(colourName); }
// flags for wxColour -> wxString conversion (see wxColour::GetAsString)
{ InitRGBA(red,green,blue, alpha); }
// implemented in colourcmn.cpp
- bool Set(const wxChar *str)
- { return FromString(str); }
-
bool Set(const wxString &str)
{ return FromString(str); }
{
// we don't need to know sizeof(long) here because we assume that the three
// least significant bytes contain the R, G and B values
- Set((ChannelType)colRGB,
- (ChannelType)(colRGB >> 8),
- (ChannelType)(colRGB >> 16));
+ Set((ChannelType)(0xFF & colRGB),
+ (ChannelType)(0xFF & (colRGB >> 8)),
+ (ChannelType)(0xFF & (colRGB >> 16)));
}
virtual void
InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a) = 0;
- virtual bool FromString(const wxChar *s);
+ virtual bool FromString(const wxString& s);
};