Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed RGBColor setter to avoid former overload being an override

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2006-04-27 07:41:06 +00:00
parent b0fa218726
commit f61ed7ee42
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/mac/carbon/colour.h
View File

@@ -63,7 +63,8 @@ private:
public: public:
WXCOLORREF m_pixel ; WXCOLORREF m_pixel ;
void Set( const WXCOLORREF* color ) ; void FromRGBColor( const WXCOLORREF* color ) ;
private: private:
DECLARE_DYNAMIC_CLASS(wxColour) DECLARE_DYNAMIC_CLASS(wxColour)

2
src/mac/carbon/colordlg.cpp
View File

@@ -68,7 +68,7 @@ int wxColourDialog::ShowModal()
currentColor.red = info.theColor.color.rgb.red ; currentColor.red = info.theColor.color.rgb.red ;
currentColor.green = info.theColor.color.rgb.green ; currentColor.green = info.theColor.color.rgb.green ;
currentColor.blue = info.theColor.color.rgb.blue ; currentColor.blue = info.theColor.color.rgb.blue ;
m_colourData.m_dataColour.Set((WXCOLORREF*) &currentColor); m_colourData.m_dataColour.FromRGBColor((WXCOLORREF*) &currentColor);
return wxID_OK; return wxID_OK;
} }
#else #else

2
src/mac/carbon/colour.cpp
View File

@@ -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 ); 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; RGBColor* col = (RGBColor*) color;
memcpy( &m_pixel, color, 6 ); memcpy( &m_pixel, color, 6 );