/////////////////////////////////////////////////////////////////////////////
-// Name: pen.cpp
+// Name: src/os2/pen.cpp
// Purpose: wxPen
// Author: David Webster
// Modified by:
// 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"
+
+#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"
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
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
//
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
M_PENDATA->m_hPen = 0L;
RealizeResource();
-
- if ( wxThePenList )
- wxThePenList->AddPen(this);
} // end of wxPen::wxPen
wxPen::wxPen(
M_PENDATA->m_hPen = 0;
RealizeResource();
-
- if ( wxThePenList )
- wxThePenList->AddPen(this);
} // end of wxPen::wxPen
+int wx2os2PenStyle(
+ int nWxStyle
+);
+
bool wxPen::RealizeResource()
{
BOOL bOk;
{
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)
{
- 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();
}
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;
{
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:
::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:
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:
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:
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:
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:
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:
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;
}
m_vAreaBundle.lColor = vPmColour;
- m_vAreaBundle.lBackColor = CLR_DEFAULT;
+ m_vAreaBundle.lBackColor = RGB_WHITE;
m_vAreaBundle.usMixMode = FM_OVERPAINT;
m_vAreaBundle.usBackMixMode = BM_OVERPAINT;
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;
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
}
} // end of wxPen::Unshare
-void wxPen::SetColour(
- const wxColour& rColour
-)
+void wxPen::SetColour( const wxColour& rColour )
{
Unshare();
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();
M_PENDATA->m_vColour.Set(cRed, cGreen, cBlue);
RealizeResource();
} // end of wxPen::SetColour
-void wxPen::SetPS(
- HPS hPS
-)
+void wxPen::SetPS( HPS hPS )
{
Unshare();
if (M_PENDATA->m_hPen)
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
}
return nPMStyle;
} // end of wx2os2PenStyle
-
-
projects / wxWidgets.git / blobdiff