X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e75491071dbefcada61175e3eb89ce4edf335983..aa0ffd1d926cb1282fb75a1ce0e083421ade2f0b:/include/wx/mac/colour.h diff --git a/include/wx/mac/colour.h b/include/wx/mac/colour.h index d9f82e8eb1..c290cbefd6 100644 --- a/include/wx/mac/colour.h +++ b/include/wx/mac/colour.h @@ -28,6 +28,8 @@ public: wxColour(); // from RGB wxColour( unsigned char red, unsigned char green, unsigned char blue ); + wxColour( unsigned long colRGB ) { Set(colRGB); } + // implicit conversion from the colour name wxColour( const wxString &colourName ) { InitFromName(colourName); } wxColour( const char *colourName ) { InitFromName(colourName); } @@ -74,7 +76,7 @@ public: void InitFromName(const wxString& col); - const WXCOLORREF GetPixel() const { return m_pixel; }; + const WXCOLORREF& GetPixel() const { return m_pixel; }; private: bool m_isInit; @@ -84,7 +86,7 @@ private: public: WXCOLORREF m_pixel ; - void Set( WXCOLORREF color ) { m_pixel = color ; m_red = m_pixel.red>>8 ;m_blue = m_pixel.blue>>8 ;m_green = m_pixel.green>>8 ;} + void Set( const WXCOLORREF* color ) ; private: DECLARE_DYNAMIC_CLASS(wxColour)