redraw problems fix

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

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index 6756d9df035fdb6956bab407304acc496481b37a..81a990bfd6c449e2da611e37123ab1efff160b7a 100644 (file)
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -105,6 +105,7 @@ void wxDC::MacSetupPort(AGAPortHelper* help) const
 {
 //     help->Setup( m_macPort ) ;
        ::SetOrigin(-m_macLocalOrigin.h, -m_macLocalOrigin.v);
 {
 //     help->Setup( m_macPort ) ;
        ::SetOrigin(-m_macLocalOrigin.h, -m_macLocalOrigin.v);

+

        if ( m_clipping )
        {
                long x1 = XLOG2DEV(m_clipX1);
        if ( m_clipping )
        {
                long x1 = XLOG2DEV(m_clipX1);

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 19d325a772483446f72f586ba7b61d7b0fd521f8..8d97ce488925e06e76648c4f0a99351bcbf88147 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -112,6 +112,7 @@ wxPaintDC::wxPaintDC(wxWindow *window)
 
        m_macPort = UMAGetWindowPort( windowref ) ;
        m_ok = TRUE ;
 
        m_macPort = UMAGetWindowPort( windowref ) ;
        m_ok = TRUE ;

+       /*

        wxCoord x , y ,w , h ;
        window->GetUpdateRegion().GetBox( x , y , w , h ) ;
        m_minY = m_minX =  0;
        wxCoord x , y ,w , h ;
        window->GetUpdateRegion().GetBox( x , y , w , h ) ;
        m_minY = m_minX =  0;


@@ -119,6 +120,7 @@ wxPaintDC::wxPaintDC(wxWindow *window)
        m_maxX = size.x  ;
        m_maxY = size.y ; 
        SetClippingRegion( x , y , w , h ) ;
        m_maxX = size.x  ;
        m_maxY = size.y ; 
        SetClippingRegion( x , y , w , h ) ;

+       */

        SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID));
        SetFont(window->GetFont() ) ;
 }
        SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID));
        SetFont(window->GetFont() ) ;
 }

diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp
index 6756d9df035fdb6956bab407304acc496481b37a..81a990bfd6c449e2da611e37123ab1efff160b7a 100644 (file)
--- a/src/mac/dc.cpp
+++ b/src/mac/dc.cpp
@@ -105,6 +105,7 @@ void wxDC::MacSetupPort(AGAPortHelper* help) const
 {
 //     help->Setup( m_macPort ) ;
        ::SetOrigin(-m_macLocalOrigin.h, -m_macLocalOrigin.v);
 {
 //     help->Setup( m_macPort ) ;
        ::SetOrigin(-m_macLocalOrigin.h, -m_macLocalOrigin.v);

+

        if ( m_clipping )
        {
                long x1 = XLOG2DEV(m_clipX1);
        if ( m_clipping )
        {
                long x1 = XLOG2DEV(m_clipX1);

diff --git a/src/mac/dcclient.cpp b/src/mac/dcclient.cpp
index 19d325a772483446f72f586ba7b61d7b0fd521f8..8d97ce488925e06e76648c4f0a99351bcbf88147 100644 (file)
--- a/src/mac/dcclient.cpp
+++ b/src/mac/dcclient.cpp
@@ -112,6 +112,7 @@ wxPaintDC::wxPaintDC(wxWindow *window)
 
        m_macPort = UMAGetWindowPort( windowref ) ;
        m_ok = TRUE ;
 
        m_macPort = UMAGetWindowPort( windowref ) ;
        m_ok = TRUE ;

+       /*

        wxCoord x , y ,w , h ;
        window->GetUpdateRegion().GetBox( x , y , w , h ) ;
        m_minY = m_minX =  0;
        wxCoord x , y ,w , h ;
        window->GetUpdateRegion().GetBox( x , y , w , h ) ;
        m_minY = m_minX =  0;


@@ -119,6 +120,7 @@ wxPaintDC::wxPaintDC(wxWindow *window)
        m_maxX = size.x  ;
        m_maxY = size.y ; 
        SetClippingRegion( x , y , w , h ) ;
        m_maxX = size.x  ;
        m_maxY = size.y ; 
        SetClippingRegion( x , y , w , h ) ;

+       */

        SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID));
        SetFont(window->GetFont() ) ;
 }
        SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID));
        SetFont(window->GetFont() ) ;
 }