Add virtual ~wxAnyScrollHelperBase() to fix compiler warning.

[wxWidgets.git] / src / os2 / pen.cpp

diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp
index 3821b69f7dac46dd171c28fee28b27709b732233..bf487ff358e443c992fcb243f11069c230c2e8cb 100644 (file)
--- a/src/os2/pen.cpp
+++ b/src/os2/pen.cpp
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        pen.cpp
+// Name:        src/os2/pen.cpp

 // Purpose:     wxPen
 // Author:      David Webster
 // Modified by:
 // Created:     10/10/99
 // Purpose:     wxPen
 // Author:      David Webster
 // Modified by:
 // Created:     10/10/99

-// RCS-ID:      $Id$

 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,28 +11,86 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/app.h"

 #include "wx/pen.h"
 #include "wx/pen.h"

-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+    #include <stdio.h>
+    #include "wx/list.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/log.h"

 #endif
 
 #include "wx/os2/private.h"
 #endif
 
 #include "wx/os2/private.h"

-#include "assert.h"

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
+class WXDLLIMPEXP_FWD_CORE wxPen;
+
+// ----------------------------------------------------------------------------
+// wxPenRefData: contains information about an HPEN and its handle
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxPenRefData: public wxGDIRefData
+{
+    friend class WXDLLIMPEXP_FWD_CORE wxPen;
+public:
+    wxPenRefData();
+    wxPenRefData(const wxPenRefData& rData);
+    wxPenRefData(const wxColour& col, int width, wxPenStyle style);
+    wxPenRefData(const wxBitmap& stipple, int width);
+    virtual ~wxPenRefData();
+
+    bool operator==(const wxPenRefData& data) const
+    {
+        // we intentionally don't compare m_hPen fields here
+        return m_nStyle == data.m_nStyle &&
+               m_nWidth == data.m_nWidth &&
+               m_nJoin == data.m_nJoin &&
+               m_nCap == data.m_nCap &&
+               m_vColour == data.m_vColour &&
+               (m_nStyle != wxPENSTYLE_STIPPLE || m_vStipple.IsSameAs(data.m_vStipple)) &&
+               (m_nStyle != wxPENSTYLE_USER_DASH ||
+                (m_dash == data.m_dash &&
+                    memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));
+    }
+
+private:
+    // initialize the fields which have reasonable default values
+    //
+    // doesn't initialize m_width and m_style which must be initialize in ctor
+    void Init()
+    {
+        m_nJoin = wxJOIN_ROUND;
+        m_nCap = wxCAP_ROUND;
+        m_nbDash = 0;
+        m_dash = NULL;
+        m_hPen = 0;
+    }
+
+    int                             m_nWidth;
+    wxPenStyle                      m_nStyle;
+    wxPenJoin                       m_nJoin;
+    wxPenCap                        m_nCap;
+    wxBitmap                        m_vStipple;
+    int                             m_nbDash;
+    wxDash *                        m_dash;
+    wxColour                        m_vColour;
+    WXHPEN                          m_hPen;// in OS/2 GPI this will be the PS the pen is associated with
+
+    wxDECLARE_NO_ASSIGN_CLASS(wxPenRefData);
+};
+
+#define M_PENDATA ((wxPenRefData *)m_refData)
+
+// ----------------------------------------------------------------------------
+// wxPenRefData ctors/dtor
+// ----------------------------------------------------------------------------

 
 wxPenRefData::wxPenRefData()
 {
 
 wxPenRefData::wxPenRefData()
 {

-    m_nStyle  = wxSOLID;
+    Init();
+
+    m_nStyle  = wxPENSTYLE_SOLID;

     m_nWidth  = 1;
     m_nWidth  = 1;

-    m_nJoin   = wxJOIN_ROUND ;
-    m_nCap    = wxCAP_ROUND ;
-    m_hPen    = 0L;

 } // end of wxPenRefData::wxPenRefData
 
 wxPenRefData::wxPenRefData(
 } // end of wxPenRefData::wxPenRefData
 
 wxPenRefData::wxPenRefData(


@@ -44,73 +101,83 @@ wxPenRefData::wxPenRefData(
     m_nWidth  = rData.m_nWidth;
     m_nJoin   = rData.m_nJoin;
     m_nCap    = rData.m_nCap;
     m_nWidth  = rData.m_nWidth;
     m_nJoin   = rData.m_nJoin;
     m_nCap    = rData.m_nCap;

+    m_nbDash  = rData.m_nbDash;
+    m_dash    = rData.m_dash;

     m_vColour = rData.m_vColour;
     m_hPen    = 0L;
 } // end of wxPenRefData::wxPenRefData
 
     m_vColour = rData.m_vColour;
     m_hPen    = 0L;
 } // end of wxPenRefData::wxPenRefData
 

-wxPenRefData::~wxPenRefData()
+wxPenRefData::wxPenRefData(const wxColour& col, int width, wxPenStyle style)

 {
 {

-} // end of wxPenRefData::~wxPenRefData
+    Init();

 
 

-//
-// Pens
-//
-wxPen::wxPen()
+    m_nStyle = style;
+    m_nWidth = width;
+
+    m_vColour = col;
+}
+
+wxPenRefData::wxPenRefData(const wxBitmap& stipple, int width)

 {
 {

-    if ( wxThePenList )
-        wxThePenList->AddPen(this);
-} // end of wxPen::wxPen
+    Init();
+
+    m_nStyle = wxPENSTYLE_STIPPLE;
+    m_nWidth = width;
+
+    m_vStipple = stipple;
+}

 
 

-wxPen::~wxPen()
+wxPenRefData::~wxPenRefData()

 {
 {

-    if (wxThePenList)
-        wxThePenList->RemovePen(this);
-} // end of wxPen::wxPen
+} // end of wxPenRefData::~wxPenRefData
+
+// ----------------------------------------------------------------------------
+// wxPen
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)

 
 

