patch applied with thanks, fixes #13865

[wxWidgets.git] / src / cocoa / dc.mm

diff --git a/src/cocoa/dc.mm b/src/cocoa/dc.mm
index cd4cc76174cb23fd75a0fa87be26d20f9c801067..0f24ba758f937511d08a42eab2c696363fdc50cd 100644 (file)
--- a/src/cocoa/dc.mm
+++ b/src/cocoa/dc.mm
@@ -6,7 +6,7 @@
 // Created:     2003/04/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/04/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"


@@ -362,7 +362,7 @@ void wxCocoaDCImpl::DoDrawPoint( int x, int y )
 {
 };
 
 {
 };
 

-void wxCocoaDCImpl::DoDrawPolygon( int, wxPoint *, int, int, int)
+void wxCocoaDCImpl::DoDrawPolygon( int, wxPoint *, int, int, wxPolygonFillMode)

 {
 };
 
 {
 };
 


@@ -456,7 +456,7 @@ void wxCocoaDCImpl::DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, bool
 {
     wxAutoNSAutoreleasePool pool;
     if(!CocoaTakeFocus()) return;
 {
     wxAutoNSAutoreleasePool pool;
     if(!CocoaTakeFocus()) return;

-    if(!bmp.Ok())
+    if(!bmp.IsOk())

         return;
 
 #if 0
         return;
 
 #if 0


@@ -499,7 +499,7 @@ void wxCocoaDCImpl::DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, bool
     [context restoreGraphicsState];
 }
 
     [context restoreGraphicsState];
 }
 

-bool wxCocoaDCImpl::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style)
+bool wxCocoaDCImpl::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, wxFloodFillStyle style)

 {
     return false;
 }
 {
     return false;
 }


@@ -509,7 +509,7 @@ void wxCocoaDCImpl::DoCrossHair(wxCoord x, wxCoord y)
 }
 
 
 }
 
 

-bool wxCocoaDCImpl::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop, bool useMask , wxCoord xsrcMask, wxCoord ysrcMask)
+bool wxCocoaDCImpl::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, wxRasterOperationMode rop, bool useMask , wxCoord xsrcMask, wxCoord ysrcMask)

 {
     if(!CocoaTakeFocus()) return false;
     if(!source) return false;
 {
     if(!CocoaTakeFocus()) return false;
     if(!source) return false;


@@ -540,13 +540,13 @@ void wxCocoaDCImpl::DoGetSizeMM( int* width, int* height ) const
 
 void wxCocoaDCImpl::SetTextForeground( const wxColour &col )
 {
 
 void wxCocoaDCImpl::SetTextForeground( const wxColour &col )
 {

-//  if (!Ok()) return;
+//  if (!IsOk()) return;

   m_textForegroundColour = col;
 };
 
 void wxCocoaDCImpl::SetTextBackground( const wxColour &col )
 {
   m_textForegroundColour = col;
 };
 
 void wxCocoaDCImpl::SetTextBackground( const wxColour &col )
 {

-//  if (!Ok()) return;
+//  if (!IsOk()) return;

   m_textBackgroundColour = col;
 };
 
   m_textBackgroundColour = col;
 };
 


@@ -579,12 +579,12 @@ void wxCocoaDCImpl::SetPalette(const wxPalette&)
 {
 }
 
 {
 }
 

-void wxCocoaDCImpl::SetLogicalFunction(int)
+void wxCocoaDCImpl::SetLogicalFunction(wxRasterOperationMode)

 {
 }
 
 
 {
 }
 
 

-void wxCocoaDCImpl::SetMapMode( int mode )
+void wxCocoaDCImpl::SetMapMode( wxMappingMode mode )

 {
   switch (mode)
   {
 {
   switch (mode)
   {