build fix (looking at buildbot)

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

diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp
index 407924864227667184754b9eb33bacb3064d43e4..711a62a679fba745badbe59a45119d1aba032d0f 100644 (file)
--- a/src/os2/pen.cpp
+++ b/src/os2/pen.cpp
@@ -71,7 +71,7 @@ wxPen::~wxPen()
 wxPen::wxPen(
   const wxColour&                   rColour
 , int                               nWidth
 wxPen::wxPen(
   const wxColour&                   rColour
 , int                               nWidth

-, int                               nStyle
+, wxPenStyle                        nStyle

 )
 {
     m_refData = new wxPenRefData;
 )
 {
     m_refData = new wxPenRefData;


@@ -86,6 +86,20 @@ wxPen::wxPen(
     RealizeResource();
 } // end of wxPen::wxPen
 
     RealizeResource();
 } // end of wxPen::wxPen
 

+wxPen::wxPen(const wxColour& colour, int width, wxBrushStyle style)
+{
+    m_refData = new wxPenRefData;
+
+    M_PENDATA->m_vColour = colour;
+    M_PENDATA->m_nWidth  = width;
+    M_PENDATA->m_nStyle  = (wxPenStyle)nStyle;
+    M_PENDATA->m_nJoin   = wxJOIN_ROUND ;
+    M_PENDATA->m_nCap    = wxCAP_ROUND ;
+    M_PENDATA->m_hPen    = 0L;
+
+    RealizeResource();
+}
+

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


@@ -104,7 +118,7 @@ wxPen::wxPen(
 } // end of wxPen::wxPen
 
 int wx2os2PenStyle(
 } // end of wxPen::wxPen
 
 int wx2os2PenStyle(

-  int                               nWxStyle
+  wxPenStyle                               nWxStyle

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


@@ -304,7 +318,7 @@ bool wxPen::RealizeResource()
     return false;
 } // end of wxPen::RealizeResource
 
     return false;
 } // end of wxPen::RealizeResource
 

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

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


@@ -327,38 +341,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;
+}
+
+wxGDIRefData* wxPen::CloneGDIRefData(const wxGDIRefData* data) const
+{
+    return new wxPenRefData(*wx_static_cast(const wxPenRefData*, data));
+}

 
 void wxPen::SetColour( const wxColour& rColour )
 {
 
 void wxPen::SetColour( const wxColour& rColour )
 {

-    Unshare();
+    AllocExclusive();

     M_PENDATA->m_vColour = rColour;
     RealizeResource();
 } // end of wxPen::SetColour
 
 void wxPen::SetColour( unsigned char cRed, unsigned char cGreen, unsigned char cBlue)
 {
     M_PENDATA->m_vColour = rColour;
     RealizeResource();
 } // end of wxPen::SetColour
 
 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
 
 void wxPen::SetPS( HPS hPS )
 {
     M_PENDATA->m_vColour.Set(cRed, cGreen, cBlue);
     RealizeResource();
 } // end of wxPen::SetColour
 
 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;


@@ -369,16 +378,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


@@ -387,7 +396,7 @@ void wxPen::SetStipple(
   const wxBitmap&                   rStipple
 )
 {
   const wxBitmap&                   rStipple
 )
 {

-    Unshare();
+    AllocExclusive();

     M_PENDATA->m_vStipple = rStipple;
     M_PENDATA->m_nStyle = wxSTIPPLE;
     RealizeResource();
     M_PENDATA->m_vStipple = rStipple;
     M_PENDATA->m_nStyle = wxSTIPPLE;
     RealizeResource();


@@ -402,25 +411,25 @@ void wxPen::SetDashes( int WXUNUSED(nNbDashes),
 } // 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
 
 int wx2os2PenStyle(
     M_PENDATA->m_nCap = nCap;
     RealizeResource();
 } // end of wxPen::SetCap
 
 int wx2os2PenStyle(

-  int                               nWxStyle
+  wxPenStyle                               nWxStyle

 )
 {
     int                             nPMStyle = 0;
 )
 {
     int                             nPMStyle = 0;