-// Should implement Create

 wxPen::wxPen(
   const wxColour&                   rColour
 , int                               nWidth
 wxPen::wxPen(
   const wxColour&                   rColour
 , int                               nWidth

-, int                               nStyle
+, wxPenStyle                        nStyle

 )
 {
 )
 {

-    m_refData = new wxPenRefData;
-
-    M_PENDATA->m_vColour = rColour;
-    M_PENDATA->m_nWidth  = nWidth;
-    M_PENDATA->m_nStyle  = nStyle;
-    M_PENDATA->m_nJoin   = wxJOIN_ROUND ;
-    M_PENDATA->m_nCap    = wxCAP_ROUND ;
-    M_PENDATA->m_hPen    = 0L;
+    m_refData = new wxPenRefData(rColour, nWidth, nStyle);

 
     RealizeResource();
 
     RealizeResource();

-
-    if ( wxThePenList )
-        wxThePenList->AddPen(this);

 } // end of wxPen::wxPen
 
 } // end of wxPen::wxPen
 

+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxPen::wxPen(const wxColour& colour, int width, int style)
+{
+    m_refData = new wxPenRefData(colour, width, (wxPenStyle)style);
+
+    RealizeResource();
+}
+#endif
+

 wxPen::wxPen(
   const wxBitmap&                   rStipple
 , int                               nWidth
 )
 {
 wxPen::wxPen(
   const wxBitmap&                   rStipple
 , int                               nWidth
 )
 {

-    m_refData = new wxPenRefData;
-
-    M_PENDATA->m_vStipple = rStipple;
-    M_PENDATA->m_nWidth   = nWidth;
-    M_PENDATA->m_nStyle   = wxSTIPPLE;
-    M_PENDATA->m_nJoin    = wxJOIN_ROUND ;
-    M_PENDATA->m_nCap     = wxCAP_ROUND ;
-    M_PENDATA->m_hPen     = 0;
+    m_refData = new wxPenRefData (rStipple, nWidth);

 
     RealizeResource();
 
     RealizeResource();

-
-    if ( wxThePenList )
-        wxThePenList->AddPen(this);

 } // end of wxPen::wxPen
 
 } // end of wxPen::wxPen
 

+bool wxPen::operator==(const wxPen& pen) const
+{
+    const wxPenRefData *
+        penData = static_cast<const wxPenRefData *>(pen.m_refData);
+
+    // an invalid pen is only equal to another invalid pen
+    return m_refData ? penData && *M_PENDATA == *penData : !penData;
+}
+

 int wx2os2PenStyle(
 int wx2os2PenStyle(

-  int                               nWxStyle
+  wxPenStyle                               nWxStyle

 );
 
 bool wxPen::RealizeResource()
 );
 
 bool wxPen::RealizeResource()


@@ -151,16 +218,16 @@ bool wxPen::RealizeResource()
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);

-            wxLogError(_T("Unable to set current color table to RGB mode. Error: %s\n"), sError.c_str());
-            return FALSE;
+            wxLogError(wxT("Unable to set current color table to RGB mode. Error: %s\n"), sError.c_str());
+            return false;

         }
         }

