From 3721dc6efe6f9ffe550c4c83bee2da210043bcaa Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 5 Nov 2010 21:38:49 +0000 Subject: [PATCH] Remove unnecessary wxOSX_USE_COCOA guards in Cocoa-only file. The #if wxOSX_USE_COCOA seems unnecessary in a file that is used in wxOSX/Cocoa only so simply remove it. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/cocoa/colour.mm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/osx/cocoa/colour.mm b/src/osx/cocoa/colour.mm index aebe52e1f3..55a305d29f 100644 --- a/src/osx/cocoa/colour.mm +++ b/src/osx/cocoa/colour.mm @@ -19,11 +19,10 @@ #include "wx/osx/private.h" -#if wxOSX_USE_COCOA wxColour::wxColour(WX_NSColor col) { size_t noComp = [col numberOfComponents]; - + CGFloat *components = NULL; if ( noComp >= 1 && noComp <= 4 ) { @@ -36,6 +35,5 @@ wxColour::wxColour(WX_NSColor col) WX_NSColor wxColour::OSXGetNSColor() { - return [NSColor colorWithDeviceRed:m_red / 255.0 green:m_green / 255.0 blue:m_blue / 255.0 alpha:m_alpha / 255.0]; + return [NSColor colorWithDeviceRed:m_red / 255.0 green:m_green / 255.0 blue:m_blue / 255.0 alpha:m_alpha / 255.0]; } -#endif \ No newline at end of file -- 2.45.2