Solved problem with wxhInstance name being mangled by MSVC; wxGetInstance is now...

[wxWidgets.git] / include / wx / os2 / dcclient.h

diff --git a/include/wx/os2/dcclient.h b/include/wx/os2/dcclient.h
index 3130147c4fe040432df566927163b24c690928f4..7d715e99967c8b03c7bc9a02ecc76600d3255321 100644 (file)
--- a/include/wx/os2/dcclient.h
+++ b/include/wx/os2/dcclient.h
@@ -68,9 +68,9 @@ class WXDLLEXPORT wxWindowDC: public wxDC
     virtual bool CanGetTextExtent(void) const;
     virtual void GetTextExtent( const wxString &string, long *width, long *height,
                      long *descent = NULL, long *externalLeading = NULL,
-                     wxFont *theFont = NULL, bool use16 = FALSE );
-    virtual long GetCharWidth(void);
-    virtual long GetCharHeight(void);
+                     wxFont *theFont = NULL, bool use16 = FALSE ) const;
+    virtual long GetCharWidth(void) const;
+    virtual long GetCharHeight(void) const;
 
     virtual void Clear(void);
 
@@ -90,22 +90,20 @@ class WXDLLEXPORT wxWindowDC: public wxDC
 
     virtual void DrawSpline( wxList *points );
 private:
-    // VisualAge function hiding warning supression
-    void DrawEllipticArc (const wxPoint& pt, const wxSize& sz, double sa, double ea)
-    { wxDC::DrawEllipticArc(pt, sz, sa, ea); }
-    void DrawPoint( wxPoint& point )
-    { wxDC::DrawPoint(point); }
-    void DrawSpline( long x1, long y1, long x2, long y2, long x3, long y3 )
-    { DrawSpline(x1, y1, x2, y2, x3, y3); }
-    void DrawSpline( int n, wxPoint points[] )
-    { DrawSpline(n, points); }
-    void GetTextExtent( const wxString &string, long *width, long *height,
+    // to supress virtual function hiding, do not use
+    void DrawEllipticArc(const wxPoint& pt, const wxSize& sz,
+                         double sa, double ea)
+    { wxDC::DrawEllipticArc(pt, sz, sa, ea); };
+    void DrawPoint(wxPoint& pt)
+    { wxDC:DrawPoint(pt); };
+    void DrawSpline(int n, wxPoint points[])
+    { wxDC::DrawSpline(n, points); };
+    void DrawSpline(long x1, long y1, long x2, long y2, long x3, long y3)
+    { wxDC::DrawSpline(x1, y1, x2, y2, x3, y3); };
+    virtual void GetTextExtent( const wxString &string, long *width, long *height,
                      long *descent = NULL, long *externalLeading = NULL,
-                     wxFont *theFont = NULL ) const
-     { GetTextExtent( string, width, height, descent, externalLeading, theFont); };
-     // these next two are ridiculous! the only difference is the const
-    long GetCharWidth(void) const {return(GetCharWidth());};
-    long GetCharHeight(void) const {return(GetCharHeight());};
+                     wxFont *theFont = NULL) const
+    { GetTextExtent(string, width, height, descent, externalLeading, theFont, FALSE); };
 };
 
 //-----------------------------------------------------------------------------