Various fixes for Textctrl and Popup Menus.

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

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 12100b81cdef2320b31f5b789f8db2b4825eac2a..eb9d6e467be9e033484a5089a8b8a46e2f262042 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -16,7 +16,10 @@
 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"
 #include "wx/region.h"
+#include "wx/window.h"
+#include "wx/toplevel.h"
 #include <math.h>
+#include "wx/mac/private.h"
 
 //-----------------------------------------------------------------------------
 // constants
@@ -28,34 +31,46 @@
 // wxPaintDC
 //-----------------------------------------------------------------------------
 
+#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
 IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
+#endif
 
 /*
  * wxWindowDC
  */
 
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
 
-wxWindowDC::wxWindowDC(void)
+wxWindowDC::wxWindowDC() 
 {
 }
 
-wxWindowDC::wxWindowDC(wxWindow *the_canvas)
+wxWindowDC::wxWindowDC(wxWindow *the_canvas) 
 {
-       WindowRef windowref ;
-       wxWindow* rootwindow ;
-       
-       // this time it is really the full window
+       wxTopLevelWindowMac* rootwindow = the_canvas->MacGetTopLevelWindow() ;
+       WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
        
-       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 ) ;
-       MacSetupPort() ;
+       m_minY = m_minX =  0;
+       wxSize size = the_canvas->GetSize() ;
+       m_maxX = size.x  ;
+       m_maxY = size.y ; 
+
        m_ok = TRUE ;
+  SetBackground(the_canvas->MacGetBackgroundBrush());
 }
 
-wxWindowDC::~wxWindowDC(void)
+wxWindowDC::~wxWindowDC()
 {
 }
 
@@ -63,24 +78,37 @@ wxWindowDC::~wxWindowDC(void)
  * wxClientDC
  */
 
-wxClientDC::wxClientDC(void)
+wxClientDC::wxClientDC()
 {
 }
 
 wxClientDC::wxClientDC(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 ) ;
+       OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
+       CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;
        m_macPort = UMAGetWindowPort( windowref ) ;
-       MacSetupPort() ;
+       m_minY = m_minX =  0;
+       m_maxX = size.x  ;
+       m_maxY = size.y ; 
        m_ok = TRUE ;
-       SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID));
+  SetBackground(window->MacGetBackgroundBrush());
        SetFont( window->GetFont() ) ;
 }
 
-wxClientDC::~wxClientDC(void)
+wxClientDC::~wxClientDC()
 {
 }
 
@@ -88,25 +116,35 @@ wxClientDC::~wxClientDC(void)
  * wxPaintDC
  */
 
-wxPaintDC::wxPaintDC(void)
+wxPaintDC::wxPaintDC()
 {
 }
 
 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 ) ;
-       MacSetupPort() ;
+       m_minY = m_minX =  0;
+       m_maxX = size.x  ;
+       m_maxY = size.y ; 
        m_ok = TRUE ;
-       long x , y ,w , h ;
-       window->GetUpdateRegion().GetBox( x , y , w , h ) ;
-       SetClippingRegion( x , y , w , h ) ;
-       SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID));
-       SetFont(window->GetFont() ) ;
+  SetBackground(window->MacGetBackgroundBrush());
+       SetFont( window->GetFont() ) ;
 }
 
 wxPaintDC::~wxPaintDC()