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

Remove unnecessary wxOSX_USE_COCOA guards in Cocoa-only file.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2010-11-05 21:38:49 +00:00
parent b7db378853
commit 3721dc6efe
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,11 +19,10 @@
#include "wx/osx/private.h" #include "wx/osx/private.h"
#if wxOSX_USE_COCOA
wxColour::wxColour(WX_NSColor col) wxColour::wxColour(WX_NSColor col)
{ {
size_t noComp = [col numberOfComponents]; size_t noComp = [col numberOfComponents];
CGFloat *components = NULL; CGFloat *components = NULL;
if ( noComp >= 1 && noComp <= 4 ) if ( noComp >= 1 && noComp <= 4 )
{ {
@@ -36,6 +35,5 @@ wxColour::wxColour(WX_NSColor col)
WX_NSColor wxColour::OSXGetNSColor() 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