fixed wxUniv/GTK linking by getting rid of GENERICOBJS and putting them into GUIOBJS...

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

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