no changes, just corrected the comment for wxConvLocal

[wxWidgets.git] / src / mac / carbon / dcclient.cpp

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 51fe726b1671148be4ab5e72b6601d6555729285..7f14f9b53adbd3aa6b6e521a95c4fe026f82c961 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -119,7 +119,8 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     wxSize size = window->GetSize() ;
     window->MacWindowToRootWindow( &x , &y ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
     wxSize size = window->GetSize() ;
     window->MacWindowToRootWindow( &x , &y ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;

-    
+    m_ok = true ;
+

 #if wxMAC_USE_CORE_GRAPHICS
     m_macLocalOriginInPort.x = x ;
     m_macLocalOriginInPort.y = y ;
 #if wxMAC_USE_CORE_GRAPHICS
     m_macLocalOriginInPort.x = x ;
     m_macLocalOriginInPort.y = y ;


@@ -129,7 +130,6 @@ wxWindowDC::wxWindowDC(wxWindow *window)
         m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ;
         m_graphicContext->SetPen( m_pen ) ;
         m_graphicContext->SetBrush( m_brush ) ;
         m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ;
         m_graphicContext->SetPen( m_pen ) ;
         m_graphicContext->SetBrush( m_brush ) ;

-        SetBackground(MacGetBackgroundBrush(window));        

     }
     else
     {
     }
     else
     {


@@ -141,7 +141,6 @@ wxWindowDC::wxWindowDC(wxWindow *window)
         m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ;
         m_graphicContext->SetPen( m_pen ) ;
         m_graphicContext->SetBrush( m_brush ) ;
         m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ;
         m_graphicContext->SetPen( m_pen ) ;
         m_graphicContext->SetBrush( m_brush ) ;

-        SetBackground(MacGetBackgroundBrush(window));

     }
     // there is no out-of-order drawing on OSX
 #else
     }
     // there is no out-of-order drawing on OSX
 #else


@@ -150,10 +149,9 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     CopyRgn( (RgnHandle) window->MacGetVisibleRegion(true).GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ;
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
     CopyRgn( (RgnHandle) window->MacGetVisibleRegion(true).GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ;
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;

-    SetBackground(MacGetBackgroundBrush(window));

 #endif
 #endif

+    SetBackground(MacGetBackgroundBrush(window));

 
 

-    m_ok = true ;

     SetFont( window->GetFont() ) ;
 }
 
     SetFont( window->GetFont() ) ;
 }
 


@@ -192,7 +190,8 @@ wxClientDC::wxClientDC(wxWindow *window)
     y = origin.y ;
     window->MacWindowToRootWindow( &x , &y ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
     y = origin.y ;
     window->MacWindowToRootWindow( &x , &y ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;

-    
+    m_ok = true ;
+

 #if wxMAC_USE_CORE_GRAPHICS
     m_macLocalOriginInPort.x = x ;
     m_macLocalOriginInPort.y = y ;
 #if wxMAC_USE_CORE_GRAPHICS
     m_macLocalOriginInPort.x = x ;
     m_macLocalOriginInPort.y = y ;


@@ -202,12 +201,11 @@ wxClientDC::wxClientDC(wxWindow *window)
         m_graphicContext->SetPen( m_pen ) ;
         m_graphicContext->SetBrush( m_brush ) ;
         SetClippingRegion( 0 , 0 , size.x , size.y ) ;
         m_graphicContext->SetPen( m_pen ) ;
         m_graphicContext->SetBrush( m_brush ) ;
         SetClippingRegion( 0 , 0 , size.x , size.y ) ;

-        SetBackground(MacGetBackgroundBrush(window));

     }
     else
     {
     }
     else
     {

-        // as out of order redraw is not supported under CQ, we have to create a qd port for these
-        // situations
+        // as out of order redraw is not supported under CQ,
+        // we have to create a QD port for these situations

         m_macLocalOrigin.x = x ;
         m_macLocalOrigin.y = y ;
         m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ;
         m_macLocalOrigin.x = x ;
         m_macLocalOrigin.y = y ;
         m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ;


@@ -224,7 +222,6 @@ wxClientDC::wxClientDC(wxWindow *window)
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;
 #endif
 
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;
 #endif
 

-    m_ok = true ;

     SetBackground(MacGetBackgroundBrush(window));
     SetFont( window->GetFont() ) ;
 }
     SetBackground(MacGetBackgroundBrush(window));
     SetFont( window->GetFont() ) ;
 }


@@ -270,6 +267,7 @@ wxPaintDC::wxPaintDC(wxWindow *window)
     y = origin.y ;
     window->MacWindowToRootWindow( &x , &y ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
     y = origin.y ;
     window->MacWindowToRootWindow( &x , &y ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;

+    m_ok = true ;

 
 #if wxMAC_USE_CORE_GRAPHICS
     m_macLocalOriginInPort.x = x ;
 
 #if wxMAC_USE_CORE_GRAPHICS
     m_macLocalOriginInPort.x = x ;


@@ -300,7 +298,6 @@ wxPaintDC::wxPaintDC(wxWindow *window)
     SetBackground(MacGetBackgroundBrush(window));
 #endif
 
     SetBackground(MacGetBackgroundBrush(window));
 #endif
 

-    m_ok = true ;

     SetFont( window->GetFont() ) ;
 }
 
     SetFont( window->GetFont() ) ;
 }