-        if (M_PENDATA->m_nStyle == wxTRANSPARENT)
+        if (M_PENDATA->m_nStyle == wxPENSTYLE_TRANSPARENT)

         {
         {

-            return TRUE;
+            return true;

         }
 
         }
 

-        COLORREF                    vPmColour = 0L;
-        USHORT                      uLineType = wx2os2PenStyle(M_PENDATA->m_nStyle);
+        COLORREF vPmColour = 0L;
+        USHORT   uLineType = (USHORT)wx2os2PenStyle(M_PENDATA->m_nStyle);

 
         vPmColour = M_PENDATA->m_vColour.GetPixel();
 
 
         vPmColour = M_PENDATA->m_vColour.GetPixel();
 


@@ -199,6 +266,8 @@ bool wxPen::RealizeResource()
         }
         m_vLineBundle.lColor     = (LONG)vPmColour;
         m_vLineBundle.usMixMode  = FM_OVERPAINT;
         }
         m_vLineBundle.lColor     = (LONG)vPmColour;
         m_vLineBundle.usMixMode  = FM_OVERPAINT;

+        if (M_PENDATA->m_nWidth < 1)
+            M_PENDATA->m_nWidth = 1;

         m_vLineBundle.fxWidth    = M_PENDATA->m_nWidth;
         m_vLineBundle.lGeomWidth = M_PENDATA->m_nWidth;
         m_vLineBundle.usType     = uLineType;
         m_vLineBundle.fxWidth    = M_PENDATA->m_nWidth;
         m_vLineBundle.lGeomWidth = M_PENDATA->m_nWidth;
         m_vLineBundle.usType     = uLineType;


@@ -215,15 +284,15 @@ bool wxPen::RealizeResource()
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);

