Fix file paths in the header comments.

[wxWidgets.git] / src / osx / carbon / colordlg.cpp

diff --git a/src/osx/carbon/colordlg.cpp b/src/osx/carbon/colordlg.cpp
index 4a226c357acd92e141690270a13d524c2a825afa..c62b2ae5e4d86d1f5144b0415c2f5f790658d6cc 100644 (file)
--- a/src/osx/carbon/colordlg.cpp
+++ b/src/osx/carbon/colordlg.cpp
@@ -48,18 +48,20 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 int wxColourDialog::ShowModal()
 {
     RGBColor currentColor ;
 int wxColourDialog::ShowModal()
 {
     RGBColor currentColor ;

-    
+

     m_colourData.m_dataColour.GetRGBColor( &currentColor );
     NColorPickerInfo info;
     OSStatus err ;
     memset(&info, 0, sizeof(info)) ;
     // TODO : use parent to determine better position and then kAtSpecifiedOrigin
     m_colourData.m_dataColour.GetRGBColor( &currentColor );
     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 ;
     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);
     err = NPickColor(&info);

+    wxDialog::OSXEndModalDialog();

     if ((err == noErr) && info.newColorChosen)
     {
         currentColor.red = info.theColor.color.rgb.red ;
     if ((err == noErr) && info.newColorChosen)
     {
         currentColor.red = info.theColor.color.rgb.red ;