Fix for mistake with const for non pointer/reference with corrections in documentation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
81a3763f80
commit
1a1498c08b
@ -1,3 +1,14 @@
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
%% Name: brush.tex
|
||||
%% Purpose: wxPen docs
|
||||
%% Author:
|
||||
%% Modified by:
|
||||
%% Created:
|
||||
%% RCS-ID: $Id$
|
||||
%% Copyright: (c) wxWidgets
|
||||
%% License: wxWindows license
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
|
||||
\section{\class{wxBrush}}\label{wxbrush}
|
||||
|
||||
A brush is a drawing tool for filling in areas. It is used for painting
|
||||
@ -214,7 +225,7 @@ Sets the brush colour using a reference to a colour object.
|
||||
|
||||
Sets the brush colour using a colour name from the colour database.
|
||||
|
||||
\func{void}{SetColour}{\param{const unsigned char}{ red}, \param{const unsigned char}{ green}, \param{const unsigned char}{ blue}}
|
||||
\func{void}{SetColour}{\param{unsigned char}{ red}, \param{unsigned char}{ green}, \param{unsigned char}{ blue}}
|
||||
|
||||
Sets the brush colour using red, green and blue values.
|
||||
|
||||
|
@ -262,7 +262,7 @@ Sets the pen cap style, which may be one of {\bf wxCAP\_ROUND}, {\bf wxCAP\_PROJ
|
||||
|
||||
\func{void}{SetColour}{\param{const wxString\& }{colourName}}
|
||||
|
||||
\func{void}{SetColour}{\param{const unsigned char}{ red}, \param{const unsigned char}{ green}, \param{const unsigned char}{ blue}}
|
||||
\func{void}{SetColour}{\param{unsigned char}{ red}, \param{unsigned char}{ green}, \param{unsigned char}{ blue}}
|
||||
|
||||
The pen's colour is changed to the given colour.
|
||||
|
||||
|
@ -40,7 +40,7 @@ public:
|
||||
// Implementation
|
||||
// ------------------------------------------------------------------------
|
||||
virtual void SetColour(const wxColour& col) ;
|
||||
virtual void SetColour(const unsigned char r, const unsigned char g, const unsigned char b) ;
|
||||
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
|
||||
virtual void SetStyle(int style) ;
|
||||
virtual void SetStipple(const wxBitmap& stipple) ;
|
||||
|
||||
|
@ -47,7 +47,7 @@ public:
|
||||
virtual bool Ok() const { return (m_refData != NULL) ; }
|
||||
|
||||
void SetColour(const wxColour& 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);
|
||||
|
@ -51,7 +51,7 @@ public:
|
||||
wxBitmap *GetStipple() const;
|
||||
|
||||
void SetColour( const wxColour& 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 SetStyle( int style );
|
||||
void SetStipple( const wxBitmap& stipple );
|
||||
|
||||
|
@ -51,7 +51,7 @@ public:
|
||||
bool operator != (const wxPen& pen) const { return !(*this == pen); }
|
||||
|
||||
void SetColour( const wxColour &colour );
|
||||
void SetColour( const unsigned char red, const unsigned char green, const unsigned char blue );
|
||||
void SetColour( unsigned char red, unsigned char green, unsigned char blue );
|
||||
void SetCap( int capStyle );
|
||||
void SetJoin( int joinStyle );
|
||||
void SetStyle( int style );
|
||||
|
@ -51,7 +51,7 @@ public:
|
||||
wxBitmap *GetStipple() const;
|
||||
|
||||
void SetColour( const wxColour& 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 SetStyle( int style );
|
||||
void SetStipple( const wxBitmap& stipple );
|
||||
|
||||
|
@ -51,7 +51,7 @@ public:
|
||||
bool operator != (const wxPen& pen) const { return !(*this == pen); }
|
||||
|
||||
void SetColour( const wxColour &colour );
|
||||
void SetColour( const unsigned char red, const unsigned char green, const unsigned char blue );
|
||||
void SetColour( unsigned char red, unsigned char green, unsigned char blue );
|
||||
void SetCap( int capStyle );
|
||||
void SetJoin( int joinStyle );
|
||||
void SetStyle( int style );
|
||||
|
@ -41,7 +41,7 @@ public:
|
||||
~wxBrush();
|
||||
|
||||
virtual void SetColour(const wxColour& col) ;
|
||||
virtual void SetColour(const unsigned char r, const unsigned char g, const unsigned char b) ;
|
||||
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
|
||||
virtual void SetStyle(int style) ;
|
||||
virtual void SetStipple(const wxBitmap& stipple) ;
|
||||
virtual void MacSetTheme(short macThemeBrush) ;
|
||||
|
@ -65,7 +65,7 @@ public:
|
||||
|
||||
// Override in order to recreate the pen
|
||||
void SetColour(const wxColour& 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) ;
|
||||
|
@ -41,7 +41,7 @@ public:
|
||||
~wxBrush();
|
||||
|
||||
virtual void SetColour(const wxColour& col) ;
|
||||
virtual void SetColour(const unsigned char r, const unsigned char g, const unsigned char b) ;
|
||||
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
|
||||
virtual void SetStyle(int style) ;
|
||||
virtual void SetStipple(const wxBitmap& stipple) ;
|
||||
virtual void SetMacTheme(short macThemeBrush) ;
|
||||
|
@ -65,7 +65,7 @@ public:
|
||||
|
||||
// Override in order to recreate the pen
|
||||
void SetColour(const wxColour& 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) ;
|
||||
|
@ -45,7 +45,7 @@ public:
|
||||
wxBitmap *GetStipple() const;
|
||||
|
||||
void SetColour(const wxColour& 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 SetStyle(int style);
|
||||
void SetStipple(const wxBitmap& stipple);
|
||||
|
||||
|
@ -40,7 +40,7 @@ public:
|
||||
bool operator != (const wxPen& pen) const;
|
||||
|
||||
void SetColour(const wxColour &colour);
|
||||
void SetColour(const unsigned char red, const unsigned char green, const unsigned char blue);
|
||||
void SetColour(unsigned char red, unsigned char green, unsigned char blue);
|
||||
void SetCap(int capStyle);
|
||||
void SetJoin(int joinStyle);
|
||||
void SetStyle(int style);
|
||||
|
@ -32,7 +32,7 @@ public:
|
||||
virtual ~wxBrush();
|
||||
|
||||
virtual void SetColour(const wxColour& col);
|
||||
virtual void SetColour(const unsigned char r, const unsigned char g, const unsigned char b);
|
||||
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b);
|
||||
virtual void SetStyle(int style);
|
||||
virtual void SetStipple(const wxBitmap& stipple);
|
||||
|
||||
|
@ -102,7 +102,7 @@ public:
|
||||
|
||||
// Override in order to recreate the pen
|
||||
void SetColour(const wxColour& 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);
|
||||
|
@ -53,7 +53,7 @@ public:
|
||||
inline bool operator != (const wxBrush& rBrush) const { return m_refData != rBrush.m_refData; }
|
||||
|
||||
virtual void SetColour(const wxColour& rColour);
|
||||
virtual void SetColour(const unsigned char cRed, const unsigned char cGreen, const unsigned char cBrush);
|
||||
virtual void SetColour(unsigned char cRed, unsigned char cGreen, unsigned char cBrush);
|
||||
virtual void SetPS(HPS hPS);
|
||||
virtual void SetStyle(int nStyle) ;
|
||||
virtual void SetStipple(const wxBitmap& rStipple);
|
||||
|
@ -68,7 +68,7 @@ public:
|
||||
// Override in order to recreate the pen
|
||||
//
|
||||
void SetColour(const wxColour& rColour);
|
||||
void SetColour(const unsigned char cRed, const unsigned char cGreen, const unsigned char cBlue);
|
||||
void SetColour(unsigned char cRed, unsigned char cGreen, unsigned char cBlue);
|
||||
|
||||
void SetWidth(int nWidth);
|
||||
void SetStyle(int nStyle);
|
||||
|
@ -32,7 +32,7 @@ public:
|
||||
virtual ~wxBrush();
|
||||
|
||||
virtual void SetColour(const wxColour& col);
|
||||
virtual void SetColour(const unsigned char r, const unsigned char g, const unsigned char b);
|
||||
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b);
|
||||
virtual void SetStyle(int style);
|
||||
virtual void SetStipple(const wxBitmap& stipple);
|
||||
|
||||
|
@ -102,7 +102,7 @@ public:
|
||||
|
||||
// Override in order to recreate the pen
|
||||
void SetColour(const wxColour& 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);
|
||||
|
@ -48,7 +48,7 @@ public:
|
||||
wxBitmap *GetStipple() const;
|
||||
|
||||
void SetColour( const wxColour& 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 SetStyle( int style );
|
||||
void SetStipple( const wxBitmap& stipple );
|
||||
|
||||
|
@ -47,7 +47,7 @@ public:
|
||||
bool operator != (const wxPen& pen) const { return !(*this == pen); }
|
||||
|
||||
void SetColour( const wxColour &colour );
|
||||
void SetColour( const unsigned char red, const unsigned char green, const unsigned char blue );
|
||||
void SetColour( unsigned char red, unsigned char green, unsigned char blue );
|
||||
void SetCap( int capStyle );
|
||||
void SetJoin( int joinStyle );
|
||||
void SetStyle( int style );
|
||||
|
@ -173,7 +173,7 @@ void wxBrush::SetColour(const wxColour& col)
|
||||
M_BRUSHDATA->SetColour(col);
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
AllocExclusive();
|
||||
M_BRUSHDATA->SetColour(wxColour(r,g,b));
|
||||
|
@ -303,7 +303,7 @@ void wxPen::SetColour(const wxColour& col)
|
||||
M_PENDATA->SetColour(col);
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
AllocExclusive();
|
||||
M_PENDATA->SetColour(wxColour(r, g, b));
|
||||
|
@ -137,7 +137,7 @@ void wxBrush::SetColour( const wxColour& col )
|
||||
M_BRUSHDATA->m_colour = col;
|
||||
}
|
||||
|
||||
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 )
|
||||
{
|
||||
AllocExclusive();
|
||||
|
||||
|
@ -132,7 +132,7 @@ void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )
|
||||
M_PENDATA->m_dash = (wxGTKDash *)dash;
|
||||
}
|
||||
|
||||
void wxPen::SetColour( const unsigned char red, const unsigned char green, const unsigned char blue )
|
||||
void wxPen::SetColour( unsigned char red, unsigned char green, unsigned char blue )
|
||||
{
|
||||
AllocExclusive();
|
||||
|
||||
|
@ -137,7 +137,7 @@ void wxBrush::SetColour( const wxColour& col )
|
||||
M_BRUSHDATA->m_colour = col;
|
||||
}
|
||||
|
||||
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 )
|
||||
{
|
||||
AllocExclusive();
|
||||
|
||||
|
@ -132,7 +132,7 @@ void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )
|
||||
M_PENDATA->m_dash = (wxGTKDash *)dash;
|
||||
}
|
||||
|
||||
void wxPen::SetColour( const unsigned char red, const unsigned char green, const unsigned char blue )
|
||||
void wxPen::SetColour( unsigned char red, unsigned char green, unsigned char blue )
|
||||
{
|
||||
AllocExclusive();
|
||||
|
||||
|
@ -129,7 +129,7 @@ void wxBrush::SetColour(const wxColour& 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();
|
||||
|
||||
|
@ -107,7 +107,7 @@ void wxPen::SetColour(const wxColour& 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();
|
||||
|
||||
|
@ -128,7 +128,7 @@ void wxBrush::SetColour(const wxColour& 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();
|
||||
|
||||
|
@ -106,7 +106,7 @@ void wxPen::SetColour(const wxColour& 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();
|
||||
|
||||
|
@ -223,7 +223,7 @@ void wxBrush::SetColour(const wxColour& col)
|
||||
M_BRUSHDATA->m_colour = col;
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
AllocExclusive();
|
||||
M_BRUSHDATA->m_colour.Set(r, g, b);
|
||||
|
@ -138,7 +138,7 @@ void wxPen::SetDashes(int number_of_dashes, const wxDash *dash)
|
||||
M_PENDATA->m_dash = (wxDash *)dash; /* TODO */
|
||||
}
|
||||
|
||||
void wxPen::SetColour(const unsigned char red, const unsigned char green, const unsigned char blue)
|
||||
void wxPen::SetColour(unsigned char red, unsigned char green, unsigned char blue)
|
||||
{
|
||||
AllocExclusive();
|
||||
M_PENDATA->m_colour.Set(red, green, blue);
|
||||
|
@ -314,7 +314,7 @@ void wxBrush::SetColour(const wxColour& col)
|
||||
M_BRUSHDATA->SetColour(col);
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
AllocExclusive();
|
||||
|
||||
|
@ -305,7 +305,7 @@ void wxPen::SetColour(const wxColour& 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();
|
||||
|
||||
|
@ -273,7 +273,7 @@ void wxBrush::SetColour( const wxColour& rColour )
|
||||
RealizeResource();
|
||||
}
|
||||
|
||||
void wxBrush::SetColour(const unsigned char cRed, const unsigned char cGreen, const unsigned char cBlue)
|
||||
void wxBrush::SetColour(unsigned char cRed, unsigned char cGreen, unsigned char cBlue)
|
||||
{
|
||||
Unshare();
|
||||
M_BRUSHDATA->m_vColour.Set( cRed, cGreen, cBlue );
|
||||
|
@ -353,7 +353,7 @@ void wxPen::SetColour( const wxColour& rColour )
|
||||
RealizeResource();
|
||||
} // end of wxPen::SetColour
|
||||
|
||||
void wxPen::SetColour( const unsigned char cRed, const unsigned char cGreen, const unsigned char cBlue)
|
||||
void wxPen::SetColour( unsigned char cRed, unsigned char cGreen, unsigned char cBlue)
|
||||
{
|
||||
Unshare();
|
||||
M_PENDATA->m_vColour.Set(cRed, cGreen, cBlue);
|
||||
|
@ -117,7 +117,7 @@ void wxBrush::SetColour(const wxColour& col)
|
||||
{
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -88,7 +88,7 @@ void wxPen::SetColour(const wxColour& col)
|
||||
{
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -138,7 +138,7 @@ void wxBrush::SetColour( const wxColour& col )
|
||||
M_BRUSHDATA->m_colour = col;
|
||||
}
|
||||
|
||||
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 )
|
||||
{
|
||||
AllocExclusive();
|
||||
|
||||
|
@ -122,7 +122,7 @@ void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )
|
||||
M_PENDATA->m_dash = (wxX11Dash *)dash; // TODO
|
||||
}
|
||||
|
||||
void wxPen::SetColour( const unsigned char red, const unsigned char green, const unsigned char blue )
|
||||
void wxPen::SetColour( unsigned char red, unsigned char green, unsigned char blue )
|
||||
{
|
||||
AllocExclusive();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user