X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2fc70a88e81b9ecad50fac19dffb757c406d6012..b27f2615c7e78c2a0ad53614cad2ead4ec32e05d:/include/wx/mac/dc.h

diff --git a/include/wx/mac/dc.h b/include/wx/mac/dc.h
index 3075bbf734..dd55252573 100644
--- a/include/wx/mac/dc.h
+++ b/include/wx/mac/dc.h
@@ -168,6 +168,17 @@ 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 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;
     
@@ -371,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