Added first stab at GetBoundingRect for generic tree control

[wxWidgets.git] / include / wx / mac / dc.h

diff --git a/include/wx/mac/dc.h b/include/wx/mac/dc.h
index 3075bbf734e6070721c5c8358588e6317f983854..89d8cdd981ea078173896c2c66379badf8e97e43 100644 (file)
--- 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;
     
@@ -364,13 +375,12 @@ class WXDLLEXPORT wxDC: public wxObject
     
     bool         m_needComputeScaleX,m_needComputeScaleY;         // not yet used
     
-    float        m_scaleFactor;  // wxPSDC wants to have this. Will disappear.
-    
     long         m_clipX1,m_clipY1,m_clipX2,m_clipY2;
     long         m_minX,m_maxX,m_minY,m_maxY;
 
 //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