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

[ 1473731 ] 'wxColourBase and wxString <-> wxColour implementation' with minor modifications and rebaked build files.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-04-24 14:52:23 +00:00
parent cab0703813
commit 40989e46b8
41 changed files with 745 additions and 899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
include/wx/os2/colour.h
View File

@@ -15,24 +15,15 @@
#include "wx/object.h"
// Colour
class WXDLLEXPORT wxColour: public wxObject
class WXDLLEXPORT wxColour: public wxColourBase
{
public:
// constructors
// ------------
// default
wxColour();
// from separate RGB
wxColour( unsigned char cRed, unsigned char cGreen, unsigned char cBlue );
// from packed RGB
wxColour( unsigned long colRGB ) { Set(colRGB); }
// Implicit conversion from the colour name
wxColour(const wxString& rColourName) { InitFromName(rColourName); }
wxColour(const wxChar *zColourName) { InitFromName(zColourName); }
wxColour() { Init(); }
DEFINE_STD_WXCOLOUR_CONSTRUCTORS
// Copy ctors and assignment operators
wxColour(const wxColour& rCol);
@@ -42,22 +33,6 @@ public:
// Dtor
~wxColour();
// Set functions
void Set( unsigned char cRed, unsigned char cGreen, unsigned char cBlue);
void Set( unsigned long lColRGB)
{
// 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)lColRGB
,(unsigned char)(lColRGB >> 8)
,(unsigned char)(lColRGB >> 16)
);
}
void Set(const wxString& rsColour)
{
InitFromName(rsColour);
}
// Accessors
bool Ok(void) const {return m_bIsInit; }
@@ -79,17 +54,18 @@ public:
WXCOLORREF GetPixel(void) const { return m_vPixel; };
void InitFromName(const wxString& rCol);
private:
// Helper function
void Init();
bool m_bIsInit;
unsigned char m_cRed;
unsigned char m_cBlue;
unsigned char m_cGreen;
bool m_bIsInit;
unsigned char m_cRed;
unsigned char m_cBlue;
unsigned char m_cGreen;
virtual void InitWith( unsigned char cRed, unsigned char cGreen, unsigned char cBlue);
public:
WXCOLORREF m_vPixel ;