changed calls to wxMac's private wxColour::Set to use the renamed function wxColour...

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

diff --git a/src/mac/carbon/colordlg.cpp b/src/mac/carbon/colordlg.cpp
index db694ec08219f7ca445e627a3b55e1f534bc1d01..113aa958a929bfdc27d15abab55b96f8f1a84a64 100644 (file)
--- a/src/mac/carbon/colordlg.cpp
+++ b/src/mac/carbon/colordlg.cpp
@@ -69,6 +69,7 @@ int wxColourDialog::ShowModal()
         currentColor.green = info.theColor.color.rgb.green ;
         currentColor.blue = info.theColor.color.rgb.blue ;
         m_colourData.m_dataColour.FromRGBColor((WXCOLORREF*) &currentColor);
         currentColor.green = info.theColor.color.rgb.green ;
         currentColor.blue = info.theColor.color.rgb.blue ;
         m_colourData.m_dataColour.FromRGBColor((WXCOLORREF*) &currentColor);

+

         return wxID_OK;
     }
 #else
         return wxID_OK;
     }
 #else

diff --git a/src/mac/carbon/fontdlg.cpp b/src/mac/carbon/fontdlg.cpp
index e1aa19d2c66322b80d37d6c29975c134ec604953..7ce9c5567881af5433baa4423b7e7f86996b84f3 100644 (file)
--- a/src/mac/carbon/fontdlg.cpp
+++ b/src/mac/carbon/fontdlg.cpp
@@ -116,7 +116,7 @@ pascal OSStatus wxMacCarbonFontPanelHandler(EventHandlerCallRef nextHandler, Eve
 
             RGBColor fontColor ;
             if ( cEvent.GetParameter<RGBColor>(kEventParamFontColor, &fontColor) == noErr )
 
             RGBColor fontColor ;
             if ( cEvent.GetParameter<RGBColor>(kEventParamFontColor, &fontColor) == noErr )

-                fontdata.m_fontColour.Set((WXCOLORREF*) &fontColor);
+                fontdata.m_fontColour.FromRGBColor((WXCOLORREF*) &fontColor);

             else
             {
                 CFDictionaryRef dict ;
             else
             {
                 CFDictionaryRef dict ;


@@ -141,7 +141,7 @@ pascal OSStatus wxMacCarbonFontPanelHandler(EventHandlerCallRef nextHandler, Eve
                             {
                                 if ( tagPtr[i] == kATSUColorTag && sizePtr[i] == sizeof(RGBColor))
                                 {
                             {
                                 if ( tagPtr[i] == kATSUColorTag && sizePtr[i] == sizeof(RGBColor))
                                 {

-                                    fontdata.m_fontColour.Set((WXCOLORREF*) valuesPtr);
+                                    fontdata.m_fontColour.FromRGBColor((WXCOLORREF*) valuesPtr);

                                     break ;
                                 }
                                 bytePtr = (UInt32*)( (UInt8*)bytePtr + sizePtr[i]);
                                     break ;
                                 }
                                 bytePtr = (UInt32*)( (UInt8*)bytePtr + sizePtr[i]);