implement support for per-state bitmaps in wxMSW wxButton

[wxWidgets.git] / interface / wx / window.h

diff --git a/interface/wx/window.h b/interface/wx/window.h
index 4835c550b8a720608b2ceb76051aa64bbacc9476..962d193a0c7b441a092e4d1df3934e02c2f0f7fc 100644 (file)
--- a/interface/wx/window.h
+++ b/interface/wx/window.h
@@ -1489,10 +1489,11 @@ public:
         @param font
             Font to use instead of the current window font (optional).
     */
         @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
 
     /**
         Gets the dimensions of the string as it would be drawn on the