ComputeScaleAndOrigin not protected anymore

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/_dc.i b/wxPython/src/_dc.i
index 90ddab72b5f6a8ce51fedc1c307ad12a1ae3c939..c41e802be729de9f04a054dc094cef1485908cd5 100644 (file)
--- a/wxPython/src/_dc.i
+++ b/wxPython/src/_dc.i
@@ -585,7 +585,7 @@ current or specified font. Only works for single line strings.", "",
         void, GetMultiLineTextExtent(const wxString& text,
                                      wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT,
                                      wxFont *font = NULL),
         void, GetMultiLineTextExtent(const wxString& text,
                                      wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT,
                                      wxFont *font = NULL),

-        "GetMultiLineTextExtent(wxString string, Font font=None) ->\n   (width, height, descent, externalLeading)",
+        "GetMultiLineTextExtent(wxString string, Font font=None) ->\n   (width, height, lineHeight)",

         "Get the width, height, decent and leading of the text using the
 current or specified font. Works for single as well as multi-line
 strings.", "");
         "Get the width, height, decent and leading of the text using the
 current or specified font. Works for single as well as multi-line
 strings.", "");


@@ -883,12 +883,12 @@ colour.
 ", "");
     
 
 ", "");
     
 

-//     DocDeclStr(
-//         void , ComputeScaleAndOrigin(),
-//         "Performs all necessary computations for given platform and context
-// type after each change of scale and origin parameters. Usually called
-// automatically internally after such changes.
-// ", "");
+    DocDeclStr(
+        void , ComputeScaleAndOrigin(),
+        "Performs all necessary computations for given platform and context
+type after each change of scale and origin parameters. Usually called
+automatically internally after such changes.
+", "");