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

always use calibrated colors, fixes #14482

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2012-07-13 06:51:04 +00:00
parent cceffa9e86
commit 2331e2cecc
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osx/cocoa/colour.mm
View File

@ -42,5 +42,5 @@ wxColour::wxColour(WX_NSColor col)
WX_NSColor wxColour::OSXGetNSColor() const
{
return [NSColor colorWithDeviceRed:m_red / 255.0 green:m_green / 255.0 blue:m_blue / 255.0 alpha:m_alpha / 255.0];
return [NSColor colorWithCalibratedRed:m_red / 255.0 green:m_green / 255.0 blue:m_blue / 255.0 alpha:m_alpha / 255.0];
}

19
src/osx/cocoa/dataview.mm
View File

@ -1167,6 +1167,23 @@ outlineView:(NSOutlineView*)outlineView
@implementation wxCustomCell
#if 0 // starting implementation for custom cell clicks
- (id)init
{
self = [super init];
[self setAction:@selector(clickedAction)];
[self setTarget:self];
return self;
}
- (void) clickedAction: (id) sender
{
wxUnusedVar(sender);
}
#endif
-(NSSize) cellSize
{
wxCustomRendererObject * const
@ -2697,7 +2714,7 @@ void wxDataViewRenderer::OSXApplyAttr(const wxDataViewItemAttr& attr)
}
const wxColour& c = attr.GetColour();
colText = [NSColor colorWithDeviceRed:c.Red() / 255.
colText = [NSColor colorWithCalibratedRed:c.Red() / 255.
green:c.Green() / 255.
blue:c.Blue() / 255.
alpha:c.Alpha() / 255.];