From: Ryan Norton <wxprojects@comcast.net>
Date: Thu, 18 Nov 2004 08:36:25 +0000 (+0000)
Subject: fix initial color
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/18f8d0633570c0ff2384ae413ff37f900f526b57

fix initial color


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/mac/carbon/colordlgosx.mm b/src/mac/carbon/colordlgosx.mm
index f1246b418a..13a59e4168 100644
--- a/src/mac/carbon/colordlgosx.mm
+++ b/src/mac/carbon/colordlgosx.mm
@@ -2,11 +2,11 @@
 // Name:        colordlg.cpp
 // Purpose:     wxColourDialog class. NOTE: you can use the generic class
 //              if you wish, instead of implementing this.
-// Author:      Stefan Csomor
+// Author:      Ryan Norton
 // Modified by:
-// Created:     1998-01-01
+// Created:     2004-11-16
 // RCS-ID:      $Id$
-// Copyright:   (c) Stefan Csomor
+// Copyright:   (c) Ryan Norton
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -127,8 +127,8 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
     if(m_colourData.m_dataColour.Ok())
         [[NSColorPanel sharedColorPanel] setColor:
             [NSColor colorWithCalibratedRed:m_colourData.m_dataColour.Red() / 255.0
-                                        green:m_colourData.m_dataColour.Red() / 255.0
-                                        blue:m_colourData.m_dataColour.Red() / 255.0
+                                        green:m_colourData.m_dataColour.Green() / 255.0
+                                        blue:m_colourData.m_dataColour.Blue() / 255.0
                                         alpha:1.0]
         ];
     else
diff --git a/src/mac/carbon/fontdlgosx.mm b/src/mac/carbon/fontdlgosx.mm
index 532bde166c..cfc8839222 100644
--- a/src/mac/carbon/fontdlgosx.mm
+++ b/src/mac/carbon/fontdlgosx.mm
@@ -219,8 +219,8 @@ bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)
     if(m_fontData.m_fontColour.Ok())
         [[NSColorPanel sharedColorPanel] setColor:
             [NSColor colorWithCalibratedRed:m_fontData.m_fontColour.Red() / 255.0
-                                        green:m_fontData.m_fontColour.Red() / 255.0
-                                        blue:m_fontData.m_fontColour.Red() / 255.0
+                                        green:m_fontData.m_fontColour.Green() / 255.0
+                                        blue:m_fontData.m_fontColour.Blue() / 255.0
                                         alpha:1.0]
         ];
     else