#include "wx/stubs/colour.h"
#endif
+#define wxColor wxColour
+
#endif
// _WX_COLOUR_H_BASE_
void AddPen(wxPen *pen);
void RemovePen(wxPen *pen);
wxPen *FindOrCreatePen(const wxColour& colour, int width, int style);
- wxPen *FindOrCreatePen(const wxString& colour, int width, int style);
};
class WXDLLEXPORT wxBrushList: public wxList
void AddBrush(wxBrush *brush);
void RemoveBrush(wxBrush *brush);
wxBrush *FindOrCreateBrush(const wxColour& colour, int style);
- wxBrush *FindOrCreateBrush(const wxString& colour, int style);
};
WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
wxBrush(void);
wxBrush( const wxColour &colour, int style );
- wxBrush( const wxString &colourName, int style );
wxBrush( const wxBitmap &stippleBitmap );
wxBrush( const wxBrush &brush );
wxBrush( const wxBrush *brush );
void SetColour( const wxColour& col );
- void SetColour( const wxString& col );
void SetColour( unsigned char r, unsigned char g, unsigned char b );
void SetStyle( int style );
void SetStipple( const wxBitmap& stipple );
class wxColour: public wxGDIObject
{
- public:
-
- wxColour();
- wxColour( char red, char green, char blue );
- wxColour( const wxString &colourName ) { InitFromName(colourName); }
-// wxColour( const char *colourName ) { InitFromName(colourName); }
- wxColour( const wxColour& col );
- wxColour( const wxColour* col );
- ~wxColour();
- wxColour& operator = ( const wxColour& col );
- wxColour& operator = ( const wxString& colourName );
- bool operator == ( const wxColour& col );
- bool operator != ( const wxColour& col );
- void Set( const unsigned char red, const unsigned char green, const unsigned char blue );
- unsigned char Red() const;
- unsigned char Green() const;
- unsigned char Blue() const;
- bool Ok() const;
-
- private:
- public:
-
- friend wxDC;
- friend wxPaintDC;
- friend wxBitmap;
- friend wxWindow;
-
- void CalcPixel( GdkColormap *cmap );
- int GetPixel() const;
- GdkColor *GetColor() const;
+public:
+ // ctors
+ // default
+ wxColour();
+ // from RGB
+ wxColour( char red, char green, char blue );
+ // 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( const wxColour* col );
+ wxColour& operator = ( const wxColour& col );
+
+ // dtor
+ ~wxColour();
+
+ // comparison
+ bool operator == ( const wxColour& col );
+ bool operator != ( const wxColour& col );
+
+ // accessors
+ void Set( unsigned char red, unsigned char green, unsigned char blue );
+ unsigned char Red() const;
+ unsigned char Green() const;
+ unsigned char Blue() const;
+ bool Ok() const;
+
+ // implementation
+ void CalcPixel( GdkColormap *cmap );
+ int GetPixel() const;
+ GdkColor *GetColor() const;
protected:
- // helper functions
- void InitFromName(const wxString& colourName);
+ // helper functions
+ void InitFromName(const wxString& colourName);
private:
- DECLARE_DYNAMIC_CLASS(wxColour)
+ DECLARE_DYNAMIC_CLASS(wxColour)
};
#endif // __GTKCOLOURH__
wxPen(void);
wxPen( const wxColour &colour, int width, int style );
- wxPen( const wxString &colourName, int width, int style );
wxPen( const wxPen& pen );
wxPen( const wxPen* pen );
~wxPen(void);
bool operator != ( const wxPen& pen );
void SetColour( const wxColour &colour );
- void SetColour( const wxString &colourName );
void SetColour( int red, int green, int blue );
void SetCap( int capStyle );
void SetJoin( int joinStyle );
wxBrush(void);
wxBrush( const wxColour &colour, int style );
- wxBrush( const wxString &colourName, int style );
wxBrush( const wxBitmap &stippleBitmap );
wxBrush( const wxBrush &brush );
wxBrush( const wxBrush *brush );
void SetColour( const wxColour& col );
- void SetColour( const wxString& col );
void SetColour( unsigned char r, unsigned char g, unsigned char b );
void SetStyle( int style );
void SetStipple( const wxBitmap& stipple );
class wxColour: public wxGDIObject
{
- public:
-
- wxColour();
- wxColour( char red, char green, char blue );
- wxColour( const wxString &colourName ) { InitFromName(colourName); }
-// wxColour( const char *colourName ) { InitFromName(colourName); }
- wxColour( const wxColour& col );
- wxColour( const wxColour* col );
- ~wxColour();
- wxColour& operator = ( const wxColour& col );
- wxColour& operator = ( const wxString& colourName );
- bool operator == ( const wxColour& col );
- bool operator != ( const wxColour& col );
- void Set( const unsigned char red, const unsigned char green, const unsigned char blue );
- unsigned char Red() const;
- unsigned char Green() const;
- unsigned char Blue() const;
- bool Ok() const;
-
- private:
- public:
-
- friend wxDC;
- friend wxPaintDC;
- friend wxBitmap;
- friend wxWindow;
-
- void CalcPixel( GdkColormap *cmap );
- int GetPixel() const;
- GdkColor *GetColor() const;
+public:
+ // ctors
+ // default
+ wxColour();
+ // from RGB
+ wxColour( char red, char green, char blue );
+ // 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( const wxColour* col );
+ wxColour& operator = ( const wxColour& col );
+
+ // dtor
+ ~wxColour();
+
+ // comparison
+ bool operator == ( const wxColour& col );
+ bool operator != ( const wxColour& col );
+
+ // accessors
+ void Set( unsigned char red, unsigned char green, unsigned char blue );
+ unsigned char Red() const;
+ unsigned char Green() const;
+ unsigned char Blue() const;
+ bool Ok() const;
+
+ // implementation
+ void CalcPixel( GdkColormap *cmap );
+ int GetPixel() const;
+ GdkColor *GetColor() const;
protected:
- // helper functions
- void InitFromName(const wxString& colourName);
+ // helper functions
+ void InitFromName(const wxString& colourName);
private:
- DECLARE_DYNAMIC_CLASS(wxColour)
+ DECLARE_DYNAMIC_CLASS(wxColour)
};
#endif // __GTKCOLOURH__
wxPen(void);
wxPen( const wxColour &colour, int width, int style );
- wxPen( const wxString &colourName, int width, int style );
wxPen( const wxPen& pen );
wxPen( const wxPen* pen );
~wxPen(void);
bool operator != ( const wxPen& pen );
void SetColour( const wxColour &colour );
- void SetColour( const wxString &colourName );
void SetColour( int red, int green, int blue );
void SetCap( int capStyle );
void SetJoin( int joinStyle );
public:
wxBrush();
wxBrush(const wxColour& col, int style);
- wxBrush(const wxString& col, int style);
wxBrush(const wxBitmap& stipple);
inline wxBrush(const wxBrush& brush) { Ref(brush); }
inline wxBrush(const wxBrush* brush) { if (brush) Ref(*brush); }
~wxBrush();
virtual void SetColour(const wxColour& col) ;
- virtual void SetColour(const wxString& col) ;
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
virtual void SetStyle(int style) ;
virtual void SetStipple(const wxBitmap& stipple) ;
#include "wx/string.h"
// Colour
-class WXDLLEXPORT wxColour: public wxObject
+class WXDLLEXPORT wxColour : public wxObject
{
- DECLARE_DYNAMIC_CLASS(wxColour)
public:
+ // ctors
+ // default
wxColour();
- wxColour(unsigned char r, unsigned char g, unsigned char b);
- wxColour(unsigned long colRGB) { Set(colRGB); }
- wxColour(const wxColour& col);
- wxColour(const wxString& col);
- ~wxColour() ;
- wxColour& operator =(const wxColour& src) ;
- wxColour& operator =(const wxString& src) ;
- inline int Ok() const { return (m_isInit) ; }
-
- void Set(unsigned char r, unsigned char g, unsigned char b);
- void Set(unsigned long colRGB)
- {
+ // from RGB
+ wxColour( char red, char green, char blue );
+ // 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( 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 )
+ {
// 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,
+ Set((unsigned char)colRGB,
(unsigned char)(colRGB >> 8),
- (unsigned char)(colRGB >> 16));
+ (unsigned char)(colRGB >> 16));
}
- inline unsigned char Red() const { return m_red; }
- inline unsigned char Green() const { return m_green; }
- inline unsigned char Blue() const { return m_blue; }
-
- inline bool operator == (const wxColour& colour) { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); }
+ // accessors
+ bool Ok() const {return m_isInit; }
- inline bool operator != (const wxColour& colour) { return (!(m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue)); }
-
- inline int GetPixel() const { return m_pixel; };
- inline void SetPixel(int pixel) { m_pixel = pixel; m_isInit = TRUE; };
+ int GetPixel() const { return m_pixel; };
+ void SetPixel(int pixel) { m_pixel = pixel; m_isInit = TRUE; };
// Allocate a colour, or nearest colour, using the given display.
// If realloc is TRUE, ignore the existing pixel, otherwise just return
int AllocColour(WXDisplay* display, bool realloc = FALSE);
- private:
+private:
bool m_isInit;
unsigned char m_red;
unsigned char m_blue;
unsigned char m_green;
- public:
- int m_pixel;
+public:
+ int m_pixel;
};
-#define wxColor wxColour
-
#endif
// _WX_COLOUR_H_
public:
wxPen();
wxPen(const wxColour& col, int width, int style);
- wxPen(const wxString& col, int width, int style);
wxPen(const wxBitmap& stipple, int width);
inline wxPen(const wxPen& pen) { Ref(pen); }
inline wxPen(const wxPen* pen) { if (pen) Ref(*pen); }
// Override in order to recreate the pen
void SetColour(const wxColour& col) ;
- void SetColour(const wxString& col) ;
- void SetColour(const unsigned char r, const unsigned char g, const unsigned char b) ;
+ void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
void SetWidth(int width) ;
void SetStyle(int style) ;
class WXDLLEXPORT wxColour: public wxObject
{
public:
+ // ctors
+ // default
wxColour();
- wxColour(const unsigned char r, const unsigned char g, const unsigned char b);
- wxColour(unsigned long colRGB) { Set(colRGB); }
- wxColour(const wxColour& col);
- wxColour(const wxString& col) { InitFromName(col); }
-// wxColour(const char *col) { InitFromName(col); }
+ // from RGB
+ wxColour( char red, char green, char blue );
+ // 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( const wxColour* col );
+ wxColour& operator = ( const wxColour& col );
+
+ // dtor
~wxColour();
- wxColour& operator =(const wxColour& src) ;
- wxColour& operator =(const wxString& src) ;
- inline int Ok() const { return (m_isInit) ; }
-
- void Set(unsigned char r, unsigned char g, unsigned char b);
+ // Set() functions
+ 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
(unsigned char)(colRGB >> 16));
}
+ // accessors
+ bool Ok() const {return m_isInit; }
+
// Let's remove this inelegant function
#if WXWIN_COMPATIBILITY
void Get(unsigned char *r, unsigned char *g, unsigned char *b) const;
#endif
- inline unsigned char Red() const { return m_red; }
- inline unsigned char Green() const { return m_green; }
- inline unsigned char Blue() const { return m_blue; }
-
- inline bool operator == (const wxColour& colour) { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); }
+ unsigned char Red() const { return m_red; }
+ unsigned char Green() const { return m_green; }
+ unsigned char Blue() const { return m_blue; }
- inline bool operator != (const wxColour& colour) { return (!(m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue)); }
+ // comparison
+ bool operator == (const wxColour& colour)
+ {
+ return (m_red == colour.m_red &&
+ m_green == colour.m_green &&
+ m_blue == colour.m_blue);
+ }
+ bool operator != (const wxColour& colour) { return !(*this == colour); }
WXCOLORREF GetPixel() const { return m_pixel; };
private:
- bool m_isInit;
+ bool m_isInit;
unsigned char m_red;
unsigned char m_blue;
unsigned char m_green;
DECLARE_DYNAMIC_CLASS(wxColour)
};
-#define wxColor wxColour
-
#endif
// _WX_COLOUR_H_
{
friend class WXDLLEXPORT wxPen;
public:
- wxPenRefData(void);
+ wxPenRefData();
wxPenRefData(const wxPenRefData& data);
- ~wxPenRefData(void);
+ ~wxPenRefData();
protected:
int m_width;
{
DECLARE_DYNAMIC_CLASS(wxPen)
public:
- wxPen(void);
+ wxPen();
wxPen(const wxColour& col, int width, int style);
wxPen(const wxString& col, int width, int style);
wxPen(const wxBitmap& stipple, int width);
inline wxPen(const wxPen& pen) { Ref(pen); }
inline wxPen(const wxPen* pen) { if (pen) Ref(*pen); }
- ~wxPen(void);
+ ~wxPen();
inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; }
inline bool operator == (const wxPen& pen) { return m_refData == pen.m_refData; }
inline bool operator != (const wxPen& pen) { return m_refData != pen.m_refData; }
- virtual bool Ok(void) const { return (m_refData != NULL) ; }
+ virtual bool Ok() const { return (m_refData != NULL) ; }
// Override in order to recreate the pen
void SetColour(const wxColour& col) ;
void SetJoin(int join) ;
void SetCap(int cap) ;
- inline wxColour& GetColour(void) const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); };
- inline int GetWidth(void) const { return (M_PENDATA ? M_PENDATA->m_width : 0); };
- inline int GetStyle(void) const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
- inline int GetJoin(void) const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
- inline int GetCap(void) const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
+ inline wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); };
+ inline int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); };
+ inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
+ inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
+ inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
inline int GetDashes(wxDash **ptr) const {
*ptr = (M_PENDATA ? M_PENDATA->m_dash : NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
}
- inline wxBitmap *GetStipple(void) const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : NULL); };
+ inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : NULL); };
// Internal
- bool RealizeResource(void);
+ bool RealizeResource();
bool FreeResource(bool force = FALSE);
- WXHANDLE GetResourceHandle(void) ;
- bool IsFree(void);
+ WXHANDLE GetResourceHandle() ;
+ bool IsFree() const;
void Unshare();
};
public:
wxBrush();
wxBrush(const wxColour& col, int style);
- wxBrush(const wxString& col, int style);
wxBrush(const wxBitmap& stipple);
inline wxBrush(const wxBrush& brush) { Ref(brush); }
inline wxBrush(const wxBrush* brush) { if (brush) Ref(*brush); }
~wxBrush();
virtual void SetColour(const wxColour& col) ;
- virtual void SetColour(const wxString& col) ;
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
virtual void SetStyle(int style) ;
virtual void SetStipple(const wxBitmap& stipple) ;
// Colour
class WXDLLEXPORT wxColour: public wxObject
{
- DECLARE_DYNAMIC_CLASS(wxColour)
public:
+ // ctors
+ // default
wxColour();
- wxColour(unsigned char r, unsigned char g, unsigned char b);
- wxColour(unsigned long colRGB) { Set(colRGB); }
- wxColour(const wxColour& col);
- wxColour(const wxString& col);
- ~wxColour() ;
- wxColour& operator =(const wxColour& src) ;
- wxColour& operator =(const wxString& src) ;
- inline int Ok() const { return (m_isInit) ; }
-
- void Set(unsigned char r, unsigned char g, unsigned char b);
- void Set(unsigned long colRGB)
- {
+ // from RGB
+ wxColour( char red, char green, char blue );
+ // 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( 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 )
+ {
// 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,
+ Set((unsigned char)colRGB,
(unsigned char)(colRGB >> 8),
- (unsigned char)(colRGB >> 16));
+ (unsigned char)(colRGB >> 16));
}
- inline unsigned char Red() const { return m_red; }
- inline unsigned char Green() const { return m_green; }
- inline unsigned char Blue() const { return m_blue; }
+ // accessors
+ bool Ok() const {return m_isInit; }
- inline bool operator == (const wxColour& colour) { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); }
+ // Let's remove this inelegant function
+#if WXWIN_COMPATIBILITY
+ void Get(unsigned char *r, unsigned char *g, unsigned char *b) const;
+#endif
+
+ unsigned char Red() const { return m_red; }
+ unsigned char Green() const { return m_green; }
+ unsigned char Blue() const { return m_blue; }
- inline bool operator != (const wxColour& colour) { return (!(m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue)); }
+ // comparison
+ bool operator == (const wxColour& colour)
+ {
+ return (m_red == colour.m_red &&
+ m_green == colour.m_green &&
+ m_blue == colour.m_blue);
+ }
+ bool operator != (const wxColour& colour) { return !(*this == colour); }
/* TODO
WXCOLORREF GetPixel() const { return m_pixel; };
*/
- private:
- bool m_isInit;
+private:
+ bool m_isInit;
unsigned char m_red;
unsigned char m_blue;
unsigned char m_green;
- public:
-/* TODO: implementation
- WXCOLORREF m_pixel ;
-*/
-};
-#define wxColor wxColour
+public:
+ /* TODO: implementation
+ WXCOLORREF m_pixel ;
+ */
+
+private:
+ DECLARE_DYNAMIC_CLASS(wxColour)
+};
#endif
// _WX_COLOUR_H_
public:
wxPen();
wxPen(const wxColour& col, int width, int style);
- wxPen(const wxString& col, int width, int style);
wxPen(const wxBitmap& stipple, int width);
inline wxPen(const wxPen& pen) { Ref(pen); }
inline wxPen(const wxPen* pen) { if (pen) Ref(*pen); }
// Override in order to recreate the pen
void SetColour(const wxColour& col) ;
- void SetColour(const wxString& col) ;
- void SetColour(const unsigned char r, const unsigned char g, const unsigned char b) ;
+ void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
void SetWidth(int width) ;
void SetStyle(int style) ;
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
-#pragma interface "controls.h"
+#pragma implementation "controls.h"
#endif
// For compilers that support precompilation, includes "wx/wx.h".
wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) )
{
m_text = new wxTextCtrl( this, -1, "This is the log window.\n", wxPoint(0,50), wxSize(100,50), wxTE_MULTILINE );
- m_text->SetBackgroundColour(wxColor("yellow"));
+ m_text->SetBackgroundColour("yellow");
m_notebook = new wxNotebook( this, ID_NOTEBOOK, wxPoint(0,0), wxSize(200,150) );
wxPanel *panel = new wxPanel(m_notebook);
m_listbox = new wxListBox( panel, ID_LISTBOX, wxPoint(10,10), wxSize(120,70), 4, choices );
- m_listbox->SetBackgroundColour(wxColour("red"));
+ m_listbox->SetBackgroundColour("red");
(void)new wxButton( panel, ID_LISTBOX_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
(void)new wxButton( panel, ID_LISTBOX_SEL_STR, "Select 'This'", wxPoint(340,30), wxSize(140,30) );
wxButton *btn = new wxButton( panel, ID_LISTBOX_CLEAR, "Clear", wxPoint(180,80), wxSize(140,30) );
- btn->SetBackgroundColour(wxColour("green"));
+ btn->SetBackgroundColour("green");
(void)new wxButton( panel, ID_LISTBOX_APPEND, "Append 'Hi!'", wxPoint(340,80), wxSize(140,30) );
(void)new wxButton( panel, ID_LISTBOX_DELETE, "Delete selected item", wxPoint(180,130), wxSize(140,30) );
(void)new wxButton( panel, ID_LISTBOX_FONT, "Set Italic font", wxPoint(340,130), wxSize(140,30) );
return pen;
}
-wxPen *wxPenList::FindOrCreatePen (const wxString& colour, int width, int style)
-{
- wxColour *the_colour = wxTheColourDatabase->FindColour (colour);
- if (the_colour)
- return FindOrCreatePen (*the_colour, width, style);
- else
- return (wxPen *) NULL;
-}
-
wxBrushList::~wxBrushList ()
{
#ifdef __WXMSW__
return brush;
}
-wxBrush *wxBrushList::FindOrCreateBrush (const wxString& colour, int style)
-{
- wxColour *the_colour = wxTheColourDatabase->FindColour (colour);
- if (the_colour)
- return FindOrCreateBrush (*the_colour, style);
- else
- return (wxBrush *) NULL;
-}
-
void wxBrushList::RemoveBrush (wxBrush * brush)
{
DeleteObject (brush);
if (wxTheBrushList) wxTheBrushList->AddBrush( this );
}
-wxBrush::wxBrush( const wxString &colourName, int style )
-{
- m_refData = new wxBrushRefData();
- M_BRUSHDATA->m_style = style;
- M_BRUSHDATA->m_colour = colourName;
-
- if (wxTheBrushList) wxTheBrushList->AddBrush( this );
-}
-
wxBrush::wxBrush( const wxBitmap &stippleBitmap )
{
m_refData = new wxBrushRefData();
M_BRUSHDATA->m_colour = col;
}
-void wxBrush::SetColour( const wxString& col )
-{
- Unshare();
- M_BRUSHDATA->m_colour = col;
-}
-
void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b )
{
Unshare();
return *this;
}
-wxColour& wxColour::operator = ( const wxString& colourName )
-{
- UnRef();
- wxNode *node = (wxNode *) NULL;
- if ((wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) )
- {
- wxColour *col = (wxColour*)node->Data();
- if (col) Ref( *col );
- }
- else
- {
- m_refData = new wxColourRefData();
- if (!gdk_color_parse( colourName, &M_COLDATA->m_color ))
- {
- wxFAIL_MSG( "wxColour: couldn't find colour" );
- delete m_refData;
- m_refData = (wxObjectRefData *) NULL;
- }
- }
- return *this;
-}
-
bool wxColour::operator == ( const wxColour& col )
{
return m_refData == col.m_refData;
{
wxASSERT( m_imageList != NULL );
- wxBitmap *bmp = m_imageList->GetBitmap(imageId);
+ const wxBitmap *bmp = m_imageList->GetBitmap(imageId);
GdkPixmap *pixmap = bmp->GetPixmap();
GdkBitmap *mask = (GdkBitmap*) NULL;
- if (bmp->GetMask()) mask = bmp->GetMask()->GetBitmap();
+ if ( bmp->GetMask() )
+ {
+ mask = bmp->GetMask()->GetBitmap();
+ }
+
GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask );
gtk_box_pack_start(GTK_BOX(page->m_box), pixmapwid, FALSE, FALSE, 3);
if (wxThePenList) wxThePenList->AddPen( this );
}
-wxPen::wxPen( const wxString &colourName, int width, int style )
-{
- m_refData = new wxPenRefData();
- M_PENDATA->m_width = width;
- M_PENDATA->m_style = style;
- M_PENDATA->m_colour = colourName;
-
- if (wxThePenList) wxThePenList->AddPen( this );
-}
-
wxPen::wxPen( const wxPen& pen )
{
Ref( pen );
M_PENDATA->m_colour = colour;
}
-void wxPen::SetColour( const wxString &colourName )
-{
- Unshare();
- M_PENDATA->m_colour = colourName;
-}
-
void wxPen::SetColour( int red, int green, int blue )
{
Unshare();
if (wxTheBrushList) wxTheBrushList->AddBrush( this );
}
-wxBrush::wxBrush( const wxString &colourName, int style )
-{
- m_refData = new wxBrushRefData();
- M_BRUSHDATA->m_style = style;
- M_BRUSHDATA->m_colour = colourName;
-
- if (wxTheBrushList) wxTheBrushList->AddBrush( this );
-}
-
wxBrush::wxBrush( const wxBitmap &stippleBitmap )
{
m_refData = new wxBrushRefData();
M_BRUSHDATA->m_colour = col;
}
-void wxBrush::SetColour( const wxString& col )
-{
- Unshare();
- M_BRUSHDATA->m_colour = col;
-}
-
void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b )
{
Unshare();
return *this;
}
-wxColour& wxColour::operator = ( const wxString& colourName )
-{
- UnRef();
- wxNode *node = (wxNode *) NULL;
- if ((wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) )
- {
- wxColour *col = (wxColour*)node->Data();
- if (col) Ref( *col );
- }
- else
- {
- m_refData = new wxColourRefData();
- if (!gdk_color_parse( colourName, &M_COLDATA->m_color ))
- {
- wxFAIL_MSG( "wxColour: couldn't find colour" );
- delete m_refData;
- m_refData = (wxObjectRefData *) NULL;
- }
- }
- return *this;
-}
-
bool wxColour::operator == ( const wxColour& col )
{
return m_refData == col.m_refData;
{
wxASSERT( m_imageList != NULL );
- wxBitmap *bmp = m_imageList->GetBitmap(imageId);
+ const wxBitmap *bmp = m_imageList->GetBitmap(imageId);
GdkPixmap *pixmap = bmp->GetPixmap();
GdkBitmap *mask = (GdkBitmap*) NULL;
- if (bmp->GetMask()) mask = bmp->GetMask()->GetBitmap();
+ if ( bmp->GetMask() )
+ {
+ mask = bmp->GetMask()->GetBitmap();
+ }
+
GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask );
gtk_box_pack_start(GTK_BOX(page->m_box), pixmapwid, FALSE, FALSE, 3);
if (wxThePenList) wxThePenList->AddPen( this );
}
-wxPen::wxPen( const wxString &colourName, int width, int style )
-{
- m_refData = new wxPenRefData();
- M_PENDATA->m_width = width;
- M_PENDATA->m_style = style;
- M_PENDATA->m_colour = colourName;
-
- if (wxThePenList) wxThePenList->AddPen( this );
-}
-
wxPen::wxPen( const wxPen& pen )
{
Ref( pen );
M_PENDATA->m_colour = colour;
}
-void wxPen::SetColour( const wxString &colourName )
-{
- Unshare();
- M_PENDATA->m_colour = colourName;
-}
-
void wxPen::SetColour( int red, int green, int blue )
{
Unshare();
wxTheBrushList->AddBrush(this);
}
-wxBrush::wxBrush(const wxString& col, int Style)
-{
- m_refData = new wxBrushRefData;
-
- // Implicit conversion from string to wxColour via colour database
- M_BRUSHDATA->m_colour = col;
- M_BRUSHDATA->m_style = Style;
-
- RealizeResource();
-
- if ( wxTheBrushList )
- wxTheBrushList->AddBrush(this);
-}
-
wxBrush::wxBrush(const wxBitmap& stipple)
{
m_refData = new wxBrushRefData;
RealizeResource();
}
-void wxBrush::SetColour(const wxString& col)
-{
- Unshare();
-
- M_BRUSHDATA->m_colour = col;
-
- RealizeResource();
-}
-
-void wxBrush::SetColour(const unsigned char r, const unsigned char g, const unsigned char b)
+void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
{
Unshare();
return *this;
}
-wxColour::wxColour (const wxString& col)
+void wxColour::InitFromName(const wxString& col)
{
wxColour *the_colour = wxTheColourDatabase->FindColour (col);
if (the_colour)
{
}
-wxColour& wxColour::operator = (const wxString& col)
-{
- wxColour *the_colour = wxTheColourDatabase->FindColour (col);
- if (the_colour)
- {
- m_red = the_colour->Red ();
- m_green = the_colour->Green ();
- m_blue = the_colour->Blue ();
- m_pixel = the_colour->m_pixel;
- m_isInit = TRUE;
- }
- else
- {
- m_red = 0;
- m_green = 0;
- m_blue = 0;
- m_isInit = FALSE;
- }
-
- return (*this);
-}
-
void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
{
m_red = r;
wxThePenList->AddPen(this);
}
-wxPen::wxPen(const wxString& col, int Width, int Style)
-{
- m_refData = new wxPenRefData;
-
- M_PENDATA->m_colour = col;
- M_PENDATA->m_width = Width;
- M_PENDATA->m_style = Style;
- M_PENDATA->m_join = wxJOIN_ROUND ;
- M_PENDATA->m_cap = wxCAP_ROUND ;
- M_PENDATA->m_nbDash = 0 ;
- M_PENDATA->m_dash = 0 ;
-
- RealizeResource();
-
- if ( wxThePenList )
- wxThePenList->AddPen(this);
-}
-
void wxPen::Unshare()
{
// Don't change shared data
RealizeResource();
}
-void wxPen::SetColour(const wxString& col)
-{
- Unshare();
-
- M_PENDATA->m_colour = col;
-
- RealizeResource();
-}
-
-void wxPen::SetColour(const unsigned char r, const unsigned char g, const unsigned char b)
+void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)
{
Unshare();
return TRUE;
}
-
wxTheBrushList->AddBrush(this);
}
-wxBrush::wxBrush(const wxString& col, int Style)
-{
- m_refData = new wxBrushRefData;
-
- M_BRUSHDATA->m_colour = col;
- M_BRUSHDATA->m_style = Style;
- M_BRUSHDATA->m_hBrush = 0;
-
- RealizeResource();
-
- if ( wxTheBrushList )
- wxTheBrushList->AddBrush(this);
-}
-
wxBrush::wxBrush(const wxBitmap& stipple)
{
m_refData = new wxBrushRefData;
RealizeResource();
}
-void wxBrush::SetColour(const wxString& col)
-{
- Unshare();
-
- M_BRUSHDATA->m_colour = col;
-
- RealizeResource();
-}
-
-void wxBrush::SetColour(const unsigned char r, const unsigned char g, const unsigned char b)
+void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
{
Unshare();
m_red = m_blue = m_green = 0;
}
-wxColour::wxColour (const unsigned char r, const unsigned char g, const unsigned char b)
+wxColour::wxColour (unsigned char r, unsigned char g, unsigned char b)
{
m_red = r;
m_green = g;
{
}
-wxColour& wxColour::operator = (const wxString& col)
-{
- wxColour *the_colour = wxTheColourDatabase->FindColour (col);
- if (the_colour)
- {
- m_red = the_colour->Red ();
- m_green = the_colour->Green ();
- m_blue = the_colour->Blue ();
- m_isInit = TRUE;
- }
- else
- {
- m_red = 0;
- m_green = 0;
- m_blue = 0;
- m_isInit = FALSE;
- }
- m_pixel = PALETTERGB (m_red, m_green, m_blue);
- return (*this);
-}
-
void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
{
m_red = r;
IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
#endif
-wxPenRefData::wxPenRefData(void)
+wxPenRefData::wxPenRefData()
{
m_style = wxSOLID;
m_width = 1;
m_hPen = 0;
}
-wxPenRefData::~wxPenRefData(void)
+wxPenRefData::~wxPenRefData()
{
if ( m_hPen )
::DeleteObject((HPEN) m_hPen);
// Pens
-wxPen::wxPen(void)
+wxPen::wxPen()
{
if ( wxThePenList )
wxThePenList->AddPen(this);
wxThePenList->AddPen(this);
}
-wxPen::wxPen(const wxString& col, int Width, int Style)
-{
- m_refData = new wxPenRefData;
-
- M_PENDATA->m_colour = col;
-// M_PENDATA->m_stipple = NULL ;
- M_PENDATA->m_width = Width;
- M_PENDATA->m_style = Style;
- M_PENDATA->m_join = wxJOIN_ROUND ;
- M_PENDATA->m_cap = wxCAP_ROUND ;
- M_PENDATA->m_nbDash = 0 ;
- M_PENDATA->m_dash = 0 ;
- M_PENDATA->m_hPen = 0 ;
-
- RealizeResource();
-
- if ( wxThePenList )
- wxThePenList->AddPen(this);
-}
-
-bool wxPen::RealizeResource(void)
+bool wxPen::RealizeResource()
{
if (M_PENDATA && (M_PENDATA->m_hPen == 0))
{
return FALSE;
}
-WXHANDLE wxPen::GetResourceHandle(void)
+WXHANDLE wxPen::GetResourceHandle()
{
if ( !M_PENDATA )
return 0;
else return FALSE;
}
-bool wxPen::IsFree(void)
+bool wxPen::IsFree() const
{
return (M_PENDATA && M_PENDATA->m_hPen == 0);
}
RealizeResource();
}
-void wxPen::SetColour(const wxString& col)
-{
- Unshare();
-
- M_PENDATA->m_colour = col;
-
- RealizeResource();
-}
-
-void wxPen::SetColour(const unsigned char r, const unsigned char g, const unsigned char b)
+void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)
{
Unshare();
wxTheBrushList->AddBrush(this);
}
-wxBrush::wxBrush(const wxString& col, int Style)
-{
- m_refData = new wxBrushRefData;
-
- // Implicit conversion from string to wxColour via colour database
- M_BRUSHDATA->m_colour = col;
- M_BRUSHDATA->m_style = Style;
-
- RealizeResource();
-
- if ( wxTheBrushList )
- wxTheBrushList->AddBrush(this);
-}
-
wxBrush::wxBrush(const wxBitmap& stipple)
{
m_refData = new wxBrushRefData;
RealizeResource();
}
-void wxBrush::SetColour(const wxString& col)
-{
- Unshare();
-
- M_BRUSHDATA->m_colour = col;
-
- RealizeResource();
-}
-
-void wxBrush::SetColour(const unsigned char r, const unsigned char g, const unsigned char b)
+void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
{
Unshare();
return *this;
}
-wxColour::wxColour (const wxString& col)
+void wxColour::InitFromName(const wxString& col)
{
wxColour *the_colour = wxTheColourDatabase->FindColour (col);
if (the_colour)
{
}
-wxColour& wxColour::operator = (const wxString& col)
-{
- wxColour *the_colour = wxTheColourDatabase->FindColour (col);
- if (the_colour)
- {
- m_red = the_colour->Red ();
- m_green = the_colour->Green ();
- m_blue = the_colour->Blue ();
- m_isInit = TRUE;
- }
- else
- {
- m_red = 0;
- m_green = 0;
- m_blue = 0;
- m_isInit = FALSE;
- }
-/* TODO
- m_pixel = PALETTERGB (m_red, m_green, m_blue);
-*/
- return (*this);
-}
-
void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
{
m_red = r;
wxThePenList->AddPen(this);
}
-wxPen::wxPen(const wxString& col, int Width, int Style)
-{
- m_refData = new wxPenRefData;
-
- M_PENDATA->m_colour = col;
- M_PENDATA->m_width = Width;
- M_PENDATA->m_style = Style;
- M_PENDATA->m_join = wxJOIN_ROUND ;
- M_PENDATA->m_cap = wxCAP_ROUND ;
- M_PENDATA->m_nbDash = 0 ;
- M_PENDATA->m_dash = 0 ;
-
- RealizeResource();
-
- if ( wxThePenList )
- wxThePenList->AddPen(this);
-}
-
void wxPen::Unshare()
{
// Don't change shared data
RealizeResource();
}
-void wxPen::SetColour(const wxString& col)
-{
- Unshare();
-
- M_PENDATA->m_colour = col;
-
- RealizeResource();
-}
-
-void wxPen::SetColour(const unsigned char r, const unsigned char g, const unsigned char b)
+void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)
{
Unshare();
projects / wxWidgets.git / commitdiff
