Amebis/wxWidgets
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mac changes : wxDC - removed doubly defined vars (inherited from base) and fixed wxPen - width scales with context and 0 width always renders one pixel wide

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2001-03-03 17:18:03 +00:00
parent 1d261710b8
commit 0b014ec713
5 changed files with 22 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mac/dc.cpp
View File

@@ -45,8 +45,8 @@ long wxDC::m_macCurrentPortId = 1 ;
wxDC::wxDC()
{
m_ok = FALSE;
m_optimize = FALSE;
m_autoSetting = FALSE;
// m_optimize = FALSE;
// m_autoSetting = FALSE;
m_colour = TRUE;
m_clipping = FALSE;
@@ -539,7 +539,7 @@ void wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
if (m_pen.GetStyle() != wxTRANSPARENT)
{
MacInstallPen() ;
int offset = (m_pen.GetWidth() - 1) / 2 ;
int offset = ( (m_pen.GetWidth() == 0 ? 1 : m_pen.GetWidth() ) * m_scaleX - 1) / 2 ;
long xx1 = XLOG2DEV(x1);
long yy1 = YLOG2DEV(y1);
long xx2 = XLOG2DEV(x2);
@@ -1367,7 +1367,11 @@ void wxDC::MacInstallPen() const
::RGBBackColor( &backcolor );
::PenNormal() ;
int penWidth = m_pen.GetWidth();
int penWidth = m_pen.GetWidth() * m_scaleX ;
// null means only one pixel, at whatever resolution
if ( penWidth == 0 )
penWidth = 1 ;
::PenSize(penWidth, penWidth);
int penStyle = m_pen.GetStyle();