X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e40298d54ecd5b109222a7c60aa2ef084a304d69..204abcd474fa99071b7bb5b00f7e212b0bde16dc:/src/mac/carbon/colordlg.cpp

diff --git a/src/mac/carbon/colordlg.cpp b/src/mac/carbon/colordlg.cpp
index 134e40f445..bdb49c62c9 100644
--- a/src/mac/carbon/colordlg.cpp
+++ b/src/mac/carbon/colordlg.cpp
@@ -10,20 +10,17 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "colordlg.h"
-#endif
+#include "wx/wxprec.h"
 
 #include "wx/mac/colordlg.h"
+#include "wx/fontdlg.h"
+
+
+#if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
-#endif
 
 #include "wx/mac/private.h"
-#ifndef __DARWIN__
-#include <ColorPicker.h>
-#endif
 
 /*
  * wxColourDialog
@@ -42,29 +39,36 @@ wxColourDialog::wxColourDialog(wxWindow *parent, wxColourData *data)
 bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 {
     m_dialogParent = parent;
-  
+
     if (data)
         m_colourData = *data;
-    return TRUE;
+    return true;
 }
 
 int wxColourDialog::ShowModal()
 {
-    Point where ;
-    RGBColor currentColor = *((RGBColor*)m_colourData.dataColour.GetPixel()) , newColor ;
-    
-    where.h = where.v = -1;
+    RGBColor currentColor = *((RGBColor*)m_colourData.m_dataColour.GetPixel()) ;
 
-    if (GetColor( where, "\pSelect a new palette color.", &currentColor, &newColor ))
+    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.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;
     }
-    else
-    {
-        return wxID_CANCEL;
-    }
-
     return wxID_CANCEL;
 }
 
+#endif