X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c5789d15269c02979eef2b5a1779c35af5151473..687b91d266990129fbbb8c21d92fa4298b458352:/include/wx/mac/classic/dc.h

diff --git a/include/wx/mac/classic/dc.h b/include/wx/mac/classic/dc.h
index 4410680253..88b7dacfb3 100644
--- a/include/wx/mac/classic/dc.h
+++ b/include/wx/mac/classic/dc.h
@@ -12,10 +12,6 @@
 #ifndef _WX_DC_H_
 #define _WX_DC_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dc.h"
-#endif
-
 #include "wx/pen.h"
 #include "wx/brush.h"
 #include "wx/icon.h"
@@ -41,8 +37,6 @@
 // global variables
 //-----------------------------------------------------------------------------
 
-extern int wxPageNumber;
-
 class wxMacPortStateHelper ;
 //-----------------------------------------------------------------------------
 // wxDC
@@ -56,7 +50,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
   public:
 
     wxDC();
-    ~wxDC();
+    virtual ~wxDC();
 
 
     // implement base class pure virtuals
@@ -64,7 +58,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
 
     virtual void Clear();
 
-    virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return TRUE; }
+    virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; }
     virtual void EndDoc(void) {};
 
     virtual void StartPage(void) {};
@@ -105,9 +99,9 @@ class WXDLLEXPORT wxDC: public wxDCBase
     virtual void SetTextForeground(const wxColour& colour) ;
     virtual void SetTextBackground(const wxColour& colour) ;
 
-    void ComputeScaleAndOrigin(void);
-  public:
+    virtual void ComputeScaleAndOrigin();
 
+  public:
 
     wxCoord XDEV2LOG(wxCoord x) const
     {
@@ -216,7 +210,7 @@ protected:
 
     virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
-                              bool useMask = FALSE);
+                              bool useMask = false);
 
     virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
     virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
@@ -224,7 +218,7 @@ protected:
 
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,
-                        int rop = wxCOPY, bool useMask = FALSE, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
+                        int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
 
     // this is gnarly - we can't even call this function DoSetClippingRegion()
     // because of virtual function hiding