X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..a9249b2eb2a40d8c71f828669045c4ddaa8dc5ff:/src/mac/carbon/colordlg.cpp diff --git a/src/mac/carbon/colordlg.cpp b/src/mac/carbon/colordlg.cpp index 2275a9a39d..c6037a9f96 100644 --- a/src/mac/carbon/colordlg.cpp +++ b/src/mac/carbon/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.", ¤tColor, &newColor )) + { + m_colourData.dataColour.Set( newColor ) ; + return wxID_OK; + } + else + { + return wxID_CANCEL; + } return wxID_CANCEL; }