two fixes from Justin Bradford

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index 420d5dce829fc5a9f1df26b50f901f3c6d355874..940a6960ce7bb556dc5e4a4da6ba549b201dda5f 100644 (file)
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -422,12 +422,12 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei
 void wxDC::DoSetClippingRegionAsRegion( const wxRegion &region  )
 {
     wxCHECK_RET( Ok(), wxT("invalid window dc") ) ;
 void wxDC::DoSetClippingRegionAsRegion( const wxRegion &region  )
 {
     wxCHECK_RET( Ok(), wxT("invalid window dc") ) ;

-      wxMacPortSetter helper(this) ;

     if (region.Empty())
     {
         DestroyClippingRegion();
         return;
     }
     if (region.Empty())
     {
         DestroyClippingRegion();
         return;
     }

+    wxMacPortSetter helper(this) ;

     wxCoord x, y, w, h;
     region.GetBox( x, y, w, h );
     wxCoord xx, yy, ww, hh;
     wxCoord x, y, w, h;
     region.GetBox( x, y, w, h );
     wxCoord xx, yy, ww, hh;


@@ -1883,7 +1883,7 @@ void wxDC::MacInstallPen() const
     ::RGBForeColor( &forecolor );
     ::RGBBackColor( &backcolor );
     ::PenNormal() ;
     ::RGBForeColor( &forecolor );
     ::RGBBackColor( &backcolor );
     ::PenNormal() ;

-    int penWidth = m_pen.GetWidth() * (int) m_scaleX ;
+    int penWidth = (int) (m_pen.GetWidth() * m_scaleX) ; ;

     // null means only one pixel, at whatever resolution
     if ( penWidth == 0 )
         penWidth = 1 ;
     // null means only one pixel, at whatever resolution
     if ( penWidth == 0 )
         penWidth = 1 ;

diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp
index 420d5dce829fc5a9f1df26b50f901f3c6d355874..940a6960ce7bb556dc5e4a4da6ba549b201dda5f 100644 (file)
--- a/src/mac/dc.cpp
+++ b/src/mac/dc.cpp
@@ -422,12 +422,12 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei
 void wxDC::DoSetClippingRegionAsRegion( const wxRegion &region  )
 {
     wxCHECK_RET( Ok(), wxT("invalid window dc") ) ;
 void wxDC::DoSetClippingRegionAsRegion( const wxRegion &region  )
 {
     wxCHECK_RET( Ok(), wxT("invalid window dc") ) ;

-      wxMacPortSetter helper(this) ;

     if (region.Empty())
     {
         DestroyClippingRegion();
         return;
     }
     if (region.Empty())
     {
         DestroyClippingRegion();
         return;
     }

+    wxMacPortSetter helper(this) ;

     wxCoord x, y, w, h;
     region.GetBox( x, y, w, h );
     wxCoord xx, yy, ww, hh;
     wxCoord x, y, w, h;
     region.GetBox( x, y, w, h );
     wxCoord xx, yy, ww, hh;


@@ -1883,7 +1883,7 @@ void wxDC::MacInstallPen() const
     ::RGBForeColor( &forecolor );
     ::RGBBackColor( &backcolor );
     ::PenNormal() ;
     ::RGBForeColor( &forecolor );
     ::RGBBackColor( &backcolor );
     ::PenNormal() ;

-    int penWidth = m_pen.GetWidth() * (int) m_scaleX ;
+    int penWidth = (int) (m_pen.GetWidth() * m_scaleX) ; ;

     // null means only one pixel, at whatever resolution
     if ( penWidth == 0 )
         penWidth = 1 ;
     // null means only one pixel, at whatever resolution
     if ( penWidth == 0 )
         penWidth = 1 ;