1. more accurate conversion from 8-bit wx color to 16-bit GDK color
2. eliminate possiblity of wxColour RGB values changing depending on colormap 3. don't allow non-const pointer access to internal GdkColor git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -40,6 +40,7 @@ public:
|
||||
// default
|
||||
wxColour() {}
|
||||
DEFINE_STD_WXCOLOUR_CONSTRUCTORS
|
||||
wxColour(const GdkColor& gdkColor);
|
||||
|
||||
~wxColour();
|
||||
|
||||
@@ -55,13 +56,9 @@ public:
|
||||
// Implementation part
|
||||
void CalcPixel( GdkColormap *cmap );
|
||||
int GetPixel() const;
|
||||
GdkColor *GetColor() const;
|
||||
const GdkColor *GetColor() const;
|
||||
|
||||
protected:
|
||||
// ref counting code
|
||||
virtual wxObjectRefData *CreateRefData() const;
|
||||
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
|
||||
|
||||
virtual bool FromString(const wxChar *str);
|
||||
virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );
|
||||
|
||||
|
Reference in New Issue
Block a user