storing modal returncode correctly for carbon

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

diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp
index f48a1be3dcd12538543fc0d79614a031fd43b124..dcdf8485e370678ef4df531baee9dc5e162b2461 100644 (file)
--- a/src/common/graphcmn.cpp
+++ b/src/common/graphcmn.cpp
@@ -18,7 +18,7 @@
 
 #if wxUSE_GRAPHICS_CONTEXT
 
 
 #if wxUSE_GRAPHICS_CONTEXT
 

-#include "wx/private/graphics.h"
+#include "wx/graphics.h"

 
 #ifndef WX_PRECOMP
     #include "wx/icon.h"
 
 #ifndef WX_PRECOMP
     #include "wx/icon.h"


@@ -28,11 +28,7 @@
     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-static const double RAD2DEG = 180.0 / M_PI;
+#include "wx/private/graphics.h"

 
 //-----------------------------------------------------------------------------
 // Local functions
 
 //-----------------------------------------------------------------------------
 // Local functions


@@ -257,7 +253,7 @@ wxRect2DDouble wxGraphicsPath::GetBox() const
     return wxRect2DDouble( x,y,w,h );
 }
 
     return wxRect2DDouble( x,y,w,h );
 }
 

-bool wxGraphicsPath::Contains( const wxPoint2DDouble& c, int fillStyle ) const
+bool wxGraphicsPath::Contains( const wxPoint2DDouble& c, wxPolygonFillMode fillStyle ) const

 {
     return Contains( c.m_x, c.m_y, fillStyle);
 }
 {
     return Contains( c.m_x, c.m_y, fillStyle);
 }


@@ -383,7 +379,7 @@ void wxGraphicsPath::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h)
     GetPathData()->GetBox(x,y,w,h);
 }
 
     GetPathData()->GetBox(x,y,w,h);
 }
 

-bool wxGraphicsPath::Contains( wxDouble x, wxDouble y, int fillStyle ) const
+bool wxGraphicsPath::Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle ) const

 {
     return GetPathData()->Contains(x,y,fillStyle);
 }
 {
     return GetPathData()->Contains(x,y,fillStyle);
 }


@@ -480,7 +476,6 @@ void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2,
     wxDouble dist = r / sin(alpha/2) * cos(alpha/2);
     // calculate tangential points
     wxPoint2DDouble t1 = dist*v1 + p1;
     wxDouble dist = r / sin(alpha/2) * cos(alpha/2);
     // calculate tangential points
     wxPoint2DDouble t1 = dist*v1 + p1;

-    wxPoint2DDouble t2 = dist*v2 + p1;

 
     wxPoint2DDouble nv1 = v1;
     nv1.SetVectorAngle(v1.GetVectorAngle()-90);
 
     wxPoint2DDouble nv1 = v1;
     nv1.SetVectorAngle(v1.GetVectorAngle()-90);


@@ -501,9 +496,11 @@ void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2,
 IMPLEMENT_ABSTRACT_CLASS(wxGraphicsContext, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxGraphicsContext, wxObject)
 
 

-wxGraphicsContext::wxGraphicsContext(wxGraphicsRenderer* renderer) : wxGraphicsObject(renderer)
+wxGraphicsContext::wxGraphicsContext(wxGraphicsRenderer* renderer) :
+    wxGraphicsObject(renderer),
+      m_antialias(wxANTIALIAS_DEFAULT),
+      m_composition(wxCOMPOSITION_OVER)

 {
 {

-    m_logicalFunction = wxCOPY;

 }
 
 wxGraphicsContext::~wxGraphicsContext()
 }
 
 wxGraphicsContext::~wxGraphicsContext()


