X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66a09d4776b8ae390d5aa51dbd678b694f2c81d6..a631300cb83b23107f5b61bd96a97a6ef05cc122:/src/mac/colordlg.cpp diff --git a/src/mac/colordlg.cpp b/src/mac/colordlg.cpp index b8df2bcc5a..3c8411319b 100644 --- a/src/mac/colordlg.cpp +++ b/src/mac/colordlg.cpp @@ -2,12 +2,12 @@ // Name: colordlg.cpp // Purpose: wxColourDialog class. NOTE: you can use the generic class // if you wish, instead of implementing this. -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -50,20 +50,20 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data) int wxColourDialog::ShowModal() { - Point where ; - RGBColor currentColor = *((RGBColor*)m_colourData.dataColour.GetPixel()) , newColor ; - - where.h = where.v = -1; + 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 )) - { - m_colourData.dataColour.Set( (WXCOLORREF*) &newColor ) ; - return wxID_OK; - } - else - { - return wxID_CANCEL; - } + if (GetColor( where, "\pSelect a new palette color.", ¤tColor, &newColor )) + { + m_colourData.m_dataColour.Set( (WXCOLORREF*) &newColor ) ; + return wxID_OK; + } + else + { + return wxID_CANCEL; + } return wxID_CANCEL; }