X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69ce77e25a8c6b3b1682b2f9ae7aeac1cecb4e6a..c94f845b1602d44ccd7c7542afffde666adbb2f0:/src/mac/carbon/fontdlg.cpp diff --git a/src/mac/carbon/fontdlg.cpp b/src/mac/carbon/fontdlg.cpp index 4cde3f25bb..5e0b975781 100644 --- a/src/mac/carbon/fontdlg.cpp +++ b/src/mac/carbon/fontdlg.cpp @@ -125,7 +125,9 @@ pascal OSStatus wxMacCarbonFontPanelHandler(EventHandlerCallRef nextHandler, Eve RGBColor fontColor ; if ( cEvent.GetParameter(kEventParamFontColor, &fontColor) == noErr ) - fontdata.m_fontColour.FromRGBColor((WXCOLORREF*) &fontColor); + { + fontdata.m_fontColour = fontColor; + } else { CFDictionaryRef dict ; @@ -150,7 +152,7 @@ pascal OSStatus wxMacCarbonFontPanelHandler(EventHandlerCallRef nextHandler, Eve { if ( tagPtr[i] == kATSUColorTag && sizePtr[i] == sizeof(RGBColor)) { - fontdata.m_fontColour.FromRGBColor((WXCOLORREF*) valuesPtr); + fontdata.m_fontColour = *(RGBColor *)valuesPtr; break ; } bytePtr = (UInt32*)( (UInt8*)bytePtr + sizePtr[i]);