X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/055de35012da711c0ebdf83e53d11f221af731fc..52e750fc75020aa412fc85623d2b3cf91f9b0b33:/src/mac/carbon/fontdlg.cpp?ds=sidebyside diff --git a/src/mac/carbon/fontdlg.cpp b/src/mac/carbon/fontdlg.cpp index e18c299903..e155dd7bd5 100644 --- a/src/mac/carbon/fontdlg.cpp +++ b/src/mac/carbon/fontdlg.cpp @@ -28,7 +28,7 @@ #ifndef WX_PRECOMP #include "wx/intl.h" - #include "wx/wxchar.h" + #include "wx/crt.h" #include "wx/dcclient.h" #include "wx/frame.h" #include "wx/textctrl.h" @@ -152,7 +152,7 @@ pascal OSStatus wxMacCarbonFontPanelHandler(EventHandlerCallRef nextHandler, Eve { if ( tagPtr[i] == kATSUColorTag && sizePtr[i] == sizeof(RGBColor)) { - fontdata.m_fontColour.FromRGBColor(*(RGBColor *)valuesPtr); + fontdata.m_fontColour = *(RGBColor *)valuesPtr; break ; } bytePtr = (UInt32*)( (UInt8*)bytePtr + sizePtr[i]);