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

use wxColourDatabase::Find() instead of deprecated FindColour(); some minor code cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-10-18 23:20:13 +00:00
parent f9ebac93e7
commit f75aecd00f
2 changed files with 97 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
include/wx/msw/colour.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: colour.h // Name: wx/msw/colour.h
// Purpose: wxColour class // Purpose: wxColour class
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
@@ -13,82 +13,99 @@
#define _WX_COLOUR_H_ #define _WX_COLOUR_H_
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "colour.h" #pragma interface "colour.h"
#endif #endif
#include "wx/object.h" #include "wx/object.h"
// ----------------------------------------------------------------------------
// Colour // Colour
class WXDLLEXPORT wxColour: public wxObject // ----------------------------------------------------------------------------
class WXDLLEXPORT wxColour : public wxObject
{ {
public: public:
// ctors // constructors
// ------------
// default // default
wxColour(); wxColour() { Init(); }
// from RGB
wxColour( unsigned char red, unsigned char green, unsigned char blue ); // from separate RGB
wxColour( unsigned long colRGB ) { Set(colRGB); } wxColour( unsigned char red, unsigned char green, unsigned char blue )
{ Set(red, green, blue); }
// from packed RGB
wxColour( unsigned long colRGB ) { Set(colRGB); }
// implicit conversion from the colour name // implicit conversion from the colour name
wxColour( const wxString &colourName ) { InitFromName(colourName); } wxColour(const wxString &colourName) { InitFromName(colourName); }
wxColour( const wxChar *colourName ) { InitFromName(colourName); } wxColour(const wxChar *colourName) { InitFromName(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);
// dtor // dtor
~wxColour(); ~wxColour();
// to have the matching Create also for this class
void Create( unsigned char red, unsigned char green, unsigned char blue )
{ Set( red , green , blue ) ; }
// Set() functions // other methods
void Set( unsigned char red, unsigned char green, unsigned char blue ); // -------------
void Set(unsigned long colRGB)
{
// we don't need to know sizeof(long) here because we assume that the three
// least significant bytes contain the R, G and B values
Set((unsigned char)colRGB,
(unsigned char)(colRGB >> 8),
(unsigned char)(colRGB >> 16));
}
// accessors // to have the matching Create also for this class
bool Ok() const {return m_isInit; } void Create( unsigned char red, unsigned char green, unsigned char blue )
{ Set(red, green, blue); }
unsigned char Red() const { return m_red; } // Set() functions
unsigned char Green() const { return m_green; } void Set(unsigned char red, unsigned char green, unsigned char blue);
unsigned char Blue() const { return m_blue; } void Set(unsigned long colRGB)
{
// we don't need to know sizeof(long) here because we assume that the three
// least significant bytes contain the R, G and B values
Set((unsigned char)colRGB,
(unsigned char)(colRGB >> 8),
(unsigned char)(colRGB >> 16));
}
// comparison // accessors
bool operator==(const wxColour& colour) const // ---------
{
return m_isInit == colour.m_isInit &&
m_red == colour.m_red &&
m_green == colour.m_green &&
m_blue == colour.m_blue;
}
bool operator != (const wxColour& colour) const { return !(*this == colour); } bool Ok() const {return m_isInit; }
WXCOLORREF GetPixel() const { return m_pixel; }; unsigned char Red() const { return m_red; }
unsigned char Green() const { return m_green; }
unsigned char Blue() const { return m_blue; }
// comparison
bool operator==(const wxColour& colour) const
{
return m_isInit == colour.m_isInit &&
m_red == colour.m_red &&
m_green == colour.m_green &&
m_blue == colour.m_blue;
}
bool operator != (const wxColour& colour) const { return !(*this == colour); }
WXCOLORREF GetPixel() const { return m_pixel; };
public: public:
WXCOLORREF m_pixel; WXCOLORREF m_pixel;
private: private:
bool m_isInit; bool m_isInit;
unsigned char m_red; unsigned char m_red;
unsigned char m_blue; unsigned char m_blue;
unsigned char m_green; unsigned char m_green;
// helper func // ctors helpers
void InitFromName(const wxString& colourName); void Init();
void InitFromName(const wxString& colourName);
private: private:
DECLARE_DYNAMIC_CLASS(wxColour) DECLARE_DYNAMIC_CLASS(wxColour)
}; };
#endif #endif

76
src/msw/colour.cpp
View File

@@ -70,59 +70,44 @@ IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
// Colour // Colour
wxColour::wxColour () void wxColour::Init()
{ {
m_isInit = FALSE; m_isInit = FALSE;
m_pixel = 0; m_pixel = 0;
m_red = m_blue = m_green = 0; m_red =
} m_blue =
m_green = 0;
wxColour::wxColour (unsigned char r, unsigned char g, unsigned char b)
{
m_red = r;
m_green = g;
m_blue = b;
m_isInit = TRUE;
m_pixel = PALETTERGB (m_red, m_green, m_blue);
} }
wxColour::wxColour (const wxColour& col) wxColour::wxColour (const wxColour& col)
{ {
m_red = col.m_red; *this = col;
m_green = col.m_green;
m_blue = col.m_blue;
m_isInit = col.m_isInit;
m_pixel = col.m_pixel;
} }
wxColour& wxColour::operator =(const wxColour& col) wxColour& wxColour::operator=(const wxColour& col)
{ {
m_red = col.m_red; m_red = col.m_red;
m_green = col.m_green; m_green = col.m_green;
m_blue = col.m_blue; m_blue = col.m_blue;
m_isInit = col.m_isInit; m_isInit = col.m_isInit;
m_pixel = col.m_pixel; m_pixel = col.m_pixel;
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)
{ {
m_red = the_colour->Red (); wxColour col = wxTheColourDatabase->Find(name);
m_green = the_colour->Green (); if ( col.Ok() )
m_blue = the_colour->Blue (); {
m_isInit = TRUE; *this = col;
return;
}
} }
else
{ // leave invalid
m_red = 0; Init();
m_green = 0;
m_blue = 0;
m_isInit = FALSE;
}
m_pixel = PALETTERGB (m_red, m_green, m_blue);
} }
wxColour::~wxColour() wxColour::~wxColour()
@@ -131,9 +116,10 @@ wxColour::~wxColour()
void wxColour::Set (unsigned char r, unsigned char g, unsigned char b) void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
{ {
m_red = r; m_red = r;
m_green = g; m_green = g;
m_blue = b; m_blue = b;
m_isInit = TRUE; m_isInit = TRUE;
m_pixel = PALETTERGB (m_red, m_green, m_blue); m_pixel = PALETTERGB (m_red, m_green, m_blue);
} }