made GetMultiLineTextExtent() const (part of patch 1595123)

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

diff --git a/include/wx/dc.h b/include/wx/dc.h
index dbe62c4d95e2f94754072a0c0c5c4e3ceeef919b..da5bc5fde03d00568d3d3cea7260d849c16434ea 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -446,7 +446,7 @@ public:
                                         wxCoord *width,
                                         wxCoord *height,
                                         wxCoord *heightLine = NULL,
                                         wxCoord *width,
                                         wxCoord *height,
                                         wxCoord *heightLine = NULL,

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

 
     // Measure cumulative width of text after each character
     bool GetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
 
     // Measure cumulative width of text after each character
     bool GetPartialTextExtents(const wxString& text, wxArrayInt& widths) const

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 52359ee58681d58fe6f09533f5a67f39e41892ea..4df3396d2c8ffaf8a7bd3a6da0dd4b6b91808a8e 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -471,7 +471,7 @@ void wxDCBase::GetMultiLineTextExtent(const wxString& text,
                                       wxCoord *x,
                                       wxCoord *y,
                                       wxCoord *h,
                                       wxCoord *x,
                                       wxCoord *y,
                                       wxCoord *h,

-                                      wxFont *font)
+                                      wxFont *font) const

 {
     wxCoord widthTextMax = 0, widthLine,
             heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;
 {
     wxCoord widthTextMax = 0, widthLine,
             heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;