gcc signed/unsigned comparison fix

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

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 389da1fc6fd069aeb95e0ddf5d20069a08871164..bd03115cb5b455720e7972f23b328349a52c0d3e 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -1,45 +1,43 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcclient.cpp
+// Name:        src/mac/carbon/dcclient.cpp

 // Purpose:     wxClientDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxClientDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dcclient.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #include "wx/dcclient.h"
 #include "wx/wxprec.h"
 
 #include "wx/dcclient.h"

-#include "wx/dcmemory.h"
-#include "wx/region.h"
-#include "wx/window.h"
-#include "wx/toplevel.h"
-#include "wx/settings.h"
-#include "wx/math.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/window.h"
+    #include "wx/dcmemory.h"
+    #include "wx/settings.h"
+    #include "wx/toplevel.h"
+    #include "wx/math.h"
+    #include "wx/region.h"
+#endif
+
+#include "wx/graphics.h"
+#include "wx/rawbmp.h"

 #include "wx/mac/private.h"
 #include "wx/mac/private.h"

-#include "wx/log.h"

 
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 

-#define RAD2DEG 57.2957795131
-

 //-----------------------------------------------------------------------------
 // wxPaintDC
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxPaintDC
 //-----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
 IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
 IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
 IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)

-#endif

 
 /*
  * wxWindowDC
 
 /*
  * wxWindowDC


@@ -48,19 +46,21 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
 #include "wx/mac/uma.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/mac/uma.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"

-    
+

 
 static wxBrush MacGetBackgroundBrush( wxWindow* window )
 {
     wxBrush bkdBrush = window->MacGetBackgroundBrush() ;
 
 static wxBrush MacGetBackgroundBrush( wxWindow* window )
 {
     wxBrush bkdBrush = window->MacGetBackgroundBrush() ;

+

 #if !TARGET_API_MAC_OSX
     // transparency cannot be handled by the OS when not using composited windows
     wxWindow* parent = window->GetParent() ;
 #if !TARGET_API_MAC_OSX
     // transparency cannot be handled by the OS when not using composited windows
     wxWindow* parent = window->GetParent() ;

+

     // if we have some 'pseudo' transparency
     if ( ! bkdBrush.Ok() || bkdBrush.GetStyle() == wxTRANSPARENT || window->GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
     {
         // walk up until we find something
     // if we have some 'pseudo' transparency
     if ( ! bkdBrush.Ok() || bkdBrush.GetStyle() == wxTRANSPARENT || window->GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
     {
         // walk up until we find something

-        while( parent != NULL )
+        while ( parent != NULL )

         {
             if ( parent->GetBackgroundColour() != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
             {
         {
             if ( parent->GetBackgroundColour() != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
             {


@@ -68,12 +68,18 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window )
                 bkdBrush.SetColour( parent->GetBackgroundColour() ) ;
                 break ;
             }
                 bkdBrush.SetColour( parent->GetBackgroundColour() ) ;
                 break ;
             }

+

             if ( parent->IsKindOf( CLASSINFO(wxTopLevelWindow) ) )
             {
                 bkdBrush = parent->MacGetBackgroundBrush() ;
                 break ;
             }
             if ( parent->IsKindOf( CLASSINFO(wxTopLevelWindow) ) )
             {
                 bkdBrush = parent->MacGetBackgroundBrush() ;
                 break ;
             }

-            if ( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) ) )
+
+            if ( parent->IsKindOf( CLASSINFO( wxNotebook ) )
+#if wxUSE_TAB_DIALOG
+                 || parent->IsKindOf( CLASSINFO( wxTabCtrl ) )
+#endif // wxUSE_TAB_DIALOG
+                )

             {
                 Rect extent = { 0 , 0 , 0 , 0 } ;
                 int x , y ;
             {
                 Rect extent = { 0 , 0 , 0 , 0 } ;
                 int x , y ;


@@ -85,87 +91,151 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window )
                 extent.top-- ;
                 extent.right = x + size.x ;
                 extent.bottom = y + size.y ;
                 extent.top-- ;
                 extent.right = x + size.x ;
                 extent.bottom = y + size.y ;

-                bkdBrush.MacSetThemeBackground( kThemeBackgroundTabPane , (WXRECTPTR) &extent ) ; 
+                bkdBrush.MacSetThemeBackground( kThemeBackgroundTabPane , (WXRECTPTR) &extent ) ;

                 break ;
             }
                 break ;
             }

-            
-            parent = parent->GetParent() ;  
+
+            parent = parent->GetParent() ;

         }
     }
         }
     }

+

     if ( !bkdBrush.Ok() || bkdBrush.GetStyle() == wxTRANSPARENT )
     {
         // if we did not find something, use a default
         bkdBrush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;
     }
     if ( !bkdBrush.Ok() || bkdBrush.GetStyle() == wxTRANSPARENT )
     {
         // if we did not find something, use a default
         bkdBrush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;
     }

-#endif    
-    return bkdBrush ;
-}    
+#endif

 
 

+    return bkdBrush ;
+}

 
 

-wxWindowDC::wxWindowDC() 
+wxWindowDC::wxWindowDC()

 {
     m_window = NULL ;
 }
 
 {
     m_window = NULL ;
 }
 

-wxWindowDC::wxWindowDC(wxWindow *window) 
+wxWindowDC::wxWindowDC(wxWindow *window)

 {
     m_window = window ;
 {
     m_window = window ;

+    wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
+    if (!rootwindow)
+        return;
+
+    m_ok = true ;
+

 #if wxMAC_USE_CORE_GRAPHICS
 #if wxMAC_USE_CORE_GRAPHICS

-    if ( window->MacGetCGContextRef() )
+    m_window->GetSize( &m_width , &m_height);
+    CGContextRef cg = (CGContextRef) window->MacGetCGContextRef();
+    m_release = false;
+    if ( cg == NULL )

     {
     {

-        m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ;
-        m_graphicContext->SetPen( m_pen ) ;
-        m_graphicContext->SetBrush( m_brush ) ;
-        SetBackground(MacGetBackgroundBrush(window));        
+        SetGraphicsContext( wxGraphicsContext::Create( window ) ) ;

     }
     else
     {
     }
     else
     {

-        // as out of order redraw is not supported under CQ, we have to create a qd port for these
-        // situations
-        wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
-        if (!rootwindow)
-            return;
-        WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
-        int x , y ;
-        x = y = 0 ;
-        window->MacWindowToRootWindow( &x , &y ) ;
-        m_macLocalOrigin.x = x ;
-        m_macLocalOrigin.y = y ;
-        CGrafPtr port = UMAGetWindowPort( windowref ) ;
-        
-        m_graphicContext = new wxMacCGContext( port ) ;
-        m_graphicContext->SetPen( m_pen ) ;
-        m_graphicContext->SetBrush( m_brush ) ;
-        SetBackground(MacGetBackgroundBrush(window));
+        CGContextSaveGState( cg );
+        m_release = true ;
+        // make sure the context is having its origin at the wx-window coordinates of the 
+        // view (read at the top of window.cpp about the differences)
+        if ( window->MacGetLeftBorderSize() != 0 || window->MacGetTopBorderSize() != 0 )
+            CGContextTranslateCTM( cg , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() );
+
+        SetGraphicsContext( wxGraphicsContext::CreateFromNative( cg ) );

     }
     }

-    // there is no out-of-order drawing on OSX
+    m_graphicContext->SetPen( m_pen ) ;
+    m_graphicContext->SetBrush( m_brush ) ;
+    SetClippingRegion( 0 , 0 , m_width , m_height ) ;

 #else
 #else

-    wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
-    WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;

     int x , y ;
     x = y = 0 ;
     window->MacWindowToRootWindow( &x , &y ) ;
     m_macLocalOrigin.x = x ;
     m_macLocalOrigin.y = y ;
     int x , y ;
     x = y = 0 ;
     window->MacWindowToRootWindow( &x , &y ) ;
     m_macLocalOrigin.x = x ;
     m_macLocalOrigin.y = y ;

+    m_macPort = UMAGetWindowPort( (WindowRef) rootwindow->MacGetWindowRef() ) ;
+

     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 ) ;

-    m_macPort = UMAGetWindowPort( windowref ) ;
-    SetBackground(MacGetBackgroundBrush(window));

 #endif
 #endif

-    m_ok = TRUE ;
+    SetBackground(MacGetBackgroundBrush(window));
+

     SetFont( window->GetFont() ) ;
 }
 
 wxWindowDC::~wxWindowDC()
 {
     SetFont( window->GetFont() ) ;
 }
 
 wxWindowDC::~wxWindowDC()
 {

+#if wxMAC_USE_CORE_GRAPHICS
+    if ( m_release && m_graphicContext )
+    {
+        CGContextRef cg = (CGContextRef) m_window->MacGetCGContextRef();
+        CGContextRestoreGState(cg);
+        //CGContextRef cg = (CGContextRef) m_graphicContext->GetNativeContext() ;
+    }
+#endif

 }
 
 void wxWindowDC::DoGetSize( int* width, int* height ) const
 {
 }
 
 void wxWindowDC::DoGetSize( int* width, int* height ) const
 {

+#if wxMAC_USE_CORE_GRAPHICS
+    if ( width )
+        *width = m_width;
+    if ( height )
+        *height = m_height;
+#else

     wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
     wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );

-

     m_window->GetSize(width, height);
     m_window->GetSize(width, height);

+#endif
+}
+
+wxBitmap wxWindowDC::DoGetAsBitmap(const wxRect *subrect) const
+{
+    ControlRef handle = (ControlRef) m_window->GetHandle(); 
+    if ( !handle )
+        return wxNullBitmap;
+
+    HIRect rect;    
+    CGImageRef image;
+    CGContextRef context;
+    void* data;
+     
+    size_t bytesPerRow;
+    
+    HIViewCreateOffscreenImage( handle, 0, &rect, &image);
+    
+    
+    int width = subrect != NULL ? subrect->width : rect.size.width;
+    int height = subrect !=  NULL ? subrect->height : rect.size.height ; 
+    
+    bytesPerRow = ( ( width * 8 * 4 + 7 ) / 8 );
+
+    data = calloc( 1, bytesPerRow * height );
+    context = CGBitmapContextCreate( data, width, height, 8, bytesPerRow, CGColorSpaceCreateDeviceRGB(), kCGImageAlphaPremultipliedFirst );
+    
+    if ( subrect )
+        rect = CGRectOffset( rect, -subrect->x, -subrect->y ) ;
+    CGContextDrawImage( context, rect, image );
+
+    unsigned char* buffer = (unsigned char*) data;          
+    wxBitmap bmp = wxBitmap(width, height, 32);
+    wxAlphaPixelData pixData(bmp, wxPoint(0,0), wxSize(width, height));
+    
+    pixData.UseAlpha();
+    wxAlphaPixelData::Iterator p(pixData);
+    for (int y=0; y<height; y++) {
+        wxAlphaPixelData::Iterator rowStart = p;
+        for (int x=0; x<width; x++) {
+            unsigned char a = buffer[3];
+            p.Red()   = a; buffer++;
+            p.Green() = a; buffer++;
+            p.Blue()  = a; buffer++;
+            p.Alpha() = a; buffer++;
+            ++p; 
+        }
+        p = rowStart;
+        p.OffsetY(pixData, 1);
+    }
+    
+    return bmp;

 }
 
 /*
 }
 
 /*


@@ -177,47 +247,23 @@ wxClientDC::wxClientDC()
     m_window = NULL ;
 }
 
     m_window = NULL ;
 }
 

+#if wxMAC_USE_CORE_GRAPHICS
+wxClientDC::wxClientDC(wxWindow *window) :
+    wxWindowDC( window )
+{
+    wxPoint origin = window->GetClientAreaOrigin() ;
+    m_window->GetClientSize( &m_width , &m_height);
+    SetDeviceOrigin( origin.x, origin.y );
+    SetClippingRegion( 0 , 0 , m_width , m_height ) ;
+}
+#else

 wxClientDC::wxClientDC(wxWindow *window)
 {
     m_window = window ;
 wxClientDC::wxClientDC(wxWindow *window)
 {
     m_window = window ;

-#if wxMAC_USE_CORE_GRAPHICS
-    m_graphicContext = NULL ;
-    if ( window->MacGetCGContextRef() )
-    {
-        m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ;
-        m_graphicContext->SetPen( m_pen ) ;
-        m_graphicContext->SetBrush( m_brush ) ;
-        wxSize size = window->GetClientSize() ;
-        m_ok = TRUE ;    
-        SetClippingRegion( 0 , 0 , size.x , size.y ) ;
-        SetBackground(MacGetBackgroundBrush(window));
-    }
-    else
-    {
-        // as out of order redraw is not supported under CQ, we have to create a qd port for these
-        // situations
-        wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
-        if (!rootwindow)
-            return;
-        WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
-        wxPoint origin = window->GetClientAreaOrigin() ;
-        int x , y ;
-        x = origin.x ;
-        y = origin.y ;
-        window->MacWindowToRootWindow( &x , &y ) ;
-        m_macLocalOrigin.x = x ;
-        m_macLocalOrigin.y = y ;
-        CGrafPtr port = UMAGetWindowPort( windowref ) ;
-        
-        m_graphicContext = new wxMacCGContext( port ) ;
-        m_graphicContext->SetPen( m_pen ) ;
-        m_graphicContext->SetBrush( m_brush ) ;
-        m_ok = TRUE ;    
-     }
-#else

     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     if (!rootwindow)
         return;
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     if (!rootwindow)
         return;

+

     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
     wxPoint origin = window->GetClientAreaOrigin() ;
     wxSize size = window->GetClientSize() ;
     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
     wxPoint origin = window->GetClientAreaOrigin() ;
     wxSize size = window->GetClientSize() ;


@@ -225,6 +271,9 @@ wxClientDC::wxClientDC(wxWindow *window)
     x = origin.x ;
     y = origin.y ;
     window->MacWindowToRootWindow( &x , &y ) ;
     x = origin.x ;
     y = origin.y ;
     window->MacWindowToRootWindow( &x , &y ) ;

+    m_macPort = UMAGetWindowPort( windowref ) ;
+    m_ok = true ;
+

     m_macLocalOrigin.x = x ;
     m_macLocalOrigin.y = y ;
     SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ;
     m_macLocalOrigin.x = x ;
     m_macLocalOrigin.y = y ;
     SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ;


@@ -232,24 +281,24 @@ wxClientDC::wxClientDC(wxWindow *window)
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , -origin.x , -origin.y ) ;
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , -origin.x , -origin.y ) ;
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;

-    m_macPort = UMAGetWindowPort( windowref ) ;
-    m_ok = TRUE ;
-#endif
+

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

+#endif

 
 wxClientDC::~wxClientDC()
 {
 }
 
 
 wxClientDC::~wxClientDC()
 {
 }
 

+#if !wxMAC_USE_CORE_GRAPHICS

 void wxClientDC::DoGetSize(int *width, int *height) const
 {
     wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
 
     m_window->GetClientSize( width, height );
 }
 void wxClientDC::DoGetSize(int *width, int *height) const
 {
     wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
 
     m_window->GetClientSize( width, height );
 }

-
+#endif

 
 /*
  * wxPaintDC
 
 /*
  * wxPaintDC


@@ -260,34 +309,46 @@ wxPaintDC::wxPaintDC()
     m_window = NULL ;
 }
 
     m_window = NULL ;
 }
 

+#if wxMAC_USE_CORE_GRAPHICS
+wxPaintDC::wxPaintDC(wxWindow *window) :
+    wxWindowDC( window )
+{
+    wxPoint origin = window->GetClientAreaOrigin() ;
+    m_window->GetClientSize( &m_width , &m_height);
+    SetDeviceOrigin( origin.x, origin.y );
+    SetClippingRegion( 0 , 0 , m_width , m_height ) ;
+}
+#else

 wxPaintDC::wxPaintDC(wxWindow *window)
 {
     m_window = window ;
 wxPaintDC::wxPaintDC(wxWindow *window)
 {
     m_window = window ;

+    wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
+    WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
+    wxPoint origin = window->GetClientAreaOrigin() ;
+    wxSize size = window->GetClientSize() ;
+    int x , y ;
+    x = origin.x ;
+    y = origin.y ;
+    window->MacWindowToRootWindow( &x , &y ) ;
+    m_macPort = UMAGetWindowPort( windowref ) ;
+    m_ok = true ;
+

 #if wxMAC_USE_CORE_GRAPHICS
     if ( window->MacGetCGContextRef() )
     {
         m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ;
         m_graphicContext->SetPen( m_pen ) ;
         m_graphicContext->SetBrush( m_brush ) ;
 #if wxMAC_USE_CORE_GRAPHICS
     if ( window->MacGetCGContextRef() )
     {
         m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ;
         m_graphicContext->SetPen( m_pen ) ;
         m_graphicContext->SetBrush( m_brush ) ;

+        SetClippingRegion( 0 , 0 , size.x , size.y ) ;

         SetBackground(MacGetBackgroundBrush(window));
         SetBackground(MacGetBackgroundBrush(window));

-        m_ok = TRUE ;

     }
     else
     {
         wxLogDebug(wxT("You cannot create a wxPaintDC outside an OS-draw event") ) ;
         m_graphicContext = NULL ;
     }
     else
     {
         wxLogDebug(wxT("You cannot create a wxPaintDC outside an OS-draw event") ) ;
         m_graphicContext = NULL ;

-        m_ok = TRUE ;

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

-    wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
-    WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
-    wxPoint origin = window->GetClientAreaOrigin() ;
-    wxSize size = window->GetClientSize() ;
-    int x , y ;
-    x = origin.x ;
-    y = origin.y ;
-    window->MacWindowToRootWindow( &x , &y ) ;

     m_macLocalOrigin.x = x ;
     m_macLocalOrigin.y = y ;
     SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ;
     m_macLocalOrigin.x = x ;
     m_macLocalOrigin.y = y ;
     SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ;


@@ -296,22 +357,22 @@ wxPaintDC::wxPaintDC(wxWindow *window)
     SectRgn( (RgnHandle) m_macBoundaryClipRgn  , (RgnHandle) window->GetUpdateRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ;
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
     SectRgn( (RgnHandle) m_macBoundaryClipRgn  , (RgnHandle) window->GetUpdateRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ;
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;

-    m_macPort = UMAGetWindowPort( windowref ) ;

     SetBackground(MacGetBackgroundBrush(window));
     SetBackground(MacGetBackgroundBrush(window));

-    m_ok = TRUE ;

 #endif
 #endif

+

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

+#endif

 
 wxPaintDC::~wxPaintDC()
 {
 }
 
 
 wxPaintDC::~wxPaintDC()
 {
 }
 

+#if !wxMAC_USE_CORE_GRAPHICS

 void wxPaintDC::DoGetSize(int *width, int *height) const
 {
     wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
 
     m_window->GetClientSize( width, height );
 }
 void wxPaintDC::DoGetSize(int *width, int *height) const
 {
     wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
 
     m_window->GetClientSize( width, height );
 }

-
-
+#endif