renamed RGBColor setter to avoid former overload being an override

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/colour.h b/include/wx/mac/carbon/colour.h
index 88212da6bfd4a4839dd0d172900b32ab278483ad..3abeee88ea8657a1c0b2bae291136184b8e7b4c1 100644 (file)
--- 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 4109e33488ae94d2683282a0c32a972f68cccb10..db694ec08219f7ca445e627a3b55e1f534bc1d01 100644 (file)
--- 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*) &currentColor);
+        m_colourData.m_dataColour.FromRGBColor((WXCOLORREF*) &currentColor);
         return wxID_OK;
     }
 #else

diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp
index 081bc249571eaaaa9343429cbe6b679f929f7614..e9237fdbc60f87225005e5a023fb49c2d1b206f0 100644 (file)
--- 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 );