projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of wxFontMapper in wxBase library.
[wxWidgets.git]
/
include
/
wx
/
cocoa
/
colour.h
diff --git
a/include/wx/cocoa/colour.h
b/include/wx/cocoa/colour.h
index 694e870b733c3246f3bac20f11da6da49c10311c..9200c35502de1e401ead3c53994613f49b517e51 100644
(file)
--- a/
include/wx/cocoa/colour.h
+++ b/
include/wx/cocoa/colour.h
@@
-21,11
+21,8
@@
class WXDLLEXPORT wxColour: public wxObject
{
public:
class WXDLLEXPORT wxColour: public wxObject
{
public:
- DECLARE_DYNAMIC_CLASS(wxColour)
-// ------------------------------------------------------------------------
-// initialization
-// ------------------------------------------------------------------------
- wxColour();
+ wxColour() { Init(); }
+
// from RGB
wxColour( unsigned char red, unsigned char green, unsigned char blue )
: m_cocoaNSColor(NULL)
// from RGB
wxColour( unsigned char red, unsigned char green, unsigned char blue )
: m_cocoaNSColor(NULL)
@@
-34,26
+31,27
@@
public:
: m_cocoaNSColor(NULL)
{ Set(colRGB); }
: m_cocoaNSColor(NULL)
{ Set(colRGB); }
+ // initialization using existing NSColor
+ wxColour( WX_NSColor aColor );
+
// implicit conversion from the colour name
wxColour( const wxString &colourName )
// implicit conversion from the colour name
wxColour( const wxString &colourName )
- : m_cocoaNSColor(NULL)
{ InitFromName(colourName); }
wxColour( const char *colourName )
{ InitFromName(colourName); }
wxColour( const char *colourName )
- : m_cocoaNSColor(NULL)
{ InitFromName(wxString::FromAscii(colourName)); }
{ InitFromName(wxString::FromAscii(colourName)); }
+#if wxUSE_UNICODE
+ wxColour( const wxChar *colourName ) { InitFromName( wxString(colourName) ); }
+#endif
// 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 );
- ~wxColour();
+
virtual
~wxColour();
-// ------------------------------------------------------------------------
-// Implementation
-// ------------------------------------------------------------------------
// accessors
bool Ok() const { return m_cocoaNSColor; }
// accessors
bool Ok() const { return m_cocoaNSColor; }
-
inline
WX_NSColor GetNSColor() { return m_cocoaNSColor; }
+ WX_NSColor GetNSColor() { return m_cocoaNSColor; }
unsigned char Red() const { return m_red; }
unsigned char Green() const { return m_green; }
unsigned char Red() const { return m_red; }
unsigned char Green() const { return m_green; }
@@
-62,16
+60,15
@@
public:
// comparison
bool operator == (const wxColour& colour) const
{
// comparison
bool operator == (const wxColour& colour) const
{
+ // 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); }
-// const WXCOLORREF& GetPixel() const { return m_pixel; };
-
// Set() functions
void Set( unsigned char red, unsigned char green, unsigned char blue );
void Set( unsigned long colRGB )
// Set() functions
void Set( unsigned char red, unsigned char green, unsigned char blue );
void Set( unsigned long colRGB )
@@
-82,7
+79,13
@@
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
+ void Init();
+ // create the object from name, leaves it uninitialized if it failed
void InitFromName(const wxString& col);
private:
void InitFromName(const wxString& col);
private:
@@
-90,6
+93,8
@@
private:
unsigned char m_red;
unsigned char m_green;
unsigned char m_blue;
unsigned char m_red;
unsigned char m_green;
unsigned char m_blue;
+
+ DECLARE_DYNAMIC_CLASS(wxColour)
};
#endif // __WX_COCOA_COLOUR_H__
};
#endif // __WX_COCOA_COLOUR_H__