X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..b34039cf55bc7cb87cedf396f60396e2f8fc0d62:/src/mac/colordlg.cpp diff --git a/src/mac/colordlg.cpp b/src/mac/colordlg.cpp index 2275a9a39d..90326e713d 100644 --- a/src/mac/colordlg.cpp +++ b/src/mac/colordlg.cpp @@ -14,12 +14,14 @@ #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" + /* * wxColourDialog */ @@ -45,8 +47,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.", ¤tColor, &newColor )) + { + m_colourData.dataColour.Set( (WXCOLORREF*) &newColor ) ; + return wxID_OK; + } + else + { + return wxID_CANCEL; + } return wxID_CANCEL; }