Updated font dialog constructors to use a reference to the font data

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

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index ef0d666568f3f42306a092aa8b75402e79a73cf3..bc1a0827a4c0771d88473aa77cd1b3b0bcf34dbe 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -17,7 +17,9 @@
 #include "wx/dcmemory.h"
 #include "wx/region.h"
 #include "wx/window.h"
 #include "wx/dcmemory.h"
 #include "wx/region.h"
 #include "wx/window.h"

+#include "wx/toplevel.h"

 #include <math.h>
 #include <math.h>

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

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


@@ -39,7 +41,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
  * wxWindowDC
  */
 
  * wxWindowDC
  */
 

-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"

 
 wxWindowDC::wxWindowDC() 
 {
 
 wxWindowDC::wxWindowDC() 
 {


@@ -47,21 +49,25 @@ wxWindowDC::wxWindowDC()
 
 wxWindowDC::wxWindowDC(wxWindow *the_canvas) 
 {
 
 wxWindowDC::wxWindowDC(wxWindow *the_canvas) 
 {

-       WindowRef windowref ;
-       wxWindow* rootwindow ;
+       wxTopLevelWindowMac* rootwindow = the_canvas->MacGetTopLevelWindow() ;
+       WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;

        
        

-       // this time it is really the full window
-       
-       the_canvas->MacGetPortParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
+       int x , y ;
+       x = y = 0 ;
+       the_canvas->MacWindowToRootWindow( &x , &y ) ;
+       m_macLocalOrigin.x = x ;
+       m_macLocalOrigin.y = y ;
+       CopyRgn( (RgnHandle) the_canvas->MacGetVisibleRegion().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 ) ;
        m_minY = m_minX =  0;
        wxSize size = the_canvas->GetSize() ;
        m_maxX = size.x  ;
        m_maxY = size.y ; 
 
        m_macPort = UMAGetWindowPort( windowref ) ;
        m_minY = m_minX =  0;
        wxSize size = the_canvas->GetSize() ;
        m_maxX = size.x  ;
        m_maxY = size.y ; 
 

-       MacSetupPort() ;

        m_ok = TRUE ;
        m_ok = TRUE ;

-  SetBackground(wxBrush(the_canvas->GetBackgroundColour(), wxSOLID));
+  SetBackground(the_canvas->MacGetBackgroundBrush());

 }
 
 wxWindowDC::~wxWindowDC()
 }
 
 wxWindowDC::~wxWindowDC()


@@ -78,18 +84,29 @@ wxClientDC::wxClientDC()
 
 wxClientDC::wxClientDC(wxWindow *window)
 {
 
 wxClientDC::wxClientDC(wxWindow *window)
 {

-       WindowRef windowref ;
-       wxWindow* rootwindow ;
-       
-       window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
+       wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
+        if (!rootwindow)
+            return;
+       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 ) ;
+       SectRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) window->MacGetVisibleRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ;
+       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_macPort = UMAGetWindowPort( windowref ) ;

-       MacSetupPort() ;

        m_minY = m_minX =  0;
        m_minY = m_minX =  0;

-       wxSize size = window->GetSize() ;

        m_maxX = size.x  ;
        m_maxY = size.y ; 
        m_ok = TRUE ;
        m_maxX = size.x  ;
        m_maxY = size.y ; 
        m_ok = TRUE ;

-       SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID));
+  SetBackground(window->MacGetBackgroundBrush());

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


@@ -107,23 +124,29 @@ wxPaintDC::wxPaintDC()
 
 wxPaintDC::wxPaintDC(wxWindow *window)
 {
 
 wxPaintDC::wxPaintDC(wxWindow *window)
 {

-       WindowRef windowref ;
-       wxWindow* rootwindow ;
-       
-       window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
-
+       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 ) ;
+       SectRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) window->MacGetVisibleRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ;
+       OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , -origin.x , -origin.y ) ;
+  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 ) ;
        m_macPort = UMAGetWindowPort( windowref ) ;

-       MacSetupPort() ;
-       m_ok = TRUE ;
-       wxCoord x , y ,w , h ;
-       window->GetUpdateRegion().GetBox( x , y , w , h ) ;

        m_minY = m_minX =  0;
        m_minY = m_minX =  0;

-       wxSize size = window->GetSize() ;

        m_maxX = size.x  ;
        m_maxY = size.y ; 
        m_maxX = size.x  ;
        m_maxY = size.y ; 

-       SetClippingRegion( x , y , w , h ) ;
-       SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID));
-       SetFont(window->GetFont() ) ;
+       m_ok = TRUE ;
+  SetBackground(window->MacGetBackgroundBrush());
+       SetFont( window->GetFont() ) ;

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