Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2006-04-29 19:19:58 +00:00
parent af182d461f
commit a166eb645e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/mac/carbon/colordlg.cpp
View File

@@ -69,6 +69,7 @@ int wxColourDialog::ShowModal()
currentColor.green = info.theColor.color.rgb.green ; currentColor.green = info.theColor.color.rgb.green ;
currentColor.blue = info.theColor.color.rgb.blue ; currentColor.blue = info.theColor.color.rgb.blue ;
m_colourData.m_dataColour.FromRGBColor((WXCOLORREF*) &currentColor); m_colourData.m_dataColour.FromRGBColor((WXCOLORREF*) &currentColor);
return wxID_OK; return wxID_OK;
} }
#else #else

4
src/mac/carbon/fontdlg.cpp
View File

@@ -116,7 +116,7 @@ pascal OSStatus wxMacCarbonFontPanelHandler(EventHandlerCallRef nextHandler, Eve
RGBColor fontColor ; RGBColor fontColor ;
if ( cEvent.GetParameter<RGBColor>(kEventParamFontColor, &fontColor) == noErr ) if ( cEvent.GetParameter<RGBColor>(kEventParamFontColor, &fontColor) == noErr )
fontdata.m_fontColour.Set((WXCOLORREF*) &fontColor); fontdata.m_fontColour.FromRGBColor((WXCOLORREF*) &fontColor);
else else
{ {
CFDictionaryRef dict ; 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 ; break ;
} }
bytePtr = (UInt32*)( (UInt8*)bytePtr + sizePtr[i]); bytePtr = (UInt32*)( (UInt8*)bytePtr + sizePtr[i]);