added and documented wxDC::DrawCheckMark()

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

diff --git a/include/wx/mac/dc.h b/include/wx/mac/dc.h
index a685c9a5766d333f5f4195aa76ec3991811a4957..dd5525257346e6dfee8fc7b79eb7763c04c2f174 100644 (file)
--- 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 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);
             
     
     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
     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 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( 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; }
     
     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 ;
 
 //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
 
        // in order to preserve the const inheritance of the virtual functions, we have to 
        // use mutable variables starting from CWPro 5