Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix initial color

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2004-11-18 08:36:25 +00:00
parent 0bcf9597ab
commit 18f8d06335
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mac/carbon/colordlgosx.mm
View File

@@ -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

4
src/mac/carbon/fontdlgosx.mm
View File

@@ -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