add safe wxStrlcpy() function and replaced all wxStrncpy() calls by it

[wxWidgets.git] / src / common / dcgraph.cpp

diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp
index 0c51ae077308fc4bd8da2b7403d67746ac3ae38c..2b9eb8c97a70d59e069519e678925e634692c4d9 100644 (file)
--- a/src/common/dcgraph.cpp
+++ b/src/common/dcgraph.cpp
@@ -30,8 +30,12 @@
 
 #include "wx/dcclient.h"
 
 
 #include "wx/dcclient.h"
 

-#ifdef __WXOSX__
-    #include "ApplicationServices/ApplicationServices.h"
+#ifdef __WXOSX_OR_COCOA__
+#ifdef __WXOSX_IPHONE__
+    #include <CoreGraphics/CoreGraphics.h>
+#else
+    #include <ApplicationServices/ApplicationServices.h>
+#endif

 #endif
 
 //-----------------------------------------------------------------------------
 #endif
 
 //-----------------------------------------------------------------------------


@@ -65,10 +69,12 @@ wxGCDC::wxGCDC( const wxMemoryDC& dc) :
 {
 }
 
 {
 }
 

+#if wxUSE_PRINTING_ARCHITECTURE

 wxGCDC::wxGCDC( const wxPrinterDC& dc) :
   wxDC( new wxGCDCImpl( this, dc ) )
 {
 }
 wxGCDC::wxGCDC( const wxPrinterDC& dc) :
   wxDC( new wxGCDCImpl( this, dc ) )
 {
 }

+#endif

 
 wxGCDC::wxGCDC() :
   wxDC( new wxGCDCImpl( this ) )
 
 wxGCDC::wxGCDC() :
   wxDC( new wxGCDCImpl( this ) )


@@ -132,12 +138,14 @@ wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc ) :
     SetGraphicsContext( wxGraphicsContext::Create(dc) );
 }
 
     SetGraphicsContext( wxGraphicsContext::Create(dc) );
 }
 

+#if wxUSE_PRINTING_ARCHITECTURE

 wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc ) :
    wxDCImpl( owner )
 {
     Init();
     SetGraphicsContext( wxGraphicsContext::Create(dc) );
 }
 wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc ) :
    wxDCImpl( owner )
 {
     Init();
     SetGraphicsContext( wxGraphicsContext::Create(dc) );
 }

+#endif

 
 void wxGCDCImpl::Init()
 {
 
 void wxGCDCImpl::Init()
 {


@@ -160,23 +168,34 @@ wxGCDCImpl::~wxGCDCImpl()
     delete m_graphicContext;
 }
 
     delete m_graphicContext;
 }
 

-void wxGCDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool WXUNUSED(useMask) )
+void wxGCDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y,
+                               bool useMask )

 {
     wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawBitmap - invalid DC") );
     wxCHECK_RET( bmp.IsOk(), wxT("wxGCDC(cg)::DoDrawBitmap - invalid bitmap") );
 
 {
     wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawBitmap - invalid DC") );
     wxCHECK_RET( bmp.IsOk(), wxT("wxGCDC(cg)::DoDrawBitmap - invalid bitmap") );
 

+    int w = bmp.GetWidth();
+    int h = bmp.GetHeight();

     if ( bmp.GetDepth() == 1 )
     {
         m_graphicContext->SetPen(*wxTRANSPARENT_PEN);
         m_graphicContext->SetBrush( wxBrush( m_textBackgroundColour , wxSOLID ) );
     if ( bmp.GetDepth() == 1 )
     {
         m_graphicContext->SetPen(*wxTRANSPARENT_PEN);
         m_graphicContext->SetBrush( wxBrush( m_textBackgroundColour , wxSOLID ) );

-        m_graphicContext->DrawRectangle( x , y , bmp.GetWidth() , bmp.GetHeight() );
+        m_graphicContext->DrawRectangle( x, y, w, h );

         m_graphicContext->SetBrush( wxBrush( m_textForegroundColour , wxSOLID ) );
         m_graphicContext->SetBrush( wxBrush( m_textForegroundColour , wxSOLID ) );

-        m_graphicContext->DrawBitmap( bmp, x , y , bmp.GetWidth() , bmp.GetHeight() );
+        m_graphicContext->DrawBitmap( bmp, x, y, w, h );

         m_graphicContext->SetBrush( m_graphicContext->CreateBrush(m_brush));
         m_graphicContext->SetPen( m_graphicContext->CreatePen(m_pen));
     }
         m_graphicContext->SetBrush( m_graphicContext->CreateBrush(m_brush));
         m_graphicContext->SetPen( m_graphicContext->CreatePen(m_pen));
     }

-    else
-        m_graphicContext->DrawBitmap( bmp, x , y , bmp.GetWidth() , bmp.GetHeight() );
+    else // not a monochrome bitmap, handle it normally
+    {
+        // make a copy in case we need to remove its mask, if we don't modify
+        // it the copy is cheap as bitmaps are reference-counted
+        wxBitmap bmpCopy(bmp);
+        if ( !useMask && bmp.GetMask() )
+            bmpCopy.SetMask(NULL);
+
+        m_graphicContext->DrawBitmap( bmpCopy, x, y, w, h );
+    }

 }
 
 void wxGCDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
 }
 
 void wxGCDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )


