projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't use a floating point value as a boolean flag; gcc4 (correctly) complains when...
[wxWidgets.git]
/
include
/
wx
/
cocoa
/
colour.h
diff --git
a/include/wx/cocoa/colour.h
b/include/wx/cocoa/colour.h
index 8d8671f060744a55dff8b6dadf7ee37e510d3353..17cb30210172fd81bdcf45fdd746f29af7805b59 100644
(file)
--- a/
include/wx/cocoa/colour.h
+++ b/
include/wx/cocoa/colour.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: colour.h
+// Name:
wx/cocoa/
colour.h
// Purpose: wxColour class
// Author: David Elliott
// Modified by:
// Purpose: wxColour class
// Author: David Elliott
// Modified by:
@@
-21,16
+21,25
@@
class WXDLLEXPORT wxColour: public wxObject
{
public:
class WXDLLEXPORT wxColour: public wxObject
{
public:
+ // constructors
+ // ------------
+
+ // default
wxColour() { Init(); }
wxColour() { Init(); }
- // from RGB
+ // from
separate
RGB
wxColour( unsigned char red, unsigned char green, unsigned char blue )
: m_cocoaNSColor(NULL)
{ Set(red,green,blue); }
wxColour( unsigned char red, unsigned char green, unsigned char blue )
: m_cocoaNSColor(NULL)
{ Set(red,green,blue); }
+
+ // from packed RGB
wxColour( unsigned long colRGB )
: m_cocoaNSColor(NULL)
{ Set(colRGB); }
wxColour( unsigned long colRGB )
: m_cocoaNSColor(NULL)
{ Set(colRGB); }
+ // initialization using existing NSColor
+ wxColour( WX_NSColor aColor );
+
// implicit conversion from the colour name
wxColour( const wxString &colourName )
{ InitFromName(colourName); }
// implicit conversion from the colour name
wxColour( const wxString &colourName )
{ InitFromName(colourName); }
@@
-57,11
+66,11
@@
public:
// comparison
bool operator == (const wxColour& colour) const
{
// comparison
bool operator == (const wxColour& colour) const
{
- //
VZ: sure we want to compare NSColor objects for equality here?
+ //
TODO: Really compare the NSColor
return (m_cocoaNSColor == colour.m_cocoaNSColor
return (m_cocoaNSColor == colour.m_cocoaNSColor
-
&&
m_red == colour.m_red
+
|| (
m_red == colour.m_red
&& m_green == colour.m_green
&& m_green == colour.m_green
- && m_blue == colour.m_blue);
+ && m_blue == colour.m_blue)
)
;
}
bool operator != (const wxColour& colour) const
{ return !(*this == colour); }
}
bool operator != (const wxColour& colour) const
{ return !(*this == colour); }
@@
-76,6
+85,7
@@
public:
(unsigned char)(colRGB >> 8),
(unsigned char)(colRGB >> 16));
}
(unsigned char)(colRGB >> 8),
(unsigned char)(colRGB >> 16));
}
+ void Set( WX_NSColor aColor );
protected:
// puts the object in an invalid, uninitialized state
protected:
// puts the object in an invalid, uninitialized state