X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d854fa93f8f5a48e383395060063a7931bf0207..cc6e1a74b9b92b6da90e361df4260f6ceb8ce51e:/src/os2/pen.cpp diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp index 58fc0fe2b0..5c3ed2e24d 100644 --- a/src/os2/pen.cpp +++ b/src/os2/pen.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: pen.cpp +// Name: src/os2/pen.cpp // Purpose: wxPen // Author: David Webster // Modified by: @@ -12,13 +12,14 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifndef WX_PRECOMP -#include -#include "wx/setup.h" -#include "wx/list.h" -#include "wx/utils.h" -#include "wx/app.h" #include "wx/pen.h" + +#ifndef WX_PRECOMP + #include + #include "wx/list.h" + #include "wx/utils.h" + #include "wx/app.h" + #include "wx/log.h" #endif #include "wx/os2/private.h" @@ -28,10 +29,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) wxPenRefData::wxPenRefData() { - m_nStyle = wxSOLID; + m_nStyle = wxPENSTYLE_SOLID; m_nWidth = 1; m_nJoin = wxJOIN_ROUND ; m_nCap = wxCAP_ROUND ; + m_nbDash = 0 ; + m_dash = (wxDash*)NULL; m_hPen = 0L; } // end of wxPenRefData::wxPenRefData @@ -43,6 +46,8 @@ wxPenRefData::wxPenRefData( 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 @@ -56,21 +61,17 @@ wxPenRefData::~wxPenRefData() // wxPen::wxPen() { - if ( wxThePenList ) - wxThePenList->AddPen(this); } // end of wxPen::wxPen wxPen::~wxPen() { - if (wxThePenList) - wxThePenList->RemovePen(this); } // end of wxPen::wxPen // Should implement Create wxPen::wxPen( const wxColour& rColour , int nWidth -, int nStyle +, wxPenStyle nStyle ) { m_refData = new wxPenRefData; @@ -83,11 +84,24 @@ wxPen::wxPen( M_PENDATA->m_hPen = 0L; RealizeResource(); - - if ( wxThePenList ) - wxThePenList->AddPen(this); } // end of wxPen::wxPen +#if FUTURE_WXWIN_COMPATIBILITY_3_0 +wxPen::wxPen(const wxColour& colour, int width, int 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(); +} +#endif + wxPen::wxPen( const wxBitmap& rStipple , int nWidth @@ -103,11 +117,12 @@ wxPen::wxPen( M_PENDATA->m_hPen = 0; RealizeResource(); - - if ( wxThePenList ) - wxThePenList->AddPen(this); } // end of wxPen::wxPen +int wx2os2PenStyle( + wxPenStyle nWxStyle +); + bool wxPen::RealizeResource() { BOOL bOk; @@ -146,16 +161,16 @@ bool wxPen::RealizeResource() { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); - wxLogError("Unable to set current color table to RGB mode. Error: %s\n", sError); - return FALSE; + wxLogError(_T("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(); @@ -194,6 +209,8 @@ bool wxPen::RealizeResource() } 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; @@ -210,13 +227,15 @@ bool wxPen::RealizeResource() { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); - wxLogError("Can't set Gpi attributes for a LINEBUNDLE. Error: %s\n", sError); - return FALSE; + wxLogError(_T("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) { - case wxSTIPPLE: + case wxPENSTYLE_STIPPLE: ::GpiSetBitmapId( M_PENDATA->m_hPen ,(USHORT)M_PENDATA->m_vStipple.GetHBITMAP() ,(USHORT)M_PENDATA->m_vStipple.GetId() @@ -224,41 +243,57 @@ bool wxPen::RealizeResource() ::GpiSetPatternSet( M_PENDATA->m_hPen ,(USHORT)M_PENDATA->m_vStipple.GetId() ); + flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SET | ABB_SYMBOL; + 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; - 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; - 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; - 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; - 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; - 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; + flDefMask = ABB_SET | ABB_REF_POINT; break; default: m_vAreaBundle.usSymbol = PATSYM_SOLID; 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; } @@ -269,23 +304,23 @@ bool wxPen::RealizeResource() bOk = ::GpiSetAttrs( M_PENDATA->m_hPen ,PRIM_AREA - ,ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | - ABB_SET | ABB_SYMBOL - ,ABB_REF_POINT + ,flAttrMask + ,flDefMask ,&m_vAreaBundle ); if (!bOk) { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); - wxLogError("Can't set Gpi attributes for an AREABUNDLE. Error: %s\n", sError); + wxLogError(_T("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 -WXHANDLE wxPen::GetResourceHandle() +WXHANDLE wxPen::GetResourceHandle() const { if (!M_PENDATA) return 0; @@ -293,16 +328,14 @@ WXHANDLE 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; - return TRUE; + return true; } - else return FALSE; + else return false; } // end of wxPen::FreeResource bool wxPen::IsFree() const @@ -310,46 +343,33 @@ bool wxPen::IsFree() const 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 { - Unshare(); + return new wxPenRefData(*wx_static_cast(const wxPenRefData*, data)); +} + +void wxPen::SetColour( const wxColour& rColour ) +{ + AllocExclusive(); 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 -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; @@ -360,16 +380,16 @@ void wxPen::SetWidth( int nWidth ) { - Unshare(); + AllocExclusive(); 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 @@ -378,16 +398,14 @@ void wxPen::SetStipple( const wxBitmap& rStipple ) { - Unshare(); + AllocExclusive(); M_PENDATA->m_vStipple = rStipple; M_PENDATA->m_nStyle = wxSTIPPLE; 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 @@ -395,61 +413,59 @@ void wxPen::SetDashes( } // 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( - int nCap + wxPenCap nCap ) { - Unshare(); + AllocExclusive(); M_PENDATA->m_nCap = nCap; RealizeResource(); } // end of wxPen::SetCap int wx2os2PenStyle( - int nWxStyle + wxPenStyle nWxStyle ) { int nPMStyle = 0; switch (nWxStyle) { - case wxDOT: + case wxPENSTYLE_DOT: nPMStyle = LINETYPE_DOT; break; - case wxDOT_DASH: + case wxPENSTYLE_DOT_DASH: nPMStyle = LINETYPE_DASHDOT; break; - case wxSHORT_DASH: + case wxPENSTYLE_SHORT_DASH: nPMStyle = LINETYPE_SHORTDASH; break; - case wxLONG_DASH: + case wxPENSTYLE_LONG_DASH: nPMStyle = LINETYPE_LONGDASH; break; - case wxTRANSPARENT: + case wxPENSTYLE_TRANSPARENT: nPMStyle = LINETYPE_INVISIBLE; break; - case wxUSER_DASH: + case wxPENSTYLE_USER_DASH: 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 - -