]> git.saurik.com Git - wxWidgets.git/commitdiff
GetTextExtent() is not virtual any more (since r60984)
authorVadim Zeitlin <vadim@wxwidgets.org>
Thu, 11 Jun 2009 15:57:29 +0000 (15:57 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Thu, 11 Jun 2009 15:57:29 +0000 (15:57 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

interface/wx/window.h

index 4835c550b8a720608b2ceb76051aa64bbacc9476..962d193a0c7b441a092e4d1df3934e02c2f0f7fc 100644 (file)
@@ -1489,10 +1489,11 @@ public:
         @param font
             Font to use instead of the current window font (optional).
     */
-    virtual void GetTextExtent(const wxString& string, int* w, int* h,
-                               int* descent = NULL,
-                               int* externalLeading = NULL,
-                               const wxFont* font = NULL) const;
+    void GetTextExtent(const wxString& string,
+                        int* w, int* h,
+                       int* descent = NULL,
+                       int* externalLeading = NULL,
+                       const wxFont* font = NULL) const;
 
     /**
         Gets the dimensions of the string as it would be drawn on the