int wxColourDialog::ShowModal()
{
RGBColor 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 ;
info.theColor.color.rgb.blue = currentColor.blue ;
+ wxDialog::OSXBeginModalDialog();
err = NPickColor(&info);
+ wxDialog::OSXEndModalDialog();
if ((err == noErr) && info.newColorChosen)
{
currentColor.red = info.theColor.color.rgb.red ;