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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/pen.tex b/docs/latex/wx/pen.tex
index 86516c0081c9412264051717474b325d9b0cd182..04dfafb1bf67e5f30cdc1e072cfd712d81ba9711 100644 (file)
--- a/docs/latex/wx/pen.tex
+++ b/docs/latex/wx/pen.tex
@@ -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
 return false.
 
 Default constructor. The pen will be uninitialised, and \helpref{wxPen::Ok}{wxpenok} will
 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.
 

diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h
index 3ee44368e24aa1c08a8861e9669d28cca11aa2a5..461950255dfd56eaf42317158f26b95712586dd4 100644 (file)
--- a/include/wx/gtk/pen.h
+++ b/include/wx/gtk/pen.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        pen.h
+// Name:        wx/gtk/pen.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -42,7 +42,7 @@ class wxPen: public wxGDIObject
 public:
     wxPen() { }
     
 public:
     wxPen() { }
     

-    wxPen( const wxColour &colour, int width, int style );
+    wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );

     ~wxPen();
     
     wxPen( const wxPen& pen )
     ~wxPen();
     
     wxPen( const wxPen& pen )

diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h
index 3ee44368e24aa1c08a8861e9669d28cca11aa2a5..461950255dfd56eaf42317158f26b95712586dd4 100644 (file)
--- a/include/wx/gtk1/pen.h
+++ b/include/wx/gtk1/pen.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        pen.h
+// Name:        wx/gtk/pen.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -42,7 +42,7 @@ class wxPen: public wxGDIObject
 public:
     wxPen() { }
     
 public:
     wxPen() { }
     

-    wxPen( const wxColour &colour, int width, int style );
+    wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );

     ~wxPen();
     
     wxPen( const wxPen& pen )
     ~wxPen();
     
     wxPen( const wxPen& pen )

diff --git a/include/wx/mac/pen.h b/include/wx/mac/pen.h
index ca48f977ac7f95c56a3bb44e56b1d8356c6d8cb2..bf10157048b25b44574fbcca24ab7fcbdbdc91bc 100644 (file)
--- a/include/wx/mac/pen.h
+++ b/include/wx/mac/pen.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        pen.h
+// Name:        wx/mac/pen.h

 // Purpose:     wxPen class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxPen class
 // Author:      Stefan Csomor
 // Modified by:


@@ -54,7 +54,7 @@ class WXDLLEXPORT wxPen: public wxGDIObject
   DECLARE_DYNAMIC_CLASS(wxPen)
 public:
   wxPen();
   DECLARE_DYNAMIC_CLASS(wxPen)
 public:
   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 wxPen& pen)
       : wxGDIObject()
   wxPen(const wxBitmap& stipple, int width);
   wxPen(const wxPen& pen)
       : wxGDIObject()

diff --git a/include/wx/mgl/pen.h b/include/wx/mgl/pen.h
index d6e5f02d1d405aab6dd88739c7bb5914737f399b..974edb4872fbea4f8eca1e746779376fa49ce8c6 100644 (file)
--- a/include/wx/mgl/pen.h
+++ b/include/wx/mgl/pen.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        pen.h
+// Name:        wx/mgl/pen.h

 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$


@@ -36,7 +36,7 @@ class WXDLLEXPORT wxPen: public wxGDIObject
 {
 public:
     wxPen() {}
 {
 public:
     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 wxPen& pen);
     ~wxPen() {}
     wxPen(const wxBitmap& stipple, int width);
     wxPen(const wxPen& pen);
     ~wxPen() {}

diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h
index 07325f94a4d15a9a5493c1a5035d61010cc57d7d..41d7ae761c0c33a4e820b9f6c6b382284197ffb4 100644 (file)
--- a/include/wx/msw/pen.h
+++ b/include/wx/msw/pen.h
@@ -61,7 +61,7 @@ class WXDLLEXPORT wxPen: public wxGDIObject
   DECLARE_DYNAMIC_CLASS(wxPen)
 public:
   wxPen();
   DECLARE_DYNAMIC_CLASS(wxPen)
 public:
   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);
   inline wxPen(const wxPen& pen) { Ref(pen); }
   ~wxPen();
   wxPen(const wxBitmap& stipple, int width);
   inline wxPen(const wxPen& pen) { Ref(pen); }
   ~wxPen();

diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h
index cc24520fb3ad0a91bff0f0e473dd94e74958124a..dfee541b9bb470b0888541ad7c044c0078a42dd9 100644 (file)
--- a/include/wx/os2/pen.h
+++ b/include/wx/os2/pen.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        pen.h
+// Name:        wx/os2/pen.h

 // Purpose:     wxPen class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxPen class
 // Author:      David Webster
 // Modified by:


@@ -46,8 +46,8 @@ class WXDLLEXPORT wxPen : public wxGDIObject
 public:
     wxPen();
     wxPen( const wxColour& rColour
 public:
     wxPen();
     wxPen( const wxColour& rColour

-          ,int             nWidth
-          ,int             nStyle
+          ,int             nWidth = 1
+          ,int             nStyle = wxSOLID

          );
     wxPen( const wxBitmap& rStipple
           ,int             nWidth
          );
     wxPen( const wxBitmap& rStipple
           ,int             nWidth

diff --git a/include/wx/pen.h b/include/wx/pen.h
index 9a5fb32e1cc44bd18ac26a82e5623b3862d7283b..f1202f58fbc888e75dde234a5614d29434615dc1 100644 (file)
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -3,12 +3,10 @@
 
 #if defined(__WXMSW__)
 #include "wx/msw/pen.h"
 
 #if defined(__WXMSW__)
 #include "wx/msw/pen.h"

-#elif defined(__WXMOTIF__)
+#elif defined(__WXMOTIF__) || defined(__WXX11__)

 #include "wx/x11/pen.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/pen.h"
 #include "wx/x11/pen.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/pen.h"

-#elif defined(__WXX11__)
-#include "wx/x11/pen.h"

 #elif defined(__WXMGL__)
 #include "wx/mgl/pen.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXMGL__)
 #include "wx/mgl/pen.h"
 #elif defined(__WXMAC__)

diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h
index 79b8c0b683d53d16cf08c52ca3fb43c5457b2b7c..86151f9db4fd1f1940c01430cffb191710357e41 100644 (file)
--- a/include/wx/x11/pen.h
+++ b/include/wx/x11/pen.h
@@ -38,7 +38,7 @@ class wxPen: public wxGDIObject
 public:
     wxPen() { }
     
 public:
     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();
     
     wxPen( const wxBitmap &stipple, int width );
     ~wxPen();