fix wxMBConv_iconv to respect the base class conventions: when the input is NUL-termi...

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

diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp
index d6e6112d967aba7da3fb67b5f24c0612de28c79d..0c51ae077308fc4bd8da2b7403d67746ac3ae38c 100644 (file)
--- a/src/common/dcgraph.cpp
+++ b/src/common/dcgraph.cpp
@@ -28,9 +28,12 @@
     #include "wx/region.h"
 #endif
 
-#ifdef __WXMAC__
-#include "wx/mac/private.h"
+#include "wx/dcclient.h"
+
+#ifdef __WXOSX__
+    #include "ApplicationServices/ApplicationServices.h"
 #endif
+
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
@@ -62,6 +65,11 @@ wxGCDC::wxGCDC( const wxMemoryDC& dc) :
 {
 }
 
+wxGCDC::wxGCDC( const wxPrinterDC& dc) :
+  wxDC( new wxGCDCImpl( this, dc ) )
+{
+}
+
 wxGCDC::wxGCDC() :
   wxDC( new wxGCDCImpl( this ) )
 {
@@ -114,6 +122,7 @@ wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxWindowDC& dc ) :
 {
     Init();
     SetGraphicsContext( wxGraphicsContext::Create(dc) );
+    m_window = dc.GetWindow();
 }
 
 wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc ) :
@@ -123,6 +132,13 @@ wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc ) :
     SetGraphicsContext( wxGraphicsContext::Create(dc) );
 }
 
+wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc ) :
+   wxDCImpl( owner )
+{
+    Init();
+    SetGraphicsContext( wxGraphicsContext::Create(dc) );
+}
+
 void wxGCDCImpl::Init()
 {
     m_ok = false;
@@ -153,7 +169,7 @@ void wxGCDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool W
     {
         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 , bmp.GetWidth() , bmp.GetHeight() );
         m_graphicContext->SetBrush( wxBrush( m_textForegroundColour , wxSOLID ) );
         m_graphicContext->DrawBitmap( bmp, x , y , bmp.GetWidth() , bmp.GetHeight() );
         m_graphicContext->SetBrush( m_graphicContext->CreateBrush(m_brush));
@@ -174,12 +190,12 @@ void wxGCDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
     m_graphicContext->DrawIcon( icon , x, y, w, h );
 }
 
-bool wxGCDCImpl::StartDoc( const wxString& WXUNUSED(message) ) 
+bool wxGCDCImpl::StartDoc( const wxString& WXUNUSED(message) )
 {
-    return false;
+    return true;
 }
 
-void wxGCDCImpl::EndDoc() 
+void wxGCDCImpl::EndDoc()
 {
 }
 
@@ -187,13 +203,13 @@ void wxGCDCImpl::StartPage()
 {
 }
 
-void wxGCDCImpl::EndPage() 
+void wxGCDCImpl::EndPage()
 {
 }
-    
+
 void wxGCDCImpl::Flush()
 {
-#ifdef __WXMAC__
+#ifdef __WXOSX__
     CGContextFlush( (CGContextRef) m_graphicContext->GetNativeContext() );
 #endif
 }
@@ -265,7 +281,7 @@ void wxGCDCImpl::DestroyClippingRegion()
     int width, height ;
     GetOwner()->GetSize( &width , &height ) ;
     m_graphicContext->Clip( DeviceToLogicalX(0) , DeviceToLogicalY(0) , DeviceToLogicalXRel(width), DeviceToLogicalYRel(height) );
-    
+
     m_graphicContext->SetPen( m_pen );
     m_graphicContext->SetBrush( m_brush );
 
@@ -341,17 +357,19 @@ int wxGCDCImpl::GetDepth() const
 }
 
 void wxGCDCImpl::ComputeScaleAndOrigin()
-{    
+{
     wxDCImpl::ComputeScaleAndOrigin();
 
     if ( m_graphicContext )
     {
         m_matrixCurrent = m_graphicContext->CreateMatrix();
-        m_matrixCurrent.Translate( m_deviceOriginX, m_deviceOriginY );
-        m_matrixCurrent.Scale( m_scaleX, m_scaleY );
+        
         // the logical origin sets the origin to have new coordinates
-        m_matrixCurrent.Translate( -m_logicalOriginX, -m_logicalOriginY );
-
+        m_matrixCurrent.Translate( m_deviceOriginX - m_logicalOriginX * m_signX * m_scaleX, 
+                                   m_deviceOriginY-m_logicalOriginY * m_signY * m_scaleY);
+        
+        m_matrixCurrent.Scale( m_scaleX * m_signX, m_scaleY * m_signY );
+        
         m_graphicContext->SetTransform( m_matrixOriginal );
         m_graphicContext->ConcatTransform( m_matrixCurrent );
     }
@@ -402,7 +420,7 @@ void wxGCDCImpl::SetBrush( const wxBrush &brush )
         m_graphicContext->SetBrush( m_brush );
     }
 }
- 
+
 void wxGCDCImpl::SetBackground( const wxBrush &brush )
 {
     if (m_backgroundBrush == brush)
@@ -533,21 +551,19 @@ void wxGCDCImpl::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
     {
         wxGraphicsPath path = m_graphicContext->CreatePath();
         path.MoveToPoint( 0, 0 );
-        path.AddLineToPoint( h / 2.0 * cos(DegToRad(sa)) , h / 2.0 * sin(DegToRad(-sa)) );
-        path.AddLineToPoint( h / 2.0 * cos(DegToRad(ea)) , h / 2.0 * sin(DegToRad(-ea)) );
+        path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
         path.AddLineToPoint( 0, 0 );
         m_graphicContext->FillPath( path );
 
         path = m_graphicContext->CreatePath();
         path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
-        m_graphicContext->FillPath( path );
         m_graphicContext->StrokePath( path );
     }
     else
     {
         wxGraphicsPath path = m_graphicContext->CreatePath();
-    path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
-    m_graphicContext->DrawPath( path );
+        path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
+        m_graphicContext->DrawPath( path );
     }
 
     m_graphicContext->PopState();
@@ -786,7 +802,7 @@ bool wxGCDCImpl::DoStretchBlit(
     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;
@@ -948,8 +964,13 @@ void wxGCDCImpl::Clear(void)
 
 void wxGCDCImpl::DoGetSize(int *width, int *height) const
 {
-    *width = 10000;
-    *height = 10000;
+    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoGetSize - invalid DC") );
+    wxDouble w,h;
+    m_graphicContext->GetSize( &w, &h );
+    if ( height )
+        *height = (int) (h+0.5);
+    if ( width )
+        *width = (int) (w+0.5);
 }
 
 void wxGCDCImpl::DoGradientFillLinear(const wxRect& rect,