applied patch 415912 (fixing problems with wxGrid attrs)

[wxWidgets.git] / src / mac / dc.cpp

diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp
index b1e9a3b4c4c5fa9f9218fce2c84b9b93c449f740..81a990bfd6c449e2da611e37123ab1efff160b7a 100644 (file)
--- a/src/mac/dc.cpp
+++ b/src/mac/dc.cpp
@@ -36,8 +36,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 #define mm2pt                  2.83464566929
 #define pt2mm                  0.352777777778
 
 #define mm2pt                  2.83464566929
 #define pt2mm                  0.352777777778
 

-long wxDC::m_macCurrentPortId = 1 ;
-

 //-----------------------------------------------------------------------------
 // wxDC
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDC
 //-----------------------------------------------------------------------------


@@ -45,18 +43,11 @@ long wxDC::m_macCurrentPortId = 1 ;
 wxDC::wxDC()
 {
   m_ok = FALSE;
 wxDC::wxDC()
 {
   m_ok = FALSE;

-//  m_optimize = FALSE;
-//  m_autoSetting = FALSE;

   m_colour = TRUE;
   m_colour = TRUE;

-  m_clipping = FALSE;

   
   m_mm_to_pix_x = mm2pt;
   m_mm_to_pix_y = mm2pt;
   
   
   m_mm_to_pix_x = mm2pt;
   m_mm_to_pix_y = mm2pt;
   

-  m_logicalOriginX = 0;
-  m_logicalOriginY = 0;
-  m_deviceOriginX = 0;
-  m_deviceOriginY = 0;

   m_internalDeviceOriginX = 0;
   m_internalDeviceOriginY = 0;
   m_externalDeviceOriginX = 0;
   m_internalDeviceOriginX = 0;
   m_internalDeviceOriginY = 0;
   m_externalDeviceOriginX = 0;


@@ -69,28 +60,12 @@ wxDC::wxDC()
   m_scaleX = 1.0;
   m_scaleY = 1.0;
   
   m_scaleX = 1.0;
   m_scaleY = 1.0;
   

-  m_mappingMode = wxMM_TEXT;

   m_needComputeScaleX = FALSE;
   m_needComputeScaleY = FALSE;
   
   m_needComputeScaleX = FALSE;
   m_needComputeScaleY = FALSE;
   

-  m_signX = 1;  // default x-axis left to right
-  m_signY = 1;  // default y-axis top down
-

   m_maxX = m_maxY = -100000;
   m_minY = m_minY =  100000;
 
   m_maxX = m_maxY = -100000;
   m_minY = m_minY =  100000;
 

-  m_logicalFunction = wxCOPY;
-//  m_textAlignment = wxALIGN_TOP_LEFT;
-  m_backgroundMode = wxTRANSPARENT;
-  
-  m_textForegroundColour = *wxBLACK;
-  m_textBackgroundColour = *wxWHITE;
-  m_pen = *wxBLACK_PEN;
-  m_font = *wxNORMAL_FONT;
-  m_brush = *wxTRANSPARENT_BRUSH;
-  m_backgroundBrush = *wxWHITE_BRUSH;
-  
-//  m_palette = wxAPP_COLOURMAP;

   m_macPort = NULL ;
   m_macMask = NULL ;
   m_ok = FALSE ;
   m_macPort = NULL ;
   m_macMask = NULL ;
   m_ok = FALSE ;


@@ -99,45 +74,54 @@ wxDC::wxDC()
        m_macBrushInstalled = false ;
        m_macPenInstalled = false ;
        
        m_macBrushInstalled = false ;
        m_macPenInstalled = false ;
        

-       m_macPortId = 0 ;

        m_macLocalOrigin.h = m_macLocalOrigin.v = 0 ;
        m_macClipRect.left = -32000 ;
        m_macClipRect.top = -32000 ;
        m_macClipRect.right = 32000 ;
        m_macClipRect.bottom = 32000 ;
        m_macLocalOrigin.h = m_macLocalOrigin.v = 0 ;
        m_macClipRect.left = -32000 ;
        m_macClipRect.top = -32000 ;
        m_macClipRect.right = 32000 ;
        m_macClipRect.bottom = 32000 ;

-       ::GetPort( &m_macOrigPort ) ;
+
+    m_pen = *wxBLACK_PEN;
+    m_font = *wxNORMAL_FONT;
+    m_brush = *wxWHITE_BRUSH;

 };
 
 };
 

+wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) :
+       m_ph( dc->m_macPort ) 
+{
+       wxASSERT( dc->Ok() ) ;
+       
+       dc->MacSetupPort(&m_ph) ;
+}
+
+wxMacPortSetter::~wxMacPortSetter() 
+{
+}
+

 wxDC::~wxDC(void)
 {
 wxDC::~wxDC(void)
 {

-       if ( !m_macPortHelper.IsCleared() )
+};
+
+void wxDC::MacSetupPort(AGAPortHelper* help) const
+{
+//     help->Setup( m_macPort ) ;
+       ::SetOrigin(-m_macLocalOrigin.h, -m_macLocalOrigin.v);
+
+       if ( m_clipping )

        {
        {

-       GrafPtr port ;
-       GetPort( &port ) ;
-       SetPort( m_macPortHelper.GetCurrentPort() ) ;
-       SetOrigin( 0 , 0 ) ;
-       SetPort( port ) ;
+               long x1 = XLOG2DEV(m_clipX1);
+               long y1 = YLOG2DEV(m_clipY1);
+               long x2 = XLOG2DEV(m_clipX2);
+               long y2 = YLOG2DEV(m_clipY2);
+               
+               Rect clip = { y1 , x1 , y2 , x2 } ;
+               ::SectRect( &clip , &m_macClipRect , &clip ) ;
+               ::ClipRect( &clip ) ;

        }
        }

-       /*
-       if ( m_macPort )
+       else

        {
        {

-               ::SetPort( m_macPort ) ;
-               ::SetOrigin( 0 , 0 ) ;
-               ::ClipRect( &m_macPort->portRect ) ;
-               ::PenNormal() ;
-               ::SetPort( m_macOrigPort ) ;
+               ::ClipRect(&m_macClipRect);

        }
        }

-       */
-       ++m_macCurrentPortId ;
-};

 
 

-void wxDC::MacSetupPort() const
-{
-       AGAPortHelper* help = (AGAPortHelper*) &m_macPortHelper ;
-       help->Setup( m_macPort ) ;
-       m_macPortId = ++m_macCurrentPortId ;
-       ::SetOrigin(-m_macLocalOrigin.h, -m_macLocalOrigin.v);
-       ::ClipRect(&m_macClipRect);

 
        m_macFontInstalled = false ;
        m_macBrushInstalled = false ;
 
        m_macFontInstalled = false ;
        m_macBrushInstalled = false ;


@@ -150,7 +134,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
        
   if (!Ok()) 
        return;
        
   if (!Ok()) 
        return;

-  MacVerifySetup() ;
+  wxMacPortSetter helper(this) ;

   
   long xx1 = XLOG2DEV(x); 
   long yy1 = YLOG2DEV(y);
   
   long xx1 = XLOG2DEV(x); 
   long yy1 = YLOG2DEV(y);


@@ -219,7 +203,7 @@ void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
 {
   if (!Ok()) 
        return;
 {
   if (!Ok()) 
        return;

-  MacVerifySetup() ;
+  wxMacPortSetter helper(this) ;

   
   long xx1 = XLOG2DEV(x); 
   long yy1 = YLOG2DEV(y);
   
   long xx1 = XLOG2DEV(x); 
   long yy1 = YLOG2DEV(y);


@@ -238,7 +222,6 @@ void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
 
 void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 {
 
 void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 {

-       MacVerifySetup() ;

        if( m_clipping )
        {
                m_clipX1 = wxMax( m_clipX1 , x ) ;
        if( m_clipping )
        {
                m_clipX1 = wxMax( m_clipX1 , x ) ;


@@ -255,23 +238,13 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei
          m_clipX2 = x + width;
          m_clipY2 = y + height;
        }
          m_clipX2 = x + width;
          m_clipY2 = y + height;
        }

-  
-       long x1 = XLOG2DEV(m_clipX1);
-       long y1 = YLOG2DEV(m_clipY1);
-       long x2 = XLOG2DEV(m_clipX2);
-       long y2 = YLOG2DEV(m_clipY2);
-       
-       Rect clip = { y1 , x1 , y2 , x2 } ;
-       
-       ::ClipRect( &clip ) ;
-
-};
+  };

 
 void wxDC::DoSetClippingRegionAsRegion( const wxRegion &region  )
 {
     wxCHECK_RET( Ok(), wxT("invalid window dc") );
 
 
 void wxDC::DoSetClippingRegionAsRegion( const wxRegion &region  )
 {
     wxCHECK_RET( Ok(), wxT("invalid window dc") );
 

-       MacVerifySetup() ;
+       wxMacPortSetter helper(this) ;

     if (region.Empty())
     {
         DestroyClippingRegion();
     if (region.Empty())
     {
         DestroyClippingRegion();


@@ -285,10 +258,8 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion &region  )
 
 void wxDC::DestroyClippingRegion(void)
 {
 
 void wxDC::DestroyClippingRegion(void)
 {

-  MacVerifySetup() ;
+  wxMacPortSetter helper(this) ;

   m_clipping = FALSE;
   m_clipping = FALSE;

-//     Rect clip = { -32000 , -32000 , 32000 , 32000 } ;
-       ::ClipRect(&m_macClipRect);

 };
     
 void wxDC::DoGetSize( int* width, int* height ) const
 };
     
 void wxDC::DoGetSize( int* width, int* height ) const


@@ -455,7 +426,7 @@ void  wxDC::SetFont( const wxFont &font )
   if (!Ok()) 
        return;
        
   if (!Ok()) 
        return;
        

-  MacVerifySetup() ;
+//  wxMacPortSetter helper(this) ;

   
   m_font = font;
   m_macFontInstalled = false ;
   
   m_font = font;
   m_macFontInstalled = false ;


@@ -466,7 +437,7 @@ void  wxDC::SetPen( const wxPen &pen )
   if (!Ok()  ) 
        return;
 
   if (!Ok()  ) 
        return;
 

-  MacVerifySetup() ;
+//  wxMacPortSetter helper(this) ;

 
        if ( m_pen == pen )
                return ;
 
        if ( m_pen == pen )
                return ;


@@ -483,7 +454,7 @@ void  wxDC::SetBrush( const wxBrush &brush )
 {
   if (!Ok() ) 
        return;
 {
   if (!Ok() ) 
        return;

-  MacVerifySetup() ;
+//  wxMacPortSetter helper(this) ;

   
   if (m_brush == brush) 
        return;
   
   if (m_brush == brush) 
        return;


@@ -496,7 +467,7 @@ void  wxDC::SetBackground( const wxBrush &brush )
 {
   if (!Ok()) 
        return;
 {
   if (!Ok()) 
        return;

-  MacVerifySetup() ;
+//  wxMacPortSetter helper(this) ;

   
   if (m_backgroundBrush == brush) 
        return;
   
   if (m_backgroundBrush == brush) 
        return;


@@ -534,7 +505,7 @@ void  wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
   if (!Ok()) 
        return;
        
   if (!Ok()) 
        return;
        

-  MacVerifySetup() ;
+  wxMacPortSetter helper(this) ;

   
   if (m_pen.GetStyle() != wxTRANSPARENT)
   {
   
   if (m_pen.GetStyle() != wxTRANSPARENT)
   {


@@ -570,7 +541,7 @@ void  wxDC::DoDrawPoint( wxCoord x, wxCoord y )
   if (!Ok()) 
        return;
        
   if (!Ok()) 
        return;
        

-  MacVerifySetup() ;
+  wxMacPortSetter helper(this) ;

   
   if (m_pen.GetStyle() != wxTRANSPARENT) 
   {
   
   if (m_pen.GetStyle() != wxTRANSPARENT) 
   {


@@ -588,7 +559,7 @@ void  wxDC::DoDrawLines(int n, wxPoint points[],
 {
   if (!Ok()) 
        return;
 {
   if (!Ok()) 
        return;

-  MacVerifySetup() ;
+  wxMacPortSetter helper(this) ;

   
   if (m_pen.GetStyle() == wxTRANSPARENT) 
        return;
   
   if (m_pen.GetStyle() == wxTRANSPARENT) 
        return;


@@ -615,7 +586,7 @@ void  wxDC::DoDrawPolygon(int n, wxPoint points[],
 {
   if (!Ok()) 
        return;
 {
   if (!Ok()) 
        return;

-  MacVerifySetup() ;
+  wxMacPortSetter helper(this) ;

   
   PolyHandle polygon = OpenPoly() ;
   long x1, x2 , y1 , y2 ;
   
   PolyHandle polygon = OpenPoly() ;
   long x1, x2 , y1 , y2 ;


@@ -649,7 +620,7 @@ void  wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
   if (!Ok()) 
        return;
 {
   if (!Ok()) 
        return;

-  MacVerifySetup() ;
+  wxMacPortSetter helper(this) ;

        
        long xx = XLOG2DEV(x);
        long yy = YLOG2DEV(y);
        
        long xx = XLOG2DEV(x);
        long yy = YLOG2DEV(y);


@@ -694,7 +665,7 @@ void  wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y,
 {
   if (!Ok()) 
        return;
 {
   if (!Ok()) 
        return;

-  MacVerifySetup() ;
+  wxMacPortSetter helper(this) ;

        
   if (radius < 0.0) 
        radius = - radius * ((width < height) ? width : height);
        
   if (radius < 0.0) 
        radius = - radius * ((width < height) ? width : height);


@@ -740,7 +711,7 @@ void  wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
   if (!Ok()) 
        return;
 {
   if (!Ok()) 
        return;

-  MacVerifySetup() ;
+  wxMacPortSetter helper(this) ;

 
        long xx = XLOG2DEV(x);
        long yy = YLOG2DEV(y);
 
        long xx = XLOG2DEV(x);
        long yy = YLOG2DEV(y);


@@ -791,7 +762,7 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc, int logical_func , bool useMask )
 {
   if (!Ok()) return FALSE;
                         wxDC *source, wxCoord xsrc, wxCoord ysrc, int logical_func , bool useMask )
 {
   if (!Ok()) return FALSE;

-  MacVerifySetup() ;
+  wxMacPortSetter helper(this) ;

 
        CGrafPtr                        sourcePort = (CGrafPtr) source->m_macPort ;
        PixMapHandle    bmappixels =  GetGWorldPixMap( sourcePort ) ; 
 
        CGrafPtr                        sourcePort = (CGrafPtr) source->m_macPort ;
        PixMapHandle    bmappixels =  GetGWorldPixMap( sourcePort ) ; 


@@ -862,7 +833,7 @@ void  wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
 {
   if (!Ok()) 
        return;
 {
   if (!Ok()) 
        return;

-  MacVerifySetup() ;
+  wxMacPortSetter helper(this) ;

 
        long xx = XLOG2DEV(x);
        long yy = YLOG2DEV(y);
 
        long xx = XLOG2DEV(x);
        long yy = YLOG2DEV(y);


@@ -942,7 +913,7 @@ void  wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he
   if (!Ok()) 
        return;
  
   if (!Ok()) 
        return;
  

-   MacVerifySetup() ;
+   wxMacPortSetter helper(this) ;

 
        wxFont formerFont = m_font ; 
        
 
        wxFont formerFont = m_font ; 
        


@@ -1024,7 +995,7 @@ wxCoord   wxDC::GetCharWidth(void) const
   if (!Ok()) 
        return 1;
  
   if (!Ok()) 
        return 1;
  

-   MacVerifySetup() ;
+   wxMacPortSetter helper(this) ;

 
        MacInstallFont() ;
 
 
        MacInstallFont() ;
 


@@ -1039,7 +1010,7 @@ wxCoord   wxDC::GetCharHeight(void) const
   if (!Ok()) 
        return 1;
  
   if (!Ok()) 
        return 1;
  

-   MacVerifySetup() ;
+   wxMacPortSetter helper(this) ;

 
        MacInstallFont() ;
 
 
        MacInstallFont() ;
 


@@ -1053,7 +1024,7 @@ void  wxDC::Clear(void)
 {
   if (!Ok()) 
        return;
 {
   if (!Ok()) 
        return;

-  MacVerifySetup() ;
+  wxMacPortSetter helper(this) ;

        Rect rect = { -32767 , -32767 , 32767 , 32767 } ;
        
        if (m_backgroundBrush.GetStyle() != wxTRANSPARENT) 
        Rect rect = { -32767 , -32767 , 32767 , 32767 } ;
        
        if (m_backgroundBrush.GetStyle() != wxTRANSPARENT) 


@@ -1067,10 +1038,9 @@ void wxDC::MacInstallFont() const
 {
   if (!Ok()) 
        return;
 {
   if (!Ok()) 
        return;

-  MacVerifySetup() ;

 
 

-       if ( m_macFontInstalled )
-               return ;
+//     if ( m_macFontInstalled )
+//             return ;

        Pattern blackColor ;
        
        wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
        Pattern blackColor ;
        
        wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;


@@ -1189,12 +1159,11 @@ void wxDC::MacInstallPen() const
 {
   if (!Ok()) 
        return;
 {
   if (!Ok()) 
        return;

-  MacVerifySetup() ;

 
        Pattern  blackColor;
 
 
        Pattern  blackColor;
 

-       if ( m_macPenInstalled )
-               return ;
+//     if ( m_macPenInstalled )
+//             return ;

 
        RGBColor forecolor = m_pen.GetColour().GetPixel();
        RGBColor backcolor = m_backgroundBrush.GetColour().GetPixel();
 
        RGBColor forecolor = m_pen.GetColour().GetPixel();
        RGBColor backcolor = m_backgroundBrush.GetColour().GetPixel();


@@ -1276,10 +1245,10 @@ void wxDC::MacInstallBrush() const
 {
   if (!Ok()) 
        return;
 {
   if (!Ok()) 
        return;

-  MacVerifySetup() ;
+

        Pattern  blackColor, whiteColor ;
        Pattern  blackColor, whiteColor ;

-       if ( m_macBrushInstalled )
-               return ;
+//     if ( m_macBrushInstalled )
+//             return ;

 
        // foreground
 
 
        // foreground