From bcd16394dfc6f0c73c96ca5d4d88df21b65bc212 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 26 Nov 2015 23:54:28 +0100 Subject: [PATCH] Use wxColour::OSXGetNSColor() instead of reproducing it No real changes, just simplify wxOSX code by using the existing wxColour::OSXGetNSColor() method instead of reproducing it in many places. --- src/osx/carbon/colordlgosx.mm | 7 +------ src/osx/carbon/fontdlgosx.mm | 14 ++------------ src/osx/cocoa/dataview.mm | 6 +----- src/osx/cocoa/nonownedwnd.mm | 5 +---- src/osx/cocoa/window.mm | 10 ++-------- 5 files changed, 7 insertions(+), 35 deletions(-) diff --git a/src/osx/carbon/colordlgosx.mm b/src/osx/carbon/colordlgosx.mm index a22a2cc44b..eb51e1d755 100644 --- a/src/osx/carbon/colordlgosx.mm +++ b/src/osx/carbon/colordlgosx.mm @@ -107,12 +107,7 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data) [[NSColorPanel sharedColorPanel] setShowsAlpha:YES]; if(m_colourData.GetColour().IsOk()) - [[NSColorPanel sharedColorPanel] setColor: - [NSColor colorWithCalibratedRed:(CGFloat) (m_colourData.GetColour().Red() / 255.0) - green:(CGFloat) (m_colourData.GetColour().Green() / 255.0) - blue:(CGFloat) (m_colourData.GetColour().Blue() / 255.0) - alpha:(CGFloat) (m_colourData.GetColour().Alpha() / 255.0)] - ]; + [[NSColorPanel sharedColorPanel] setColor:m_colourData.GetColour().OSXGetNSColor()]; else [[NSColorPanel sharedColorPanel] setColor:[NSColor blackColor]]; diff --git a/src/osx/carbon/fontdlgosx.mm b/src/osx/carbon/fontdlgosx.mm index d92aaf2476..dc4ac39ccd 100644 --- a/src/osx/carbon/fontdlgosx.mm +++ b/src/osx/carbon/fontdlgosx.mm @@ -184,12 +184,7 @@ int RunMixedFontDialog(wxFontDialog* dialog) [[NSFontPanel sharedFontPanel] setPanelFont: font.OSXGetNSFont() isMultiple:NO]; if(fontdata.m_fontColour.IsOk()) - [[NSColorPanel sharedColorPanel] setColor: - [NSColor colorWithCalibratedRed:fontdata.m_fontColour.Red() / 255.0 - green:fontdata.m_fontColour.Green() / 255.0 - blue:fontdata.m_fontColour.Blue() / 255.0 - alpha:1.0] - ]; + [[NSColorPanel sharedColorPanel] setColor: fontdata.m_fontColour.OSXGetNSColor()]; else [[NSColorPanel sharedColorPanel] setColor:[NSColor blackColor]]; #endif @@ -418,12 +413,7 @@ bool wxFontDialog::Create(wxWindow *parent) } if(m_fontData.m_fontColour.IsOk()) - [[NSColorPanel sharedColorPanel] setColor: - [NSColor colorWithCalibratedRed: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] - ]; + [[NSColorPanel sharedColorPanel] setColor: fontdata.m_fontColour.OSXGetNSColor()]; else [[NSColorPanel sharedColorPanel] setColor:[NSColor blackColor]]; diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm index 905fae7fd7..259e9a62a5 100644 --- a/src/osx/cocoa/dataview.mm +++ b/src/osx/cocoa/dataview.mm @@ -2729,11 +2729,7 @@ void wxDataViewRenderer::SetAttr(const wxDataViewItemAttr& attr) data->SaveOriginalTextColour([(id)cell textColor]); } - const wxColour& c = attr.GetColour(); - colText = [NSColor colorWithCalibratedRed:c.Red() / 255. - green:c.Green() / 255. - blue:c.Blue() / 255. - alpha:c.Alpha() / 255.]; + colText = attr.GetColour().OSXGetNSColor(); } } diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm index 2cff0c70ca..560bdd5d95 100644 --- a/src/osx/cocoa/nonownedwnd.mm +++ b/src/osx/cocoa/nonownedwnd.mm @@ -839,10 +839,7 @@ bool wxNonOwnedWindowCocoaImpl::SetTransparent(wxByte alpha) bool wxNonOwnedWindowCocoaImpl::SetBackgroundColour(const wxColour& col ) { - [m_macWindow setBackgroundColor:[NSColor colorWithCalibratedRed:(CGFloat) (col.Red() / 255.0) - green:(CGFloat) (col.Green() / 255.0) - blue:(CGFloat) (col.Blue() / 255.0) - alpha:(CGFloat) (col.Alpha() / 255.0)]]; + [m_macWindow setBackgroundColor:col.OSXGetNSColor()]; return true; } diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index e2ead70efe..d8f908d2bb 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -2402,10 +2402,7 @@ void wxWidgetCocoaImpl::SetBackgroundColour( const wxColour &col ) if ( [targetView respondsToSelector:@selector(setBackgroundColor:) ] ) { - [targetView setBackgroundColor:[NSColor colorWithCalibratedRed:(CGFloat) (col.Red() / 255.0) - green:(CGFloat) (col.Green() / 255.0) - blue:(CGFloat) (col.Blue() / 255.0) - alpha:(CGFloat) (col.Alpha() / 255.0)]]; + [targetView setBackgroundColor: col.OSXGetNSColor()]; } } @@ -2668,10 +2665,7 @@ void wxWidgetCocoaImpl::SetFont(wxFont const& font, wxColour const&col, long, bo if ([targetView respondsToSelector:@selector(setFont:)]) [targetView setFont: font.OSXGetNSFont()]; if ([targetView respondsToSelector:@selector(setTextColor:)]) - [targetView setTextColor:[NSColor colorWithCalibratedRed:(CGFloat) (col.Red() / 255.0) - green:(CGFloat) (col.Green() / 255.0) - blue:(CGFloat) (col.Blue() / 255.0) - alpha:(CGFloat) (col.Alpha() / 255.0)]]; + [targetView setTextColor: col.OSXGetNSColor()]; } void wxWidgetCocoaImpl::SetToolTip(wxToolTip* tooltip)