@@ -209,7 +228,7 @@ void wxGCDCImpl::EndPage()
 
 void wxGCDCImpl::Flush()
 {
 
 void wxGCDCImpl::Flush()
 {

-#ifdef __WXOSX__
+#ifdef __WXOSX_OR_COCOA__

     CGContextFlush( (CGContextRef) m_graphicContext->GetNativeContext() );
 #endif
 }
     CGContextFlush( (CGContextRef) m_graphicContext->GetNativeContext() );
 #endif
 }


@@ -237,10 +256,10 @@ void wxGCDCImpl::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h
     }
 }
 
     }
 }
 

-void wxGCDCImpl::DoSetClippingRegionAsRegion( const wxRegion &region )
+void wxGCDCImpl::DoSetDeviceClippingRegion( const wxRegion &region )

 {
     // region is in device coordinates
 {
     // region is in device coordinates

-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoSetClippingRegionAsRegion - invalid DC") );
+    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoSetDeviceClippingRegion - invalid DC") );

 
     if (region.Empty())
     {
 
     if (region.Empty())
     {


@@ -363,13 +382,13 @@ void wxGCDCImpl::ComputeScaleAndOrigin()
     if ( m_graphicContext )
     {
         m_matrixCurrent = m_graphicContext->CreateMatrix();
     if ( m_graphicContext )
     {
         m_matrixCurrent = m_graphicContext->CreateMatrix();

-        
+

         // the logical origin sets the origin to have new coordinates
         // the logical origin sets the origin to have new coordinates

-        m_matrixCurrent.Translate( m_deviceOriginX - m_logicalOriginX * m_signX * m_scaleX, 
+        m_matrixCurrent.Translate( m_deviceOriginX - m_logicalOriginX * m_signX * m_scaleX,

                                    m_deviceOriginY-m_logicalOriginY * m_signY * m_scaleY);
                                    m_deviceOriginY-m_logicalOriginY * m_signY * m_scaleY);

-        
+

         m_matrixCurrent.Scale( m_scaleX * m_signX, m_scaleY * m_signY );
         m_matrixCurrent.Scale( m_scaleX * m_signX, m_scaleY * m_signY );

-        
+

         m_graphicContext->SetTransform( m_matrixOriginal );
         m_graphicContext->ConcatTransform( m_matrixCurrent );
     }
         m_graphicContext->SetTransform( m_matrixOriginal );
         m_graphicContext->ConcatTransform( m_matrixCurrent );
     }


@@ -793,7 +812,7 @@ bool wxGCDCImpl::DoBlit(
 bool wxGCDCImpl::DoStretchBlit(
     wxCoord xdest, wxCoord ydest, wxCoord dstWidth, wxCoord dstHeight,
     wxDC *source, wxCoord xsrc, wxCoord ysrc, wxCoord srcWidth, wxCoord srcHeight,
 bool wxGCDCImpl::DoStretchBlit(
     wxCoord xdest, wxCoord ydest, wxCoord dstWidth, wxCoord dstHeight,
     wxDC *source, wxCoord xsrc, wxCoord ysrc, wxCoord srcWidth, wxCoord srcHeight,

-    int logical_func , bool WXUNUSED(useMask),
+    int logical_func , bool useMask,

     wxCoord xsrcMask, wxCoord ysrcMask )
 {
     wxCHECK_MSG( IsOk(), false, wxT("wxGCDC(cg)::DoStretchBlit - invalid DC") );
     wxCoord xsrcMask, wxCoord ysrcMask )
 {
     wxCHECK_MSG( IsOk(), false, wxT("wxGCDC(cg)::DoStretchBlit - invalid DC") );


@@ -802,7 +821,6 @@ bool wxGCDCImpl::DoStretchBlit(
     if ( logical_func == wxNO_OP )
         return true;
     else if ( !m_graphicContext->SetLogicalFunction( logical_func ) )
     if ( logical_func == wxNO_OP )
         return true;
     else if ( !m_graphicContext->SetLogicalFunction( logical_func ) )

-

     {
         wxFAIL_MSG( wxT("Blitting is only supported with wxCOPY logical operation.") );
         return false;
     {
         wxFAIL_MSG( wxT("Blitting is only supported with wxCOPY logical operation.") );
         return false;


@@ -833,6 +851,9 @@ bool wxGCDCImpl::DoStretchBlit(
 
     if ( blit.IsOk() )
     {
 
     if ( blit.IsOk() )
     {

+        if ( !useMask && blit.GetMask() )
+            blit.SetMask(NULL);
+

         m_graphicContext->DrawBitmap( blit, xdest, ydest,
                                       dstWidth, dstHeight);
     }
         m_graphicContext->DrawBitmap( blit, xdest, ydest,
                                       dstWidth, dstHeight);
     }


@@ -866,7 +887,7 @@ void wxGCDCImpl::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
 
 void wxGCDCImpl::DoDrawText(const wxString& str, wxCoord x, wxCoord y)
 {
 
 void wxGCDCImpl::DoDrawText(const wxString& str, wxCoord x, wxCoord y)
 {

-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawRotatedText - invalid DC") );
+    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawText - invalid DC") );

 
     if ( str.length() == 0 )
         return;
 
     if ( str.length() == 0 )
         return;