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

use wxColourDatabase::Find(), not obsolete FindColour(), in wxColour::InitFromName()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-01-22 12:16:04 +00:00
parent e9cece45b9
commit 211436b6f4
2 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/wx/cocoa/colour.h
View File

@@ -21,11 +21,8 @@
class WXDLLEXPORT wxColour: public wxObject class WXDLLEXPORT wxColour: public wxObject
{ {
public: public:
DECLARE_DYNAMIC_CLASS(wxColour) wxColour() { Init(); }
// ------------------------------------------------------------------------
// initialization
// ------------------------------------------------------------------------
wxColour();
// from RGB // from RGB
wxColour( unsigned char red, unsigned char green, unsigned char blue ) wxColour( unsigned char red, unsigned char green, unsigned char blue )
: m_cocoaNSColor(NULL) : m_cocoaNSColor(NULL)
@@ -36,24 +33,19 @@ public:
// implicit conversion from the colour name // implicit conversion from the colour name
wxColour( const wxString &colourName ) wxColour( const wxString &colourName )
: m_cocoaNSColor(NULL)
{ InitFromName(colourName); } { InitFromName(colourName); }
wxColour( const char *colourName ) wxColour( const char *colourName )
: m_cocoaNSColor(NULL)
{ InitFromName(wxString::FromAscii(colourName)); } { InitFromName(wxString::FromAscii(colourName)); }
// copy ctors and assignment operators // copy ctors and assignment operators
wxColour( const wxColour& col ); wxColour( const wxColour& col );
wxColour& operator = ( const wxColour& col ); wxColour& operator = ( const wxColour& col );
~wxColour(); virtual ~wxColour();
// ------------------------------------------------------------------------
// Implementation
// ------------------------------------------------------------------------
// accessors // accessors
bool Ok() const { return m_cocoaNSColor; } 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 Red() const { return m_red; }
unsigned char Green() const { return m_green; } unsigned char Green() const { return m_green; }
@@ -62,6 +54,7 @@ public:
// comparison // comparison
bool operator == (const wxColour& colour) const bool operator == (const wxColour& colour) const
{ {
// VZ: sure we want to compare NSColor objects for equality here?
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
@@ -70,8 +63,6 @@ public:
bool operator != (const wxColour& colour) const bool operator != (const wxColour& colour) const
{ return !(*this == colour); } { return !(*this == colour); }
// const WXCOLORREF& GetPixel() const { return m_pixel; };
// Set() functions // Set() functions
void Set( unsigned char red, unsigned char green, unsigned char blue ); void Set( unsigned char red, unsigned char green, unsigned char blue );
void Set( unsigned long colRGB ) void Set( unsigned long colRGB )
@@ -83,6 +74,11 @@ public:
(unsigned char)(colRGB >> 16)); (unsigned char)(colRGB >> 16));
} }
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); void InitFromName(const wxString& col);
private: private:
@@ -90,6 +86,8 @@ private:
unsigned char m_red; unsigned char m_red;
unsigned char m_green; unsigned char m_green;
unsigned char m_blue; unsigned char m_blue;
DECLARE_DYNAMIC_CLASS(wxColour)
}; };
#endif // __WX_COCOA_COLOUR_H__ #endif // __WX_COCOA_COLOUR_H__

31
src/cocoa/colour.mm
View File

@@ -22,10 +22,12 @@
IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
wxColour::wxColour () void wxColour::Init()
: m_cocoaNSColor(NULL)
{ {
m_red = m_blue = m_green = 0; m_cocoaNSColor = NULL;
m_red =
m_blue =
m_green = 0;
} }
wxColour::wxColour (const wxColour& col) wxColour::wxColour (const wxColour& col)
@@ -47,21 +49,20 @@ wxColour& wxColour::operator =(const wxColour& col)
return *this; return *this;
} }
void wxColour::InitFromName(const wxString& col) void wxColour::InitFromName(const wxString& name)
{ {
wxColour *the_colour = wxTheColourDatabase->FindColour (col); if ( wxTheColourDatabase )
if (the_colour)
{ {
*this = *the_colour; wxColour col = wxTheColourDatabase->Find(name);
} if ( col.Ok() )
else {
{ *this = col;
[m_cocoaNSColor release]; return;
m_cocoaNSColor = NULL; }
m_red = 0;
m_green = 0;
m_blue = 0;
} }
// leave invalid
Init();
} }
wxColour::~wxColour () wxColour::~wxColour ()