X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..cd9da200285e3c625be91768c9ca61dc218c94d0:/include/wx/mac/dc.h

diff --git a/include/wx/mac/dc.h b/include/wx/mac/dc.h
index a685c9a576..dd55252573 100644
--- a/include/wx/mac/dc.h
+++ b/include/wx/mac/dc.h
@@ -168,8 +168,19 @@ class WXDLLEXPORT wxDC: public wxObject
     virtual void GetTextExtent( const wxString &string, long *width, long *height,
                      long *descent = NULL, long *externalLeading = NULL,
                      wxFont *theFont = NULL, bool use16 = FALSE ) const ;
-    virtual long GetCharWidth(void);
-    virtual long GetCharHeight(void);
+    virtual void GetTextExtent( const wxString &string, int *width, int *height,
+                     int *descent = NULL, int *externalLeading = NULL,
+                     wxFont *theFont = NULL, bool use16 = FALSE ) const 
+    {
+    	long lwidth,lheight,ldescent,lexternal ;
+    	GetTextExtent( string, &lwidth,&lheight,&ldescent,&lexternal,theFont,use16 ) ;
+    	*width = lwidth ;
+    	*height = lheight ;
+    	if (descent) *descent = ldescent ;
+    	if (externalLeading) *externalLeading = lexternal ;
+    }
+    virtual wxCoord GetCharWidth(void) const;
+    virtual wxCoord GetCharHeight(void) const;
     
     virtual void Clear(void);
             
@@ -200,9 +211,12 @@ class WXDLLEXPORT wxDC: public wxObject
     void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };
     
     // the first two must be overridden and called
-    virtual void SetClippingRegion( long x, long y, long width, long height );
+    virtual void SetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
+    virtual void SetClippingRegion( const wxRect& rect );
     virtual void DestroyClippingRegion(void);
+    virtual void GetClippingBox( wxCoord *x, wxCoord *y, wxCoord *width, wxCoord *height ) const;
     virtual void GetClippingBox( long *x, long *y, long *width, long *height ) const;
+    virtual void GetClippingBox(wxRect& rect) const;
     
     virtual inline long MinX(void) const { return m_minX; }
     virtual inline long MaxX(void) const { return m_maxX; }
@@ -368,6 +382,7 @@ class WXDLLEXPORT wxDC: public wxObject
 
 //begin wxmac
 	GrafPtr				m_macPort ;
+	GWorldPtr			m_macMask ;
 
 	// in order to preserve the const inheritance of the virtual functions, we have to 
 	// use mutable variables starting from CWPro 5