-            wxLogError(_T("Can't set Gpi attributes for a LINEBUNDLE. Error: %s\n"), sError.c_str());
-            return FALSE;
+            wxLogError(wxT("Can't set Gpi attributes for a LINEBUNDLE. Error: %s\n"), sError.c_str());
+            return false;

         }
 
         ULONG                           flAttrMask = 0L;
         ULONG                           flDefMask = 0L;
         switch(M_PENDATA->m_nStyle)
         {
         }
 
         ULONG                           flAttrMask = 0L;
         ULONG                           flDefMask = 0L;
         switch(M_PENDATA->m_nStyle)
         {

-            case wxSTIPPLE:
+            case wxPENSTYLE_STIPPLE:

                 ::GpiSetBitmapId( M_PENDATA->m_hPen
                                  ,(USHORT)M_PENDATA->m_vStipple.GetHBITMAP()
                                  ,(USHORT)M_PENDATA->m_vStipple.GetId()
                 ::GpiSetBitmapId( M_PENDATA->m_hPen
                                  ,(USHORT)M_PENDATA->m_vStipple.GetHBITMAP()
                                  ,(USHORT)M_PENDATA->m_vStipple.GetId()


@@ -235,42 +304,42 @@ bool wxPen::RealizeResource()
                 flDefMask = ABB_REF_POINT;
                 break;
 
                 flDefMask = ABB_REF_POINT;
                 break;
 

-            case wxBDIAGONAL_HATCH:
+            case wxPENSTYLE_BDIAGONAL_HATCH:

                 m_vAreaBundle.usSymbol = PATSYM_DIAG3;
                 m_vAreaBundle.usSet = LCID_DEFAULT;
                 flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL;
                 flDefMask = ABB_SET | ABB_REF_POINT;
                 break;
 
                 m_vAreaBundle.usSymbol = PATSYM_DIAG3;
                 m_vAreaBundle.usSet = LCID_DEFAULT;
                 flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL;
                 flDefMask = ABB_SET | ABB_REF_POINT;
                 break;
 

-            case wxCROSSDIAG_HATCH:
+            case wxPENSTYLE_CROSSDIAG_HATCH:

                 m_vAreaBundle.usSymbol = PATSYM_DIAGHATCH;
                 m_vAreaBundle.usSet = LCID_DEFAULT;
                 flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL;
                 flDefMask = ABB_SET | ABB_REF_POINT;
                 break;
 
                 m_vAreaBundle.usSymbol = PATSYM_DIAGHATCH;
                 m_vAreaBundle.usSet = LCID_DEFAULT;
                 flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL;
                 flDefMask = ABB_SET | ABB_REF_POINT;
                 break;
 

-            case wxFDIAGONAL_HATCH:
+            case wxPENSTYLE_FDIAGONAL_HATCH:

                 m_vAreaBundle.usSymbol = PATSYM_DIAG1;
                 m_vAreaBundle.usSet = LCID_DEFAULT;
                 flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL;
                 flDefMask = ABB_SET | ABB_REF_POINT;
                 break;
 
                 m_vAreaBundle.usSymbol = PATSYM_DIAG1;
                 m_vAreaBundle.usSet = LCID_DEFAULT;
                 flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL;
                 flDefMask = ABB_SET | ABB_REF_POINT;
                 break;
 

-            case wxCROSS_HATCH:
+            case wxPENSTYLE_CROSS_HATCH:

                 m_vAreaBundle.usSymbol = PATSYM_HATCH;
                 m_vAreaBundle.usSet = LCID_DEFAULT;
                 flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL;
                 flDefMask = ABB_SET | ABB_REF_POINT;
                 break;
 
                 m_vAreaBundle.usSymbol = PATSYM_HATCH;
                 m_vAreaBundle.usSet = LCID_DEFAULT;
                 flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL;
                 flDefMask = ABB_SET | ABB_REF_POINT;
                 break;
 

-            case wxHORIZONTAL_HATCH:
+            case wxPENSTYLE_HORIZONTAL_HATCH:

                 m_vAreaBundle.usSymbol = PATSYM_HORIZ;
                 m_vAreaBundle.usSet = LCID_DEFAULT;
                 flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL;
                 flDefMask = ABB_SET | ABB_REF_POINT;
                 break;
 
                 m_vAreaBundle.usSymbol = PATSYM_HORIZ;
                 m_vAreaBundle.usSet = LCID_DEFAULT;
                 flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL;
                 flDefMask = ABB_SET | ABB_REF_POINT;
                 break;
 

-            case wxVERTICAL_HATCH:
+            case wxPENSTYLE_VERTICAL_HATCH:

                 m_vAreaBundle.usSymbol = PATSYM_VERT;
                 m_vAreaBundle.usSet = LCID_DEFAULT;
                 flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL;
                 m_vAreaBundle.usSymbol = PATSYM_VERT;
                 m_vAreaBundle.usSet = LCID_DEFAULT;
                 flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL;


@@ -300,14 +369,15 @@ bool wxPen::RealizeResource()
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);

-            wxLogError(_T("Can't set Gpi attributes for an AREABUNDLE. Error: %s\n"), sError.c_str());
+            wxLogError(wxT("Can't set Gpi attributes for an AREABUNDLE. Error: %s\n"), sError.c_str());

         }
         }

-        return bOk;
+
+        return (bool)bOk;

     }
     }

-    return FALSE;
+    return false;

 } // end of wxPen::RealizeResource
 
 } // end of wxPen::RealizeResource
 

-WXHANDLE wxPen::GetResourceHandle()
+WXHANDLE wxPen::GetResourceHandle() const

 {
     if (!M_PENDATA)
         return 0;
 {
     if (!M_PENDATA)
         return 0;


@@ -315,16 +385,14 @@ WXHANDLE wxPen::GetResourceHandle()
         return (WXHANDLE)M_PENDATA->m_hPen;
 } // end of wxPen::GetResourceHandle
 
         return (WXHANDLE)M_PENDATA->m_hPen;
 } // end of wxPen::GetResourceHandle
 

-bool wxPen::FreeResource(
-  bool                              bForce
-)
+bool wxPen::FreeResource( bool WXUNUSED(bForce) )

 {
     if (M_PENDATA && (M_PENDATA->m_hPen != 0))
     {
         M_PENDATA->m_hPen = 0;
 {
     if (M_PENDATA && (M_PENDATA->m_hPen != 0))
     {
         M_PENDATA->m_hPen = 0;

-        return TRUE;
+        return true;

     }
     }

-    else return FALSE;
+    else return false;

 } // end of wxPen::FreeResource
 
 bool wxPen::IsFree() const
 } // end of wxPen::FreeResource
 
 bool wxPen::IsFree() const


@@ -332,46 +400,33 @@ bool wxPen::IsFree() const
     return (M_PENDATA && M_PENDATA->m_hPen == 0);
 }
 
     return (M_PENDATA && M_PENDATA->m_hPen == 0);
 }
 

