diff --git a/include/wx/mac/carbon/colour.h b/include/wx/mac/carbon/colour.h index 88212da6bf..3abeee88ea 100644 --- a/include/wx/mac/carbon/colour.h +++ b/include/wx/mac/carbon/colour.h @@ -63,7 +63,8 @@ private: public: WXCOLORREF m_pixel ; - void Set( const WXCOLORREF* color ) ; + void FromRGBColor( const WXCOLORREF* color ) ; + private: DECLARE_DYNAMIC_CLASS(wxColour) diff --git a/src/mac/carbon/colordlg.cpp b/src/mac/carbon/colordlg.cpp index 4109e33488..db694ec082 100644 --- a/src/mac/carbon/colordlg.cpp +++ b/src/mac/carbon/colordlg.cpp @@ -68,7 +68,7 @@ int wxColourDialog::ShowModal() currentColor.red = info.theColor.color.rgb.red ; currentColor.green = info.theColor.color.rgb.green ; currentColor.blue = info.theColor.color.rgb.blue ; - m_colourData.m_dataColour.Set((WXCOLORREF*) ¤tColor); + m_colourData.m_dataColour.FromRGBColor((WXCOLORREF*) ¤tColor); return wxID_OK; } #else diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp index 081bc24957..e9237fdbc6 100644 --- a/src/mac/carbon/colour.cpp +++ b/src/mac/carbon/colour.cpp @@ -52,7 +52,7 @@ void wxColour::InitWith (unsigned char r, unsigned char g, unsigned char b) wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ); } -void wxColour::Set( const WXCOLORREF* color ) +void wxColour::FromRGBColor( const WXCOLORREF* color ) { RGBColor* col = (RGBColor*) color; memcpy( &m_pixel, color, 6 );