X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a166eb645e902a645e17d7abd74c0ec2add729d0..3570a1c6e596c358848c77c5b37d724097340ce8:/src/mac/carbon/colordlg.cpp diff --git a/src/mac/carbon/colordlg.cpp b/src/mac/carbon/colordlg.cpp index 113aa958a9..bdb49c62c9 100644 --- a/src/mac/carbon/colordlg.cpp +++ b/src/mac/carbon/colordlg.cpp @@ -21,9 +21,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog) #include "wx/mac/private.h" -#ifndef __DARWIN__ -#include -#endif /* * wxColourDialog @@ -52,7 +49,6 @@ int wxColourDialog::ShowModal() { RGBColor currentColor = *((RGBColor*)m_colourData.m_dataColour.GetPixel()) ; -#if TARGET_API_MAC_OSX NColorPickerInfo info; OSStatus err ; memset(&info, 0, sizeof(info)) ; @@ -68,22 +64,10 @@ int wxColourDialog::ShowModal() currentColor.red = info.theColor.color.rgb.red ; currentColor.green = info.theColor.color.rgb.green ; currentColor.blue = info.theColor.color.rgb.blue ; - m_colourData.m_dataColour.FromRGBColor((WXCOLORREF*) ¤tColor); + m_colourData.m_dataColour = currentColor; return wxID_OK; } -#else - RGBColor newColor ; - Point where ; - - where.h = where.v = -1; - - if (GetColor( where, "\pSelect a new palette color.", ¤tColor, &newColor )) - { - m_colourData.m_dataColour.Set( (WXCOLORREF*) &newColor ) ; - return wxID_OK; - } -#endif return wxID_CANCEL; }