Add virtual ~wxAnyScrollHelperBase() to fix compiler warning.

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

diff --git a/src/cocoa/dc.mm b/src/cocoa/dc.mm
index 01df15a010df27e3f2f4aefc2878bb320f593eb1..0c10821326f7d89e2bf0e5581674bbcbe4666093 100644 (file)
--- a/src/cocoa/dc.mm
+++ b/src/cocoa/dc.mm
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/04/01
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/04/01

-// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


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

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

 {
 };
 
 {
 };
 

-void wxCocoaDCImpl::DoDrawLines( int, wxPoint *, int, int )
+void wxCocoaDCImpl::DoDrawLines( int, const wxPoint *, int, int )

 {
 }
 
 {
 }
 


@@ -456,7 +455,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


@@ -540,13 +539,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;
 };
 


@@ -650,7 +649,7 @@ void wxCocoaDCImpl::ComputeScaleAndOrigin(void)
   m_scaleX = m_logicalScaleX * m_userScaleX;
   m_scaleY = m_logicalScaleY * m_userScaleY;
 
   m_scaleX = m_logicalScaleX * m_userScaleX;
   m_scaleY = m_logicalScaleY * m_userScaleY;
 

-  // CMB: if scale has changed call SetPen to recalulate the line width
+  // CMB: if scale has changed call SetPen to recalculate the line width

   if (m_scaleX != origScaleX || m_scaleY != origScaleY)
   {
 #if 0
   if (m_scaleX != origScaleX || m_scaleY != origScaleY)
   {
 #if 0