@@ -563,7 +560,7 @@ void wxGraphicsContext::SetPen( const wxGraphicsPen& pen )
 
 void wxGraphicsContext::SetPen( const wxPen& pen )
 {
 
 void wxGraphicsContext::SetPen( const wxPen& pen )
 {

-    if ( !pen.Ok() || pen.GetStyle() == wxTRANSPARENT )
+    if ( !pen.Ok() || pen.GetStyle() == wxPENSTYLE_TRANSPARENT )

         SetPen( wxNullGraphicsPen );
     else
         SetPen( CreatePen( pen ) );
         SetPen( wxNullGraphicsPen );
     else
         SetPen( CreatePen( pen ) );


@@ -577,7 +574,7 @@ void wxGraphicsContext::SetBrush( const wxGraphicsBrush& brush )
 
 void wxGraphicsContext::SetBrush( const wxBrush& brush )
 {
 
 void wxGraphicsContext::SetBrush( const wxBrush& brush )
 {

-    if ( !brush.Ok() || brush.GetStyle() == wxTRANSPARENT )
+    if ( !brush.Ok() || brush.GetStyle() == wxBRUSHSTYLE_TRANSPARENT )

         SetBrush( wxNullGraphicsBrush );
     else
         SetBrush( CreateBrush( brush ) );
         SetBrush( wxNullGraphicsBrush );
     else
         SetBrush( CreateBrush( brush ) );


@@ -589,16 +586,6 @@ void wxGraphicsContext::SetFont( const wxGraphicsFont& font )
     m_font = font;
 }
 
     m_font = font;
 }
 

-bool wxGraphicsContext::SetLogicalFunction( int function )
-{
-    if ( function == wxCOPY )
-    {
-        m_logicalFunction = function;
-        return true;
-    }
-    return false;
-}
-

 void wxGraphicsContext::SetFont( const wxFont& font, const wxColour& colour )
 {
     if ( font.Ok() )
 void wxGraphicsContext::SetFont( const wxFont& font, const wxColour& colour )
 {
     if ( font.Ok() )


@@ -607,7 +594,7 @@ void wxGraphicsContext::SetFont( const wxFont& font, const wxColour& colour )
         SetFont( wxNullGraphicsFont );
 }
 
         SetFont( wxNullGraphicsFont );
 }
 

-void wxGraphicsContext::DrawPath( const wxGraphicsPath& path, int fillStyle )
+void wxGraphicsContext::DrawPath( const wxGraphicsPath& path, wxPolygonFillMode fillStyle )

 {
     FillPath( path , fillStyle );
     StrokePath( path );
 {
     FillPath( path , fillStyle );
     StrokePath( path );


@@ -722,7 +709,7 @@ void wxGraphicsContext::StrokeLines( size_t n, const wxPoint2DDouble *points)
     StrokePath( path );
 }
 
     StrokePath( path );
 }
 

-void wxGraphicsContext::DrawLines( size_t n, const wxPoint2DDouble *points, int fillStyle)
+void wxGraphicsContext::DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode fillStyle)

 {
     wxASSERT(n > 1);
     wxGraphicsPath path = CreatePath();
 {
     wxASSERT(n > 1);
     wxGraphicsPath path = CreatePath();


@@ -789,20 +776,12 @@ wxGraphicsFont wxGraphicsContext::CreateFont( const wxFont &font , const wxColou
 
 wxGraphicsBitmap wxGraphicsContext::CreateBitmap( const wxBitmap& bmp ) const
 {
 
 wxGraphicsBitmap wxGraphicsContext::CreateBitmap( const wxBitmap& bmp ) const
 {

-#ifndef __WXGTK20__

     return GetRenderer()->CreateBitmap(bmp);
     return GetRenderer()->CreateBitmap(bmp);

-#else
-    return wxNullGraphicsBitmap;
-#endif

 }
 
 wxGraphicsBitmap wxGraphicsContext::CreateSubBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h   ) const
 {
 }
 
 wxGraphicsBitmap wxGraphicsContext::CreateSubBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h   ) const
 {

-#ifndef __WXGTK20__

     return GetRenderer()->CreateSubBitmap(bmp,x,y,w,h);
     return GetRenderer()->CreateSubBitmap(bmp,x,y,w,h);

-#else
-    return wxNullGraphicsBitmap;
-#endif

 }
 
 /* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxWindowDC& dc)
 }
 
 /* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxWindowDC& dc)