Adapted to API changes with respect to GetTextExtent (patch #1709152).

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

diff --git a/include/wx/os2/dc.h b/include/wx/os2/dc.h
index 01c4ff4a1cea2da4a62728eaf3c6923a11e321f1..01d7df0ef18f81bdedba5c81292d5e3a84a374b5 100644 (file)
--- a/include/wx/os2/dc.h
+++ b/include/wx/os2/dc.h
@@ -129,7 +129,7 @@ public:
                                     ,wxCoord*        pY
                                     ,wxCoord*        pDescent = NULL
                                     ,wxCoord*        pExternalLeading = NULL
                                     ,wxCoord*        pY
                                     ,wxCoord*        pDescent = NULL
                                     ,wxCoord*        pExternalLeading = NULL

-                                    ,wxFont*         pTheFont = NULL
+                                    ,const wxFont*   pTheFont = NULL

                                    ) const;
     virtual bool    CanDrawBitmap(void) const;
     virtual bool    CanGetTextExtent(void) const;
                                    ) const;
     virtual bool    CanDrawBitmap(void) const;
     virtual bool    CanGetTextExtent(void) const;

diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp
index 11d9169319780e333c92e8f416b7ebc133c5ab5b..d7c5f5139e656969f22816318bdbf5c24a0f2cb7 100644 (file)
--- a/src/os2/dc.cpp
+++ b/src/os2/dc.cpp
@@ -2151,7 +2151,7 @@ void wxDC::DoGetTextExtent(
 , wxCoord*                          pvY
 , wxCoord*                          pvDescent
 , wxCoord*                          pvExternalLeading
 , wxCoord*                          pvY
 , wxCoord*                          pvDescent
 , wxCoord*                          pvExternalLeading

-, wxFont*                           pTheFont
+, const wxFont*                     pTheFont

 ) const
 {
     POINTL                          avPoint[TXTBOX_COUNT];
 ) const
 {
     POINTL                          avPoint[TXTBOX_COUNT];