X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/489468feaa08b8f504735eecca522fb8d0f825d2..c937bcac0fb8a8df7c0cbfc8c478a2874fec3eb9:/src/osx/carbon/colordlg.cpp diff --git a/src/osx/carbon/colordlg.cpp b/src/osx/carbon/colordlg.cpp index 377276d0c4..6ec1b9e15a 100644 --- a/src/osx/carbon/colordlg.cpp +++ b/src/osx/carbon/colordlg.cpp @@ -12,7 +12,7 @@ #include "wx/wxprec.h" -#include "wx/mac/colordlg.h" +#include "wx/osx/colordlg.h" #include "wx/fontdlg.h" @@ -20,7 +20,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog) -#include "wx/mac/private.h" +#include "wx/osx/private.h" /* * wxColourDialog @@ -48,13 +48,13 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data) int wxColourDialog::ShowModal() { RGBColor currentColor ; - - m_colourData.m_dataColour.GetRGBColor( currentColor ); + + m_colourData.m_dataColour.GetRGBColor( ¤tColor ); NColorPickerInfo info; OSStatus err ; memset(&info, 0, sizeof(info)) ; // TODO : use parent to determine better position and then kAtSpecifiedOrigin - info.placeWhere = kCenterOnMainScreen ; + info.placeWhere = kCenterOnMainScreen ; info.flags = kColorPickerDialogIsMoveable | kColorPickerDialogIsModal ; info.theColor.color.rgb.red = currentColor.red ; info.theColor.color.rgb.green = currentColor.green ;