-void wxPen::Unshare()
+wxGDIRefData* wxPen::CreateGDIRefData() const

 {
 {

-    // Don't change shared data
-    if (!m_refData)
-    {
-        m_refData = new wxPenRefData();
-    }
-    else
-    {
-        wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData);
-        UnRef();
-        m_refData = ref;
-    }
-} // end of wxPen::Unshare
+    return new wxPenRefData;
+}

 
 

-void wxPen::SetColour(
-  const wxColour&                   rColour
-)
+wxGDIRefData* wxPen::CloneGDIRefData(const wxGDIRefData* data) const
+{
+    return new wxPenRefData(*static_cast<const wxPenRefData*>(data));
+}
+
+void wxPen::SetColour( const wxColour& rColour )

 {
 {

-    Unshare();
+    AllocExclusive();

     M_PENDATA->m_vColour = rColour;
     RealizeResource();
 } // end of wxPen::SetColour
 
     M_PENDATA->m_vColour = rColour;
     RealizeResource();
 } // end of wxPen::SetColour
 

-void wxPen::SetColour(
-  unsigned char                     cRed
-, unsigned char                     cGreen
-, unsigned char                     cBlue
-)
+void wxPen::SetColour( unsigned char cRed, unsigned char cGreen, unsigned char cBlue)

 {
 {

-    Unshare();
+    AllocExclusive();

     M_PENDATA->m_vColour.Set(cRed, cGreen, cBlue);
     RealizeResource();
 } // end of wxPen::SetColour
 
     M_PENDATA->m_vColour.Set(cRed, cGreen, cBlue);
     RealizeResource();
 } // end of wxPen::SetColour
 

-void wxPen::SetPS(
-  HPS                               hPS
-)
+void wxPen::SetPS( HPS hPS )

 {
 {

-    Unshare();
+    AllocExclusive();

     if (M_PENDATA->m_hPen)
         ::GpiDestroyPS(M_PENDATA->m_hPen);
     M_PENDATA->m_hPen = hPS;
     if (M_PENDATA->m_hPen)
         ::GpiDestroyPS(M_PENDATA->m_hPen);
     M_PENDATA->m_hPen = hPS;


@@ -382,16 +437,16 @@ void wxPen::SetWidth(
   int                               nWidth
 )
 {
   int                               nWidth
 )
 {

-    Unshare();
+    AllocExclusive();

     M_PENDATA->m_nWidth = nWidth;
     RealizeResource();
 } // end of wxPen::SetWidth
 
 void wxPen::SetStyle(
     M_PENDATA->m_nWidth = nWidth;
     RealizeResource();
 } // end of wxPen::SetWidth
 
 void wxPen::SetStyle(

-  int                               nStyle
+  wxPenStyle                               nStyle

 )
 {
 )
 {

-    Unshare();
+    AllocExclusive();

     M_PENDATA->m_nStyle = nStyle;
     RealizeResource();
 } // end of wxPen::SetStyle
     M_PENDATA->m_nStyle = nStyle;
     RealizeResource();
 } // end of wxPen::SetStyle


@@ -400,16 +455,14 @@ void wxPen::SetStipple(
   const wxBitmap&                   rStipple
 )
 {
   const wxBitmap&                   rStipple
 )
 {

-    Unshare();
+    AllocExclusive();

     M_PENDATA->m_vStipple = rStipple;
     M_PENDATA->m_vStipple = rStipple;

-    M_PENDATA->m_nStyle = wxSTIPPLE;
+    M_PENDATA->m_nStyle = wxPENSTYLE_STIPPLE;

     RealizeResource();
 } // end of wxPen::SetStipple
 
     RealizeResource();
 } // end of wxPen::SetStipple
 

