From a166eb645e902a645e17d7abd74c0ec2add729d0 Mon Sep 17 00:00:00 2001 From: Dimitri Schoolwerth Date: Sat, 29 Apr 2006 19:19:58 +0000 Subject: [PATCH] changed calls to wxMac's private wxColour::Set to use the renamed function wxColour::FromRGBColor git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/colordlg.cpp | 1 + src/mac/carbon/fontdlg.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mac/carbon/colordlg.cpp b/src/mac/carbon/colordlg.cpp index db694ec082..113aa958a9 100644 --- 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*) ¤tColor); + return wxID_OK; } #else diff --git a/src/mac/carbon/fontdlg.cpp b/src/mac/carbon/fontdlg.cpp index e1aa19d2c6..7ce9c55678 100644 --- 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(kEventParamFontColor, &fontColor) == noErr ) - fontdata.m_fontColour.Set((WXCOLORREF*) &fontColor); + fontdata.m_fontColour.FromRGBColor((WXCOLORREF*) &fontColor); else { CFDictionaryRef dict ; @@ -141,7 +141,7 @@ pascal OSStatus wxMacCarbonFontPanelHandler(EventHandlerCallRef nextHandler, Eve { 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]); -- 2.45.2