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

add support for alpha in color dialog on OSX, see #14127

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2013-03-10 20:36:22 +00:00
parent ebeac3a73d
commit d485bda109
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/osx/carbon/colordlgosx.mm
View File

@@ -111,7 +111,7 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
[NSColor colorWithCalibratedRed:(CGFloat) (m_colourData.GetColour().Red() / 255.0) [NSColor colorWithCalibratedRed:(CGFloat) (m_colourData.GetColour().Red() / 255.0)
green:(CGFloat) (m_colourData.GetColour().Green() / 255.0) green:(CGFloat) (m_colourData.GetColour().Green() / 255.0)
blue:(CGFloat) (m_colourData.GetColour().Blue() / 255.0) blue:(CGFloat) (m_colourData.GetColour().Blue() / 255.0)
alpha:(CGFloat) 1.0] alpha:(CGFloat) (m_colourData.GetColour().Alpha() / 255.0)]
]; ];
else else
[[NSColorPanel sharedColorPanel] setColor:[NSColor blackColor]]; [[NSColorPanel sharedColorPanel] setColor:[NSColor blackColor]];
@@ -167,8 +167,9 @@ int wxColourDialog::ShowModal()
m_colourData.GetColour().Set( m_colourData.GetColour().Set(
(unsigned char) ([theColor redComponent] * 255.0), (unsigned char) ([theColor redComponent] * 255.0),
(unsigned char) ([theColor greenComponent] * 255.0), (unsigned char) ([theColor greenComponent] * 255.0),
(unsigned char) ([theColor blueComponent] * 255.0) (unsigned char) ([theColor blueComponent] * 255.0),
); (unsigned char) ([theColor alphaComponent] * 255.0)
);
//Release the pool, we're done :) //Release the pool, we're done :)
[thePool release]; [thePool release];