-void wxPen::SetDashes(
-  int                               nNbDashes
-, const wxDash*                     pDash
-)
+void wxPen::SetDashes( int WXUNUSED(nNbDashes),
+                       const wxDash* WXUNUSED(pDash) )

 {
     //
     // Does nothing under OS/2
 {
     //
     // Does nothing under OS/2


@@ -417,61 +470,130 @@ void wxPen::SetDashes(
 } // end of wxPen::SetDashes
 
 void wxPen::SetJoin(
 } // end of wxPen::SetDashes
 
 void wxPen::SetJoin(

-  int                               nJoin
+  wxPenJoin                               nJoin

 )
 {
 )
 {

-    Unshare();
+    AllocExclusive();

     M_PENDATA->m_nJoin = nJoin;
     RealizeResource();
 } // end of wxPen::SetJoin
 
 void wxPen::SetCap(
     M_PENDATA->m_nJoin = nJoin;
     RealizeResource();
 } // end of wxPen::SetJoin
 
 void wxPen::SetCap(

-  int                               nCap
+  wxPenCap                               nCap

 )
 {
 )
 {

-    Unshare();
+    AllocExclusive();

     M_PENDATA->m_nCap = nCap;
     RealizeResource();
 } // end of wxPen::SetCap
 
     M_PENDATA->m_nCap = nCap;
     RealizeResource();
 } // end of wxPen::SetCap
 

+wxColour wxPen::GetColour() const
+{
+    wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid pen") );
+
+    return M_PENDATA->m_vColour;
+}
+
+int wxPen::GetWidth() const
+{
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
+
+    return M_PENDATA->m_nWidth;
+}
+
+wxPenStyle wxPen::GetStyle() const
+{
+    wxCHECK_MSG( IsOk(), wxPENSTYLE_INVALID, wxT("invalid pen") );
+
+    return M_PENDATA->m_nStyle;
+}
+
+wxPenJoin wxPen::GetJoin() const
+{
+    wxCHECK_MSG( IsOk(), wxJOIN_INVALID, wxT("invalid pen") );
+
+    return M_PENDATA->m_nJoin;
+}
+
+wxPenCap wxPen::GetCap() const
+{
+    wxCHECK_MSG( IsOk(), wxCAP_INVALID, wxT("invalid pen") );
+
+    return M_PENDATA->m_nCap;
+}
+
+int wxPen::GetPS() const
+{
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid pen") );
+
+    return M_PENDATA->m_hPen;
+}
+
+int wxPen::GetDashes(wxDash** ptr) const
+{
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
+
+    *ptr = M_PENDATA->m_dash;
+    return M_PENDATA->m_nbDash;
+}
+
+wxDash* wxPen::GetDash() const
+{
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") );
+
+    return M_PENDATA->m_dash;
+}
+
+int wxPen::GetDashCount() const
+{
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
+
+    return M_PENDATA->m_nbDash;
+}
+
+wxBitmap* wxPen::GetStipple() const
+{
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") );
+
+    return &(M_PENDATA->m_vStipple);
+}
+

 int wx2os2PenStyle(
 int wx2os2PenStyle(

-  int                               nWxStyle
+  wxPenStyle                               nWxStyle

 )
 {
     int                             nPMStyle = 0;
 
     switch (nWxStyle)
     {
 )
 {
     int                             nPMStyle = 0;
 
     switch (nWxStyle)
     {

-        case wxDOT:
+        case wxPENSTYLE_DOT:

             nPMStyle = LINETYPE_DOT;
             break;
 
             nPMStyle = LINETYPE_DOT;
             break;
 

-        case wxDOT_DASH:
+        case wxPENSTYLE_DOT_DASH:

             nPMStyle = LINETYPE_DASHDOT;
             break;
 
             nPMStyle = LINETYPE_DASHDOT;
             break;
 

-        case wxSHORT_DASH:
+        case wxPENSTYLE_SHORT_DASH:

             nPMStyle = LINETYPE_SHORTDASH;
             break;
 
             nPMStyle = LINETYPE_SHORTDASH;
             break;
 

-        case wxLONG_DASH:
+        case wxPENSTYLE_LONG_DASH:

             nPMStyle = LINETYPE_LONGDASH;
             break;
 
             nPMStyle = LINETYPE_LONGDASH;
             break;
 

-        case wxTRANSPARENT:
+        case wxPENSTYLE_TRANSPARENT:

             nPMStyle = LINETYPE_INVISIBLE;
             break;
 
             nPMStyle = LINETYPE_INVISIBLE;
             break;
 

-        case wxUSER_DASH:
+        case wxPENSTYLE_USER_DASH:

             nPMStyle = LINETYPE_DASHDOUBLEDOT; // We must make a choice... This is mine!
             break;
 
             nPMStyle = LINETYPE_DASHDOUBLEDOT; // We must make a choice... This is mine!
             break;
 

-        case wxSOLID:
+        case wxPENSTYLE_SOLID:

         default:
             nPMStyle = LINETYPE_SOLID;
             break;
     }
     return nPMStyle;
 } // end of wx2os2PenStyle
         default:
             nPMStyle = LINETYPE_SOLID;
             break;
     }
     return nPMStyle;
 } // end of wx2os2PenStyle

-
-