projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
By default, align renderers as column header under GTK+, too.
[wxWidgets.git]
/
include
/
wx
/
cocoa
/
colour.h
diff --git
a/include/wx/cocoa/colour.h
b/include/wx/cocoa/colour.h
index f0088f694c6128760d37547ce3897249c3852cd5..ddec620a9f26f722fb990d220b2ece28c895bc7d 100644
(file)
--- a/
include/wx/cocoa/colour.h
+++ b/
include/wx/cocoa/colour.h
@@
-19,20
+19,16
@@
// wxColour
// ========================================================================
// wxColour
// ========================================================================
-class WXDLL
EXPORT
wxColour : public wxColourBase
+class WXDLL
IMPEXP_CORE
wxColour : public wxColourBase
{
public:
// constructors
// ------------
{
public:
// constructors
// ------------
-
- // default
- wxColour() { Init(); }
DEFINE_STD_WXCOLOUR_CONSTRUCTORS
// initialization using existing NSColor
wxColour( WX_NSColor aColor );
DEFINE_STD_WXCOLOUR_CONSTRUCTORS
// initialization using existing NSColor
wxColour( WX_NSColor aColor );
-
// copy ctors and assignment operators
wxColour( const wxColour& col );
wxColour& operator = ( const wxColour& col );
// copy ctors and assignment operators
wxColour( const wxColour& col );
wxColour& operator = ( const wxColour& col );
@@
-40,7
+36,7
@@
public:
virtual ~wxColour();
// accessors
virtual ~wxColour();
// accessors
-
bool
Ok() const { return m_cocoaNSColor; }
+
virtual bool Is
Ok() const { return m_cocoaNSColor; }
WX_NSColor GetNSColor() { return m_cocoaNSColor; }
unsigned char Red() const { return m_red; }
WX_NSColor GetNSColor() { return m_cocoaNSColor; }
unsigned char Red() const { return m_red; }
@@
-70,9
+66,6
@@
public:
unsigned char alpha = wxALPHA_OPAQUE)
{ wxColourBase::Set(red, green, blue, alpha); }
unsigned char alpha = wxALPHA_OPAQUE)
{ wxColourBase::Set(red, green, blue, alpha); }
- bool Set(const wxChar *str)
- { return wxColourBase::Set(str); }
-
bool Set(const wxString &str)
{ return wxColourBase::Set(str); }
bool Set(const wxString &str)
{ return wxColourBase::Set(str); }
@@
-83,10
+76,8
@@
protected:
// puts the object in an invalid, uninitialized state
void Init();
// puts the object in an invalid, uninitialized state
void Init();
- virtual void InitWith(unsigned char red,
- unsigned char green,
- unsigned char blue,
- unsigned char alpha);
+ virtual void
+ InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
private:
WX_NSColor m_cocoaNSColor;
private:
WX_NSColor m_cocoaNSColor;