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

gave default parameters for wxPen() ctor from wxColour (this is what is used in 99 of cases...)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-21 19:39:34 +00:00
parent 8f20ea0391
commit 4f53523161
9 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/latex/wx/pen.tex
View File

@@ -68,7 +68,7 @@ data using the reference counting, are not affected.
Default constructor. The pen will be uninitialised, and \helpref{wxPen::Ok}{wxpenok} will Default constructor. The pen will be uninitialised, and \helpref{wxPen::Ok}{wxpenok} will
return false. return false.
\func{}{wxPen}{\param{const wxColour\&}{ colour}, \param{int}{ width}, \param{int}{ style}} \func{}{wxPen}{\param{const wxColour\&}{ colour}, \param{int}{ width = $1$}, \param{int}{ style = {\tt wxSOLID}}}
Constructs a pen from a colour object, pen width and style. Constructs a pen from a colour object, pen width and style.

4
include/wx/gtk/pen.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: pen.h // Name: wx/gtk/pen.h
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
@@ -42,7 +42,7 @@ class wxPen: public wxGDIObject
public: public:
wxPen() { } wxPen() { }
wxPen( const wxColour &colour, int width, int style ); wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );
~wxPen(); ~wxPen();
wxPen( const wxPen& pen ) wxPen( const wxPen& pen )

4
include/wx/gtk1/pen.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: pen.h // Name: wx/gtk/pen.h
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
@@ -42,7 +42,7 @@ class wxPen: public wxGDIObject
public: public:
wxPen() { } wxPen() { }
wxPen( const wxColour &colour, int width, int style ); wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );
~wxPen(); ~wxPen();
wxPen( const wxPen& pen ) wxPen( const wxPen& pen )

4
include/wx/mac/pen.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: pen.h // Name: wx/mac/pen.h
// Purpose: wxPen class // Purpose: wxPen class
// Author: Stefan Csomor // Author: Stefan Csomor
// Modified by: // Modified by:
@@ -54,7 +54,7 @@ class WXDLLEXPORT wxPen: public wxGDIObject
DECLARE_DYNAMIC_CLASS(wxPen) DECLARE_DYNAMIC_CLASS(wxPen)
public: public:
wxPen(); wxPen();
wxPen(const wxColour& col, int width, int style); wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
wxPen(const wxBitmap& stipple, int width); wxPen(const wxBitmap& stipple, int width);
wxPen(const wxPen& pen) wxPen(const wxPen& pen)
: wxGDIObject() : wxGDIObject()

4
include/wx/mgl/pen.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: pen.h // Name: wx/mgl/pen.h
// Purpose: // Purpose:
// Author: Vaclav Slavik // Author: Vaclav Slavik
// Id: $Id$ // Id: $Id$
@@ -36,7 +36,7 @@ class WXDLLEXPORT wxPen: public wxGDIObject
{ {
public: public:
wxPen() {} wxPen() {}
wxPen(const wxColour &colour, int width, int style); wxPen(const wxColour &colour, int width = 1, int style = wxSOLID);
wxPen(const wxBitmap& stipple, int width); wxPen(const wxBitmap& stipple, int width);
wxPen(const wxPen& pen); wxPen(const wxPen& pen);
~wxPen() {} ~wxPen() {}

2
include/wx/msw/pen.h
View File

@@ -61,7 +61,7 @@ class WXDLLEXPORT wxPen: public wxGDIObject
DECLARE_DYNAMIC_CLASS(wxPen) DECLARE_DYNAMIC_CLASS(wxPen)
public: public:
wxPen(); wxPen();
wxPen(const wxColour& col, int width, int style); wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
wxPen(const wxBitmap& stipple, int width); wxPen(const wxBitmap& stipple, int width);
inline wxPen(const wxPen& pen) { Ref(pen); } inline wxPen(const wxPen& pen) { Ref(pen); }
~wxPen(); ~wxPen();

6
include/wx/os2/pen.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: pen.h // Name: wx/os2/pen.h
// Purpose: wxPen class // Purpose: wxPen class
// Author: David Webster // Author: David Webster
// Modified by: // Modified by:
@@ -46,8 +46,8 @@ class WXDLLEXPORT wxPen : public wxGDIObject
public: public:
wxPen(); wxPen();
wxPen( const wxColour& rColour wxPen( const wxColour& rColour
,int nWidth ,int nWidth = 1
,int nStyle ,int nStyle = wxSOLID
); );
wxPen( const wxBitmap& rStipple wxPen( const wxBitmap& rStipple
,int nWidth ,int nWidth

4
include/wx/pen.h
View File

@@ -3,12 +3,10 @@
#if defined(__WXMSW__) #if defined(__WXMSW__)
#include "wx/msw/pen.h" #include "wx/msw/pen.h"
#elif defined(__WXMOTIF__) #elif defined(__WXMOTIF__) || defined(__WXX11__)
#include "wx/x11/pen.h" #include "wx/x11/pen.h"
#elif defined(__WXGTK__) #elif defined(__WXGTK__)
#include "wx/gtk/pen.h" #include "wx/gtk/pen.h"
#elif defined(__WXX11__)
#include "wx/x11/pen.h"
#elif defined(__WXMGL__) #elif defined(__WXMGL__)
#include "wx/mgl/pen.h" #include "wx/mgl/pen.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)

2
include/wx/x11/pen.h
View File

@@ -38,7 +38,7 @@ class wxPen: public wxGDIObject
public: public:
wxPen() { } wxPen() { }
wxPen( const wxColour &colour, int width, int style ); wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );
wxPen( const wxBitmap &stipple, int width ); wxPen( const wxBitmap &stipple, int width );
~wxPen(); ~wxPen();