added wxTE_BESTWRAP style (which is the default now); renamed wxTE_LINEWRAP to wxTE_C...

[wxWidgets.git] / include / wx / os2 / pen.h

diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h
index e40ea0e562eb9b4e1734b12e7dce3ae7a70b9061..fe4c3460ef02eb201a439ac14355c4c97e1dbdaf 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


@@ -55,9 +55,12 @@ public:
     inline wxPen(const wxPen& rPen) { Ref(rPen); }
     ~wxPen();
 
     inline wxPen(const wxPen& rPen) { Ref(rPen); }
     ~wxPen();
 

-    inline wxPen& operator =  (const wxPen& rPen) { if (*this == rPen) return (*this); Ref(rPen); return *this; }
-    inline bool   operator == (const wxPen& rPen) { return m_refData == rPen.m_refData; }
-    inline bool   operator != (const wxPen& rPen) { return m_refData != rPen.m_refData; }
+    inline wxPen& operator =  (const wxPen& rPen)
+        { if (*this == rPen) return (*this); Ref(rPen); return *this; }
+    inline bool   operator == (const wxPen& rPen) const
+        { return m_refData == rPen.m_refData; }
+    inline bool   operator != (const wxPen& rPen) const
+        { return m_refData != rPen.m_refData; }

 
     virtual bool Ok(void) const { return (m_refData != NULL); }
 
 
     virtual bool Ok(void) const { return (m_refData != NULL); }
 


@@ -107,5 +110,7 @@ private:
     AREABUNDLE                     m_vAreaBundle;
 }; // end of CLASS wxPen
 
     AREABUNDLE                     m_vAreaBundle;
 }; // end of CLASS wxPen
 

+extern int wx2os2PenStyle(int nWxStyle);
+

 #endif
     // _WX_PEN_H_
 #endif
     // _WX_PEN_H_