X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..bf60426831535738b1b784629f08e9dd00bf9ecc:/src/mac/colordlg.cpp

diff --git a/src/mac/colordlg.cpp b/src/mac/colordlg.cpp
index 2275a9a39d..b8df2bcc5a 100644
--- a/src/mac/colordlg.cpp
+++ b/src/mac/colordlg.cpp
@@ -14,12 +14,17 @@
 #pragma implementation "colordlg.h"
 #endif
 
-#include "wx/stubs/colordlg.h"
+#include "wx/mac/colordlg.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
 #endif
 
+#include "wx/mac/private.h"
+#ifndef __DARWIN__
+#include <ColorPicker.h>
+#endif
+
 /*
  * wxColourDialog
  */
@@ -45,8 +50,20 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 
 int wxColourDialog::ShowModal()
 {
-    /* TODO: implement dialog
-     */
+	Point where ;
+	RGBColor currentColor = *((RGBColor*)m_colourData.dataColour.GetPixel()) , newColor ;
+	
+	where.h = where.v = -1;
+
+	if (GetColor( where, "\pSelect a new palette color.", &currentColor, &newColor ))
+	{
+		m_colourData.dataColour.Set( (WXCOLORREF*) &newColor ) ;
+    	return wxID_OK;
+	}
+	else
+	{
+    	return wxID_CANCEL;
+	}
 
     return wxID_CANCEL;
 }