X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd04970ab45eb2f392af48b71aa9ecd5d4b1c8c2..dcae64c221450a7ca9b530ecf44757543c33a754:/src/mac/carbon/colordlg.cpp diff --git a/src/mac/carbon/colordlg.cpp b/src/mac/carbon/colordlg.cpp index d3664a6d0f..a60aad9323 100644 --- a/src/mac/carbon/colordlg.cpp +++ b/src/mac/carbon/colordlg.cpp @@ -10,10 +10,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "colordlg.h" -#endif - #include "wx/wxprec.h" #include "wx/mac/colordlg.h" @@ -46,17 +42,17 @@ wxColourDialog::wxColourDialog(wxWindow *parent, wxColourData *data) bool wxColourDialog::Create(wxWindow *parent, wxColourData *data) { m_dialogParent = parent; - + if (data) m_colourData = *data; - return TRUE; + return true; } int wxColourDialog::ShowModal() { Point where ; RGBColor currentColor = *((RGBColor*)m_colourData.m_dataColour.GetPixel()) , newColor ; - + where.h = where.v = -1; if (GetColor( where, "\pSelect a new palette color.", ¤tColor, &newColor )) @@ -64,10 +60,6 @@ int wxColourDialog::ShowModal() m_colourData.m_dataColour.Set( (WXCOLORREF*) &newColor ) ; return wxID_OK; } - else - { - return wxID_CANCEL; - } return wxID_CANCEL; }