since DoScreenToClient and ClientToScreen in toplvlcmn are implemented by calling...

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

diff --git a/src/mac/colordlg.cpp b/src/mac/colordlg.cpp
index 2275a9a39d679502d0a4c20e4d09c29009dc9445..b8df2bcc5a302c5b1a61f77113575ed8a6a127ab 100644 (file)
--- a/src/mac/colordlg.cpp
+++ b/src/mac/colordlg.cpp
@@ -14,12 +14,17 @@
 #pragma implementation "colordlg.h"
 #endif
 
 #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
 
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
 #endif
 

+#include "wx/mac/private.h"
+#ifndef __DARWIN__
+#include <ColorPicker.h>
+#endif
+

 /*
  * wxColourDialog
  */
 /*
  * wxColourDialog
  */


@@ -45,8 +50,20 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 
 int wxColourDialog::ShowModal()
 {
 
 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;
 }
 
     return wxID_CANCEL;
 }