- make it possible to use wxRTTI macros with namespaces (Benjamin I. Williams)
- wxColourDatabase API now uses objects instead of pointers
- added resolution option to JPEG image handler (Jeff Burton)
+- added wxCalendarEvent::SetDate, wxCalendarEvent::SetWeekDay
wxMSW:
- fix for crash when using user-dashed lines (Chris Borgolte)
- fixed wxChoice::Delete() in presence of client data
- allow calling wxWindow::SetFont if window not yet created
+- use same average character width as other ports when calculating dialog units
+
+wxMac:
+
+- use same average character width as other ports when calculating dialog units
wxHTML:
wxColour( unsigned long colRGB )
: m_cocoaNSColor(NULL)
{ Set(colRGB); }
-
+
// implicit conversion from the colour name
wxColour( const wxString &colourName )
: m_cocoaNSColor(NULL)
// comparison
bool operator == (const wxColour& colour) const
{
- return (m_cocoaNSColor == colour.m_cocoaNSColor &&
- m_red == colour.m_red &&
- m_green == colour.m_green &&
- m_blue == colour.m_blue);
+ return (m_cocoaNSColor == colour.m_cocoaNSColor
+ && m_red == colour.m_red
+ && m_green == colour.m_green
+ && m_blue == colour.m_blue);
}
bool operator != (const wxColour& colour) const
{ return !(*this == colour); }
(unsigned char)(colRGB >> 16));
}
-protected:
void InitFromName(const wxString& col);
private:
{
public:
wxColour() { }
-
+
// Construct from RGB
wxColour( unsigned char red, unsigned char green, unsigned char blue );
wxColour( unsigned long colRGB ) { Set(colRGB); }
~wxColour();
bool Ok() const { return m_refData != NULL; }
-
+
bool operator == ( const wxColour& col ) const;
bool operator != ( const wxColour& col ) const { return !(*this == col); }
int GetPixel() const;
GdkColor *GetColor() const;
+ void InitFromName(const wxString& colourName);
+
protected:
// ref counting code
virtual wxObjectRefData *CreateRefData() const;
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
-
- // Helper functions
- void InitFromName(const wxString& colourName);
+
private:
DECLARE_DYNAMIC_CLASS(wxColour)
{
public:
wxColour() { }
-
+
// Construct from RGB
wxColour( unsigned char red, unsigned char green, unsigned char blue );
wxColour( unsigned long colRGB ) { Set(colRGB); }
~wxColour();
bool Ok() const { return m_refData != NULL; }
-
+
bool operator == ( const wxColour& col ) const;
bool operator != ( const wxColour& col ) const { return !(*this == col); }
int GetPixel() const;
GdkColor *GetColor() const;
+ void InitFromName(const wxString& colourName);
+
protected:
// ref counting code
virtual wxObjectRefData *CreateRefData() const;
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
-
- // Helper functions
- void InitFromName(const wxString& colourName);
+
private:
DECLARE_DYNAMIC_CLASS(wxColour)
{ Set(red, green, blue); }
wxColour( unsigned long colRGB )
{ Set(colRGB); }
-
+
// implicit conversion from the colour name
wxColour( const wxString &colourName )
{ InitFromName(colourName); }
// 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);
+ 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); }
- void InitFromName(const wxString& col);
-
const WXCOLORREF& GetPixel() const { return m_pixel; };
+ void InitFromName(const wxString& col);
+
+protected :
+
+ // Helper function
+ void Init();
+
private:
bool m_isInit;
unsigned char m_red;
unsigned char m_blue;
unsigned char m_green;
- void Init();
-
public:
WXCOLORREF m_pixel ;
void Set( const WXCOLORREF* color ) ;
}
bool operator != (const wxColour& colour) const { return !(*this == colour); }
+ void InitFromName(const wxString& colourName);
+
+protected:
+
+ // Helper function
+ void Init();
+
private:
bool m_isInit;
unsigned char m_red;
unsigned char m_blue;
unsigned char m_green;
- // ctors helpers
- void Init();
- void InitFromName(const wxString& colourName);
-
private:
DECLARE_DYNAMIC_CLASS(wxColour)
};
wxColour( unsigned char red, unsigned char green, unsigned char blue )
{ Set(red, green, blue); }
wxColour( unsigned long colRGB ) { Set(colRGB); }
-
+
// implicit conversion from the colour name
wxColour( const wxString &colourName ) { InitFromName(colourName); }
wxColour( const char *colourName ) { InitFromName(colourName); }
-
+
// copy ctors and assignment operators
wxColour( const wxColour& col );
wxColour& operator = ( const wxColour& col );
-
+
// dtor
~wxColour();
-
+
// Set() functions
void Set( unsigned char red, unsigned char green, unsigned char blue );
void Set( unsigned long colRGB )
(unsigned char)(colRGB >> 8),
(unsigned char)(colRGB >> 16));
}
-
+
// accessors
bool Ok() const {return m_isInit; }
unsigned char Red() const { return m_red; }
unsigned char Green() const { return m_green; }
unsigned char Blue() const { return m_blue; }
-
+
int GetPixel() const { return m_pixel; };
- void SetPixel(int pixel) { m_pixel = pixel; m_isInit = TRUE; };
-
+ void SetPixel(int pixel) { m_pixel = pixel; m_isInit = true; };
+
inline bool operator == (const wxColour& colour) const { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); }
-
+
inline bool operator != (const wxColour& colour) const { return (!(m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue)); }
// Get colour from name or wxNullColour
static wxColour CreateByName(const wxString& name);
// Allocate a colour, or nearest colour, using the given display.
- // If realloc is TRUE, ignore the existing pixel, otherwise just return
+ // If realloc is true, ignore the existing pixel, otherwise just return
// the existing one.
// Returns the allocated pixel.
-
+
// TODO: can this handle mono displays? If not, we should have an extra
// flag to specify whether this should be black or white by default.
-
- int AllocColour(WXDisplay* display, bool realloc = FALSE);
-
+
+ int AllocColour(WXDisplay* display, bool realloc = false);
+
void InitFromName(const wxString& col);
-
+
+protected:
+ // Helper function
+ void Init();
+
private:
bool m_isInit;
unsigned char m_red;
unsigned char m_blue;
unsigned char m_green;
-
+
public:
int m_pixel;
};
// other methods
// -------------
- // to have the matching Create also for this class
+ // 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(red, green, blue); }
// Set() functions
void Set(unsigned char red, unsigned char green, unsigned char blue);
// 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));
+ (unsigned char)(colRGB >> 8),
+ (unsigned char)(colRGB >> 16));
}
// accessors
// ---------
- bool Ok() const {return m_isInit; }
+ bool Ok() const { return m_isInit; }
unsigned char Red() const { return m_red; }
unsigned char Green() const { return m_green; }
// 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;
+ 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; };
+ void InitFromName(const wxString& colourName);
+
public:
WXCOLORREF m_pixel;
+protected:
+ // Helper function
+ void Init();
+
private:
bool m_isInit;
unsigned char m_red;
unsigned char m_blue;
unsigned char m_green;
- // ctors helpers
- void Init();
- void InitFromName(const wxString& colourName);
-
private:
DECLARE_DYNAMIC_CLASS(wxColour)
};
// Implicit conversion from the colour name
//
wxColour(const wxString& rColourName) { InitFromName(rColourName); }
- wxColour(const char* zColourName) { InitFromName(zColourName); }
+ wxColour(const wxChar *zColourName) { InitFromName(zColourName); }
//
// Copy ctors and assignment operators
//
bool operator == (const wxColour& rColour) const
{
- return (m_cRed == rColour.m_cRed &&
- m_cGreen == rColour.m_cGreen &&
- m_cBlue == rColour.m_cBlue
+ return (m_isInit == rColour.m_isInit
+ && m_cRed == rColour.m_cRed
+ && m_cGreen == rColour.m_cGreen
+ && m_cBlue == rColour.m_cBlue
);
}
+
bool operator != (const wxColour& rColour) const { return !(*this == rColour); }
- void InitFromName(const wxString& rCol);
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;
// wxColour
//-----------------------------------------------------------------------------
-class wxColour: public wxGDIObject
+class WXDLLEXPORT wxColour: public wxGDIObject
{
public:
wxColour() { }
-
+
// Construct from RGB
wxColour( unsigned char red, unsigned char green, unsigned char blue );
wxColour( unsigned long colRGB ) { Set(colRGB); }
~wxColour();
bool Ok() const { return m_refData != NULL; }
-
+
bool operator == ( const wxColour& col ) const;
bool operator != ( const wxColour& col ) const { return !(*this == col); }
unsigned char Blue() const;
// Implementation part
-
+
void CalcPixel( WXColormap cmap );
unsigned long GetPixel() const;
WXColor *GetColor() const;
+ void InitFromName(const wxString& colourName);
+
protected:
// ref counting code
virtual wxObjectRefData *CreateRefData() const;
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
-
- // Helper functions
- void InitFromName(const wxString& colourName);
+
private:
DECLARE_DYNAMIC_CLASS(wxColour)
{wxT("WHEAT"), 216, 216, 191},
{wxT("WHITE"), 255, 255, 255},
{wxT("YELLOW"), 255, 255, 0},
- {wxT("YELLOW GREEN"), 153, 204, 50},
+ {wxT("YELLOW GREEN"), 153, 204, 50}
};
size_t n;
m_color.blue = 0;
m_color.pixel = 0;
m_colormap = (GdkColormap *) NULL;
- m_hasPixel = FALSE;
+ m_hasPixel = false;
}
wxColourRefData(const wxColourRefData& data)
bool wxColour::operator == ( const wxColour& col ) const
{
if (m_refData == col.m_refData)
- return TRUE;
+ return true;
if (!m_refData || !col.m_refData)
- return FALSE;
+ return false;
GdkColor *own = &(((wxColourRefData*)m_refData)->m_color);
GdkColor *other = &(((wxColourRefData*)col.m_refData)->m_color);
M_COLDATA->m_color.pixel = 0;
M_COLDATA->m_colormap = (GdkColormap*) NULL;
- M_COLDATA->m_hasPixel = FALSE;
+ M_COLDATA->m_hasPixel = false;
}
unsigned char wxColour::Red() const
m_color.blue = 0;
m_color.pixel = 0;
m_colormap = (GdkColormap *) NULL;
- m_hasPixel = FALSE;
+ m_hasPixel = false;
}
wxColourRefData(const wxColourRefData& data)
bool wxColour::operator == ( const wxColour& col ) const
{
if (m_refData == col.m_refData)
- return TRUE;
+ return true;
if (!m_refData || !col.m_refData)
- return FALSE;
+ return false;
GdkColor *own = &(((wxColourRefData*)m_refData)->m_color);
GdkColor *other = &(((wxColourRefData*)col.m_refData)->m_color);
M_COLDATA->m_color.pixel = 0;
M_COLDATA->m_colormap = (GdkColormap*) NULL;
- M_COLDATA->m_hasPixel = FALSE;
+ M_COLDATA->m_hasPixel = false;
}
unsigned char wxColour::Red() const
#include "wx/mac/private.h"
static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green ) ;
-static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green )
+static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green )
{
RGBColor* col = (RGBColor*) color ;
col->red = (red << 8) + red;
void wxColour::Init()
{
- m_isInit = FALSE;
+ m_isInit = false;
m_red =
m_blue =
m_green = 0;
-
+
wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
}
m_green = col.m_green;
m_blue = col.m_blue;
m_isInit = col.m_isInit;
-
+
memcpy( &m_pixel , &col.m_pixel , 6 ) ;
-
+
return *this;
}
void wxColour::InitFromName(const wxString& name)
{
- wxColour col = wxTheColourDatabase->Find(name);
- if ( col.Ok() )
+ if ( wxTheColourDatabase )
{
- *this = col;
- }
- else
- {
- Init();
+ wxColour col = wxTheColourDatabase->Find(name);
+ if ( col.Ok() )
+ {
+ *this = col;
+ return;
+ }
}
+
+ // leave invalid
+ Init();
}
wxColour::~wxColour ()
m_red = r;
m_green = g;
m_blue = b;
- m_isInit = TRUE;
+ m_isInit = true;
wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
}
void wxColour::Set( const WXCOLORREF* color )
-{
+{
RGBColor* col = (RGBColor*) color ;
memcpy( &m_pixel , color , 6 ) ;
m_red = col->red>>8 ;
#include "wx/mac/private.h"
static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green ) ;
-static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green )
+static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green )
{
RGBColor* col = (RGBColor*) color ;
col->red = (red << 8) + red;
void wxColour::Init()
{
- m_isInit = FALSE;
+ m_isInit = false;
m_red =
m_blue =
m_green = 0;
-
+
wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
}
m_green = col.m_green;
m_blue = col.m_blue;
m_isInit = col.m_isInit;
-
+
memcpy( &m_pixel , &col.m_pixel , 6 ) ;
-
+
return *this;
}
void wxColour::InitFromName(const wxString& name)
{
- wxColour col = wxTheColourDatabase->Find(name);
- if ( col.Ok() )
+ if ( wxTheColourDatabase )
{
- *this = col;
- }
- else
- {
- Init();
+ wxColour col = wxTheColourDatabase->Find(name);
+ if ( col.Ok() )
+ {
+ *this = col;
+ return;
+ }
}
+
+ // leave invalid
+ Init();
}
wxColour::~wxColour ()
m_red = r;
m_green = g;
m_blue = b;
- m_isInit = TRUE;
+ m_isInit = true;
wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
}
void wxColour::Set( const WXCOLORREF* color )
-{
+{
RGBColor* col = (RGBColor*) color ;
memcpy( &m_pixel , color , 6 ) ;
m_red = col->red>>8 ;
m_red =
m_blue =
m_green = 0;
- m_isInit = FALSE;
+ m_isInit = false;
}
wxColour::wxColour(const wxColour& col)
void wxColour::InitFromName(const wxString& name)
{
- wxColour *col = wxTheColourDatabase->Find(name);
- if ( col.Ok() )
+ if ( wxTheColourDatabase )
{
- *this = col;
- }
- else
- {
- Init();
+ wxColour col = wxTheColourDatabase->Find(name);
+ if ( col.Ok() )
+ {
+ *this = col;
+ return;
+ }
}
+
+ // leave invalid
+ Init();
}
wxColour::~wxColour()
m_red = r;
m_green = g;
m_blue = b;
- m_isInit = TRUE;
+ m_isInit = true;
}
// Colour
-wxColour::wxColour ()
+void wxColour::Init()
{
- m_isInit = FALSE;
+ m_isInit = false;
m_red =
m_blue =
m_green = 0;
m_pixel = -1;
}
-wxColour::wxColour (const wxColour& col)
+wxColour::wxColour()
+{
+ Init();
+}
+
+wxColour::wxColour(const wxColour& col)
{
*this = col;
}
void wxColour::InitFromName(const wxString& name)
{
- *this = wxTheColourDatabase->Find(name);
+ if ( wxTheColourDatabase )
+ {
+ wxColour col = wxTheColourDatabase->Find(name);
+ if ( col.Ok() )
+ {
+ *this = col;
+ return;
+ }
+ }
+
+ // leave invalid
+ Init();
}
/* static */
return col;
}
-wxColour::~wxColour ()
+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_green = g;
m_blue = b;
- m_isInit = TRUE;
+ m_isInit = true;
m_pixel = -1;
}
// Allocate a colour, or nearest colour, using the given display.
-// If realloc is TRUE, ignore the existing pixel, otherwise just return
+// If realloc is true, ignore the existing pixel, otherwise just return
// the existing one.
// Returns the old or allocated pixel.
{
if ((m_pixel != -1) && !realloc)
return m_pixel;
-
+
XColor color;
color.red = (unsigned short) Red ();
color.red |= color.red << 8;
color.green |= color.green << 8;
color.blue = (unsigned short) Blue ();
color.blue |= color.blue << 8;
-
+
color.flags = DoRed | DoGreen | DoBlue;
-
+
WXColormap cmap = wxTheApp->GetMainColormap(display);
-
+
if (!XAllocColor ((Display*) display, (Colormap) cmap, &color))
{
m_pixel = wxGetBestMatchingPixel((Display*) display, &color,(Colormap) cmap);
{
if (cmap == (Colormap) NULL)
cmap = (Colormap) wxTheApp->GetMainColormap(display);
-
+
int numPixVals = XDisplayCells(display, DefaultScreen (display));
int mindist = 256 * 256 * 3;
int bestpixel = (int) BlackPixel (display, DefaultScreen (display));
int green = desiredColor->green >> 8;
int blue = desiredColor->blue >> 8;
const int threshold = 2 * 2 * 3; // allow an error of up to 2 in R,G & B
-
+
for (int pixelcount = 0; pixelcount < numPixVals; pixelcount++)
{
XColor matching_color;
matching_color.pixel = pixelcount;
XQueryColor(display,cmap,&matching_color);
-
+
int delta_red = red - (matching_color.red >> 8);
int delta_green = green - (matching_color.green >> 8);
int delta_blue = blue - (matching_color.blue >> 8);
-
+
int dist = delta_red * delta_red +
delta_green * delta_green +
delta_blue * delta_blue;
-
+
if (dist <= threshold)
{
// try to allocate a read-only colour...
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
template<> void wxStringReadValue(const wxString &s , wxColour &data )
{
- // copied from VS xrc
- unsigned long tmp = 0;
+ // copied from VS xrc
+ unsigned long tmp = 0;
- if (s.Length() != 7 || s[0u] != wxT('#') ||
- wxSscanf(s.c_str(), wxT("#%lX"), &tmp) != 1)
+ if (s.Length() != 7 || s[0u] != wxT('#')
+ || wxSscanf(s.c_str(), wxT("#%lX"), &tmp) != 1)
{
- wxLogError(_("String To Colour : Incorrect colour specification : %s"),
- s.c_str() );
+ wxLogError(_("String To Colour : Incorrect colour specification : %s"),
+ s.c_str() );
data = wxNullColour;
}
- else
- {
- data = wxColour((unsigned char) ((tmp & 0xFF0000) >> 16) ,
- (unsigned char) ((tmp & 0x00FF00) >> 8),
- (unsigned char) ((tmp & 0x0000FF)));
- }
+ else
+ {
+ data = wxColour((unsigned char) ((tmp & 0xFF0000) >> 16) ,
+ (unsigned char) ((tmp & 0x00FF00) >> 8),
+ (unsigned char) ((tmp & 0x0000FF)));
+ }
}
template<> void wxStringWriteValue(wxString &s , const wxColour &data )
{
- s = wxString::Format(wxT("#%02X%02X%02X"), data.Red() , data.Green() , data.Blue() ) ;
+ s = wxString::Format(wxT("#%02X%02X%02X"),
+ data.Red(), data.Green(), data.Blue() );
}
-IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( wxColour , wxObject , "wx/colour.h" , &wxToStringConverter<wxColour> , &wxFromStringConverter<wxColour>)
+IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( wxColour , wxObject , "wx/colour.h" , &wxToStringConverter<wxColour> , &wxFromStringConverter<wxColour>)
wxBEGIN_PROPERTIES_TABLE(wxColour)
- wxREADONLY_PROPERTY( Red, unsigned char , Red , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxREADONLY_PROPERTY( Green, unsigned char , Green , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxREADONLY_PROPERTY( Blue, unsigned char , Blue , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxREADONLY_PROPERTY( Red, unsigned char, Red, , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
+ wxREADONLY_PROPERTY( Green, unsigned char, Green, , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
+ wxREADONLY_PROPERTY( Blue, unsigned char, Blue, , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
wxEND_PROPERTIES_TABLE()
-wxCONSTRUCTOR_3( wxColour , unsigned char , Red , unsigned char , Green , unsigned char , Blue )
+wxCONSTRUCTOR_3( wxColour, unsigned char, Red, unsigned char, Green, unsigned char, Blue )
wxBEGIN_HANDLERS_TABLE(wxColour)
wxEND_HANDLERS_TABLE()
void wxColour::Init()
{
- m_isInit = FALSE;
+ m_isInit = false;
m_pixel = 0;
m_red =
m_blue =
m_green = 0;
}
-wxColour::wxColour (const wxColour& col)
+wxColour::wxColour(const wxColour& col)
{
*this = col;
}
{
}
-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_green = g;
m_blue = b;
- m_isInit = TRUE;
- m_pixel = PALETTERGB (m_red, m_green, m_blue);
+ m_isInit = true;
+ m_pixel = PALETTERGB(m_red, m_green, m_blue);
}
// Colour
-wxColour::wxColour ()
+void wxColour::Init()
{
- m_bIsInit = FALSE;
+ m_bIsInit = false;
m_vPixel = 0;
m_cRed = m_cBlue = m_cGreen = 0;
+} // end of wxColour::Init
+
+wxColour::wxColour ()
+{
+ Init();
} // end of wxColour::wxColour
wxColour::wxColour (
, unsigned char cBlue
)
{
- m_cRed = cRed;
- m_cGreen = cGreen;
- m_cBlue = cBlue;
- m_bIsInit = TRUE;
- m_vPixel = OS2RGB (m_cRed, m_cGreen, m_cBlue);
+ Set(cRed, cGreen, cBlue);
} // end of wxColour::wxColour
-wxColour::wxColour (
+wxColour::wxColour(
const wxColour& rCol
)
{
- m_cRed = rCol.m_cRed;
- m_cGreen = rCol.m_cGreen;
- m_cBlue = rCol.m_cBlue;
- m_bIsInit = rCol.m_bIsInit;
- m_vPixel = rCol.m_vPixel;
+ *this = col;
} // end of wxColour::wxColour
wxColour& wxColour::operator =(
const wxString& sCol
)
{
- wxColour* pTheColour = wxTheColourDatabase->FindColour(sCol);
-
- if (pTheColour)
+ if ( wxTheColourDatabase )
{
- m_cRed = pTheColour->Red();
- m_cGreen = pTheColour->Green();
- m_cBlue = pTheColour->Blue();
- m_bIsInit = TRUE;
+ wxColour col = wxTheColourDatabase->Find(sCol);
+ if ( col.Ok() )
+ {
+ *this = col;
+ return;
+ }
}
- else
- {
- m_cRed = 0;
- m_cGreen = 0;
- m_cBlue = 0;
- m_bIsInit = FALSE;
- }
- m_vPixel = OS2RGB (m_cRed, m_cGreen, m_cBlue);
+
+ // leave invalid
+ Init();
+
} // end of wxColour::InitFromName
-wxColour::~wxColour ()
+wxColour::~wxColour()
{
} // end of wxColour::~wxColour
-void wxColour::Set (
+void wxColour::Set(
unsigned char cRed
, unsigned char cGreen
, unsigned char cBlue
m_cRed = cRed;
m_cGreen = cGreen;
m_cBlue = cBlue;
- m_bIsInit = TRUE;
+ m_bIsInit = true;
m_vPixel = OS2RGB (m_cRed, m_cGreen, m_cBlue);
} // end of wxColour::Set
void wxDC::ClearCache()
{
- m_svBitmapCache.DeleteContents(TRUE);
+ m_svBitmapCache.DeleteContents(true);
m_svBitmapCache.Clear();
- m_svBitmapCache.DeleteContents(FALSE);
- m_svDCCache.DeleteContents(TRUE);
+ m_svBitmapCache.DeleteContents(false);
+ m_svDCCache.DeleteContents(true);
m_svDCCache.Clear();
- m_svDCCache.DeleteContents(FALSE);
+ m_svDCCache.DeleteContents(false);
} // end of wxDC::ClearCache
// Clean up cache at app exit
class wxDCModule : public wxModule
{
public:
- virtual bool OnInit() { return TRUE; }
+ virtual bool OnInit() { return true; }
virtual void OnExit() { wxDC::ClearCache(); }
private:
wxDC::wxDC(void)
{
- wxColour vColor;
-
m_pCanvas = NULL;
m_hOldBitmap = 0;
m_hOldFont = 0;
m_hOldPalette = 0;
- m_bOwnsDC = FALSE;
+ m_bOwnsDC = false;
m_hDC = 0;
m_hOldPS = NULL;
m_hPS = NULL;
- m_bIsPaintTime = FALSE; // True at Paint Time
+ m_bIsPaintTime = false; // True at Paint Time
- vColor.InitFromName("BLACK");
+ wxColour vColor( wxT("BLACK") );
m_pen.SetColour(vColor);
- vColor.Set("WHITE");
+
+ vColor.Set( wxT("WHITE") );
m_brush.SetColour(vColor);
+
} // end of wxDC::wxDC
wxDC::~wxDC(void)
RECTL vRect;
vY = OS2Y(vY,vHeight);
- m_clipping = TRUE;
+ m_clipping = true;
vRect.xLeft = vX;
vRect.yTop = vY + vHeight;
vRect.xRight = vX + vWidth;
wxCHECK_RET(rRegion.GetHRGN(), wxT("invalid clipping region"));
HRGN hRgnOld;
- m_clipping = TRUE;
+ m_clipping = true;
::GpiSetClipRegion( m_hPS
,(HRGN)rRegion.GetHRGN()
,&hRgnOld
::GpiSetClipRegion(m_hPS, hRgn, &hRgnOld);
}
- m_clipping = FALSE;
+ m_clipping = false;
} // end of wxDC::DestroyClippingRegion
// ---------------------------------------------------------------------------
bool wxDC::CanDrawBitmap() const
{
- return TRUE;
+ return true;
}
bool wxDC::CanGetTextExtent() const
LONG lColor;
LONG lOptions;
LONG lHits;
- bool bSuccess = FALSE;
+ bool bSuccess = false;
vPtlPos.x = vX; // Loads x-coordinate
vPtlPos.y = OS2Y(vY,0); // Loads y-coordinate
lOptions = FF_SURFACE;
if ((lHits = ::GpiFloodFill(m_hPS, lOptions, lColor)) != GPI_ERROR)
- bSuccess = TRUE;
- return TRUE;
+ bSuccess = true;
+
+ return true;
} // end of wxDC::DoFloodFill
bool wxDC::DoGetPixel(
//
if (rIcon.IsXpm())
{
- DoDrawBitmap(rIcon.GetXpmSrc(), vX, vY, TRUE);
+ DoDrawBitmap(rIcon.GetXpmSrc(), vX, vY, true);
}
else
{
wxBitmap vBitmap(rIcon);
- DoDrawBitmap(vBitmap, vX, vY, FALSE);
+ DoDrawBitmap(vBitmap, vX, vY, false);
}
CalcBoundingBox(vX, vY);
CalcBoundingBox(vX + rIcon.GetWidth(), vY + rIcon.GetHeight());
return;
if (m_pCanvas)
{
- bool bCustomColours = TRUE;
+ bool bCustomColours = true;
//
// If we haven't specified wxUSER_COLOURS, don't allow the panel/dialog box to
//
if (m_pCanvas->IsKindOf(CLASSINFO(wxWindow)) &&
((m_pCanvas->GetWindowStyleFlag() & wxUSER_COLOURS) != wxUSER_COLOURS))
- bCustomColours = FALSE;
+ bCustomColours = false;
if (bCustomColours)
{
if (m_backgroundBrush.GetStyle()==wxTRANSPARENT)
{
- m_pCanvas->SetTransparent(TRUE);
+ m_pCanvas->SetTransparent(true);
}
else
{
// parent?
// m_canvas->SetBackgroundColour(m_backgroundBrush.GetColour());
//
- m_pCanvas->SetTransparent(FALSE);
+ m_pCanvas->SetTransparent(false);
}
}
}
const wxString& rsMessage
)
{
- // We might be previewing, so return TRUE to let it continue.
- return TRUE;
+ // We might be previewing, so return true to let it continue.
+ return true;
} // end of wxDC::StartDoc
void wxDC::EndDoc()
wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const
{
- // axis orientation is not taken into account for conversion of a distance
+ // axis orientation is not taken into account for conversion of a distance
return (wxCoord) ((x)/(m_logicalScaleX*m_userScaleX*m_scaleX));
}
wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const
{
- // axis orientation is not taken into account for conversion of a distance
+ // axis orientation is not taken into account for conversion of a distance
return (wxCoord) ((y)/(m_logicalScaleY*m_userScaleY*m_scaleY));
}
wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const
{
- // axis orientation is not taken into account for conversion of a distance
+ // axis orientation is not taken into account for conversion of a distance
return (wxCoord) (x*m_logicalScaleX*m_userScaleX*m_scaleX);
}
wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const
{
- // axis orientation is not taken into account for conversion of a distance
+ // axis orientation is not taken into account for conversion of a distance
return (wxCoord) (y*m_logicalScaleY*m_userScaleY*m_scaleY);
}
pMask = rBmp.GetMask();
if (!(rBmp.Ok() && pMask && pMask->GetMaskBitmap()))
{
- bUseMask = FALSE;
+ bUseMask = false;
}
}
case wxNOR: lRop = ROP_NOTSRCCOPY; break;
default:
wxFAIL_MSG( wxT("unsupported logical function") );
- return FALSE;
+ return false;
}
bool bSuccess;
vBmpHdr.cBitCount = 24;
#if wxUSE_DC_CACHEING
- if (TRUE)
+ if (true)
{
//
// create a temp buffer bitmap and DCs to access it and the mask
}
POINTL aPoint1[4] = { {0, 0}
- ,{vWidth, vHeight}
- ,{vXdest, vYdest}
- ,{vXdest + vWidth, vYdest + vHeight}
+ ,{vWidth, vHeight}
+ ,{vXdest, vYdest}
+ ,{vXdest + vWidth, vYdest + vHeight}
};
POINTL aPoint2[4] = { {0, 0}
- ,{vWidth, vHeight}
- ,{vXsrc, vYsrc}
- ,{vXsrc + vWidth, vYsrc + vHeight}
+ ,{vWidth, vHeight}
+ ,{vXsrc, vYsrc}
+ ,{vXsrc + vWidth, vYsrc + vHeight}
};
POINTL aPoint3[4] = { {vXdest, vYdest}
- ,{vXdest + vWidth, vYdest + vHeight}
- ,{vXsrc, vYsrc}
- ,{vXsrc + vWidth, vYsrc + vHeight}
+ ,{vXdest + vWidth, vYdest + vHeight}
+ ,{vXsrc, vYsrc}
+ ,{vXsrc + vWidth, vYsrc + vHeight}
};
POINTL aPoint4[4] = { {vXdest, vYdest}
- ,{vXdest + vWidth, vYdest + vHeight}
- ,{0, 0}
- ,{vWidth, vHeight}
+ ,{vXdest + vWidth, vYdest + vHeight}
+ ,{0, 0}
+ ,{vWidth, vHeight}
};
::GpiSetBitmap(hPSMask, (HBITMAP) pMask->GetMaskBitmap());
::GpiSetBitmap(hPSBuffer, (HBITMAP) hBufBitmap);
);
if (rc == GPI_ERROR)
{
- bSuccess = FALSE;
+ bSuccess = false;
wxLogLastError(wxT("BitBlt"));
}
::DevCloseDC(hDCBuffer);
::GpiDeleteBitmap(hBufBitmap);
#endif
- bSuccess = TRUE;
+ bSuccess = true;
}
else // no mask, just BitBlt() it
{
POINTL aPoint[4] = { {vXdest, vYdest}
- ,{vXdest + vWidth, vYdest + vHeight}
- ,{vXsrc, vYsrc}
- ,{vXsrc + vWidth, vYsrc + vHeight}
+ ,{vXdest + vWidth, vYdest + vHeight}
+ ,{vXsrc, vYsrc}
+ ,{vXsrc + vWidth, vYsrc + vHeight}
};
bSuccess = (::GpiBitBlt( m_hPS
void wxWindowDC::InitDC()
{
- wxColour vColor;
//
// The background mode is only used for text background and is set in
//
SetBackground(wxBrush(m_pCanvas->GetBackgroundColour(), wxSOLID));
- vColor.InitFromName("BLACK");
+ wxColour vColor( wxT("BLACK") );
m_pen.SetColour(vColor);
- vColor.Set("WHITE");
+
+ vColor.Set( wxT("WHITE") );
m_brush.SetColour(vColor);
InitializePalette();
wxFont* pFont = new wxFont( 12
)
{
ULONG lStyle = ES_READONLY | ES_MARGIN | ES_CENTER;
- wxColour vColor;
LONG lColor;
char zFont[128];
if (!m_hWnd)
wxLogError("Unable to create tooltip window");
- vColor.InitFromName("YELLOW");
+ wxColour vColor( wxT("YELLOW") );
lColor = (LONG)vColor.GetPixel();
::WinSetPresParam( m_hWnd
,PP_BACKGROUNDCOLOR
m_color.blue = 0;
m_color.pixel = 0;
m_colormap = (WXColormap *) NULL;
- m_hasPixel = FALSE;
+ m_hasPixel = false;
}
wxColourRefData(const wxColourRefData& data):
wxObjectRefData()
m_colormap = data.m_colormap;
m_hasPixel = data.m_hasPixel;
}
-
+
~wxColourRefData()
{
FreeColour();
m_color.blue == data.m_color.blue &&
m_color.pixel == data.m_color.pixel);
}
-
+
void FreeColour();
void AllocColour( WXColormap cmap );
static unsigned short colMapAllocCounter[ 256 ];
};
-unsigned short wxColourRefData::colMapAllocCounter[ 256 ] =
-{
+unsigned short wxColourRefData::colMapAllocCounter[ 256 ] =
+{
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
{
if (!m_colormap)
return;
-#if !wxUSE_NANOX
+#if !wxUSE_NANOX
if ((wxTheApp->m_visualInfo->m_visualType == GrayScale) ||
(wxTheApp->m_visualInfo->m_visualType == PseudoColor))
{
int idx = m_color.pixel;
colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] - 1;
-
+
if (colMapAllocCounter[ idx ] == 0)
{
unsigned long pixel = m_color.pixel;
{
m_hasPixel = XAllocColor( wxGlobalDisplay(), (Colormap) cmap, &m_color );
}
-
+
m_colormap = cmap;
}
M_COLDATA->m_color.red = ((unsigned short)red) ;
M_COLDATA->m_color.green = ((unsigned short)green) ;
M_COLDATA->m_color.blue = ((unsigned short)blue) ;
-#else
+#else
M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
bool wxColour::operator == ( const wxColour& col ) const
{
- if (m_refData == col.m_refData) return TRUE;
+ if (m_refData == col.m_refData) return true;
- if (!m_refData || !col.m_refData) return FALSE;
+ if (!m_refData || !col.m_refData) return false;
XColor *own = &(((wxColourRefData*)m_refData)->m_color);
XColor *other = &(((wxColourRefData*)col.m_refData)->m_color);
- if (own->red != other->red) return FALSE;
- if (own->blue != other->blue) return FALSE;
- if (own->green != other->green) return FALSE;
- return TRUE;
+ return (own->red == other->red)
+ && (own->green == other->green)
+ && (own->blue == other->blue)
+
}
wxObjectRefData *wxColour::CreateRefData() const
void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
{
AllocExclusive();
-
+
m_refData = new wxColourRefData();
#if wxUSE_NANOX
M_COLDATA->m_color.red = ((unsigned short)red) ;
projects / wxWidgets.git / commitdiff
