MYcopystring is not required anymore when compat2.8 is off

[wxWidgets.git] / interface / wx / pen.h

diff --git a/interface/wx/pen.h b/interface/wx/pen.h
index 02368092d58559316fd74fc0de3e268b2b2abc27..97e940d15ff54f65b135fd7f2b73d22c143c5233 100644 (file)
--- a/interface/wx/pen.h
+++ b/interface/wx/pen.h
@@ -98,7 +98,6 @@ enum wxPenCap
 
 /**
     @class wxPen
 
 /**
     @class wxPen

-    @wxheader{pen.h}

 
     A pen is a drawing tool for drawing outlines. It is used for drawing
     lines and painting the outline of rectangles, ellipses, etc.
 
     A pen is a drawing tool for drawing outlines. It is used for drawing
     lines and painting the outline of rectangles, ellipses, etc.


@@ -163,9 +162,9 @@ public:
             The style may be one of the ::wxPenStyle values.
 
         @remarks Different versions of Windows and different versions of other
             The style may be one of the ::wxPenStyle values.
 
         @remarks Different versions of Windows and different versions of other

-                 platforms support very different subsets of the styles
-                 above - there is no similarity even between Windows95
-                 and Windows98 - so handle with care.
+                 platforms support very different subsets of the styles above
+                 - there is no similarity even between Windows95 and Windows98 -
+                 so handle with care.

 
         @see SetStyle(), SetColour(), SetWidth()
     */
 
         @see SetStyle(), SetColour(), SetWidth()
     */


@@ -180,6 +179,8 @@ public:
         @param stipple
             A stipple bitmap.
 
         @param stipple
             A stipple bitmap.
 

+        @onlyfor{wxmsw,wxmac}
+

         @see SetWidth(), SetStipple()
     */
     wxPen(const wxBitmap& stipple, int width);
         @see SetWidth(), SetStipple()
     */
     wxPen(const wxBitmap& stipple, int width);


@@ -202,7 +203,7 @@ public:
                  pointer to the pen object is stored in an application
                  data structure, and there is a risk of double deletion.
     */
                  pointer to the pen object is stored in an application
                  data structure, and there is a risk of double deletion.
     */

-    ~wxPen();
+    virtual ~wxPen();

 
     /**
         Returns the pen cap style, which may be one of @c wxCAP_ROUND, @c
 
     /**
         Returns the pen cap style, which may be one of @c wxCAP_ROUND, @c


@@ -266,7 +267,7 @@ public:
     /**
         Returns @true if the pen is initialised.
     */
     /**
         Returns @true if the pen is initialised.
     */

-    bool IsOk() const;
+    virtual bool IsOk() const;

 
     /**
         Sets the pen cap style, which may be one of @c wxCAP_ROUND, @c wxCAP_PROJECTING
 
     /**
         Sets the pen cap style, which may be one of @c wxCAP_ROUND, @c wxCAP_PROJECTING


@@ -296,7 +297,7 @@ public:
 
         @see GetDashes()
     */
 
         @see GetDashes()
     */

-    virtual void SetDashes(int n, wxDash* dashes);
+    virtual void SetDashes(int n, const wxDash* dash);

 
     /**
         Sets the pen join style, which may be one of @c wxJOIN_BEVEL, @c wxJOIN_ROUND
 
     /**
         Sets the pen join style, which may be one of @c wxJOIN_BEVEL, @c wxJOIN_ROUND


@@ -313,7 +314,7 @@ public:
 
         @see GetStipple()
     */
 
         @see GetStipple()
     */

-    virtual void SetStipple(wxBitmap* stipple);
+    virtual void SetStipple(const wxBitmap& stipple);

 
     /**
         Set the pen style.
 
     /**
         Set the pen style.


@@ -335,12 +336,12 @@ public:
         See @ref overview_refcount_equality "reference-counted object comparison" for
         more info.
     */
         See @ref overview_refcount_equality "reference-counted object comparison" for
         more info.
     */

-    bool operator !=(const wxPen& pen);
+    bool operator!=(const wxPen& pen) const;

 
     /**
         Assignment operator, using @ref overview_refcount.
     */
 
     /**
         Assignment operator, using @ref overview_refcount.
     */

-    wxPen operator =(const wxPen& pen);
+    wxPen& operator=(const wxPen& pen);

 
     /**
         Equality operator.
 
     /**
         Equality operator.


@@ -348,7 +349,7 @@ public:
         See @ref overview_refcount_equality "reference-counted object comparison" for
         more info.
     */
         See @ref overview_refcount_equality "reference-counted object comparison" for
         more info.
     */

-    bool operator ==(const wxPen& pen);
+    bool operator==(const wxPen& pen) const;

 };
 
 /**
 };
 
 /**


@@ -410,7 +411,6 @@ wxPen* wxLIGHT_GREY_PEN;
 
 /**
     @class wxPenList
 
 /**
     @class wxPenList

-    @wxheader{gdicmn.h}

 
     There is only one instance of this class: ::wxThePenList.
     Use this object to search for a previously created pen of the desired
 
     There is only one instance of this class: ::wxThePenList.
     Use this object to search for a previously created pen of the desired