Merge recent wxPython changes from 2.8 branch to HEAD

[wxWidgets.git] / wxPython / src / _dc.i

diff --git a/wxPython/src/_dc.i b/wxPython/src/_dc.i
index 6215187fcf5e15a89a02c290613e9862a8a1b234..38162ff4489cee2da551cbd916306f5fb4b71663 100644 (file)
--- a/wxPython/src/_dc.i
+++ b/wxPython/src/_dc.i
@@ -630,7 +630,7 @@ works for single line strings.", "");
     DocDeclAStrName(
         void, GetTextExtent(const wxString& string,
                             wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord* OUTPUT,
     DocDeclAStrName(
         void, GetTextExtent(const wxString& string,
                             wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord* OUTPUT,

-                            wxFont* font = NULL),
+                            const wxFont* font = NULL),

         "GetFullTextExtent(wxString string, Font font=None) ->\n   (width, height, descent, externalLeading)",
         "Get the width, height, decent and leading of the text using the
 current or specified font. Only works for single line strings.", "",
         "GetFullTextExtent(wxString string, Font font=None) ->\n   (width, height, descent, externalLeading)",
         "Get the width, height, decent and leading of the text using the
 current or specified font. Only works for single line strings.", "",


@@ -641,7 +641,7 @@ current or specified font. Only works for single line strings.", "",
     DocDeclAStr(
         void, GetMultiLineTextExtent(const wxString& text,
                                      wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT,
     DocDeclAStr(
         void, GetMultiLineTextExtent(const wxString& text,
                                      wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT,

-                                     wxFont *font = NULL),
+                                     const wxFont *font = NULL),

         "GetMultiLineTextExtent(wxString string, Font font=None) ->\n   (width, height, lineHeight)",
         "Get the width, height, and line height of the text using the
 current or specified font. Works for single as well as multi-line
         "GetMultiLineTextExtent(wxString string, Font font=None) ->\n   (width, height, lineHeight)",
         "Get the width, height, and line height of the text using the
 current or specified font. Works for single as well as multi-line