making ref counting behavior consistent, activating QD variante for polygon region...

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

diff --git a/src/mac/carbon/colordlg.cpp b/src/mac/carbon/colordlg.cpp
index 6c542fdcfb86924911d8141fc02344c146acc043..bdb49c62c9d420e0ec7695ba7993a9ee2a4bea36 100644 (file)
--- a/src/mac/carbon/colordlg.cpp
+++ b/src/mac/carbon/colordlg.cpp
@@ -10,10 +10,6 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "colordlg.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #include "wx/mac/colordlg.h"
@@ -25,9 +21,6 @@
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
 
 #include "wx/mac/private.h"
-#ifndef __DARWIN__
-#include <ColorPicker.h>
-#endif
 
 /*
  * wxColourDialog
@@ -54,17 +47,27 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 
 int wxColourDialog::ShowModal()
 {
-    Point where ;
-    RGBColor currentColor = *((RGBColor*)m_colourData.m_dataColour.GetPixel()) , newColor ;
-
-    where.h = where.v = -1;
-
-    if (GetColor( where, "\pSelect a new palette color.", &currentColor, &newColor ))
+    RGBColor currentColor = *((RGBColor*)m_colourData.m_dataColour.GetPixel()) ;
+
+    NColorPickerInfo info;
+    OSStatus err ;
+    memset(&info, 0, sizeof(info)) ;
+    // TODO : use parent to determine better position and then kAtSpecifiedOrigin
+    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 ;
+    err = NPickColor(&info);
+    if ((err == noErr) && info.newColorChosen)
     {
-        m_colourData.m_dataColour.Set( (WXCOLORREF*) &newColor ) ;
+        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 = currentColor;
+
         return wxID_OK;
     }
-
     return wxID_CANCEL;
 }