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 f1246b418ac0b3845f566d120b4c5b0b29894c2e..13a59e41687b110a0b34a90cb4177fae226c1e7c 100644 (file)
--- 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.
 // 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:
 // Modified by:

-// Created:     1998-01-01
+// Created:     2004-11-16

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) Stefan Csomor
+// Copyright:   (c) Ryan Norton

 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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
     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
                                         alpha:1.0]
         ];
     else

diff --git a/src/mac/carbon/fontdlgosx.mm b/src/mac/carbon/fontdlgosx.mm
index 532bde166cafdb11bf6a8f3d5744896a18b65dc8..cfc88392224350056339e0d799dbc65a37be6750 100644 (file)
--- 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
     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
                                         alpha:1.0]
         ];
     else