use wxCoord with GetTextExtent(), not long (the long overloads are deprecated and...

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

diff --git a/src/mac/carbon/statbrma.cpp b/src/mac/carbon/statbrma.cpp
index 9bca84cca9e9f58fca400edf4d115d18eb3d2434..b302d82ab659502735eb410d0379eb44dde5cb27 100644 (file)
--- a/src/mac/carbon/statbrma.cpp
+++ b/src/mac/carbon/statbrma.cpp
@@ -79,8 +79,7 @@ void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
 
     wxString text(GetStatusText( i ));
 
 
     wxString text(GetStatusText( i ));
 

-    long x, y;
-
+    wxCoord x, y;

     dc.GetTextExtent(text, &x, &y);
 
     int leftMargin = 2;
     dc.GetTextExtent(text, &x, &y);
 
     int leftMargin = 2;

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 5e591fe757484c51716a333a75532c57cef41d76..5262045852f616eca40b220d0abbe9fbf4dbe030 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -2275,7 +2275,7 @@ void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y,
         fontToUse = &m_font;
 
     wxClientDC dc( (wxWindowMac*) this ) ;
         fontToUse = &m_font;
 
     wxClientDC dc( (wxWindowMac*) this ) ;

-    long lx,ly,ld,le ;
+    wxCoord lx,ly,ld,le ;

     dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;
     if ( externalLeading )
         *externalLeading = le ;
     dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;
     if ( externalLeading )
         *externalLeading = le ;