From 5715cc1bed21f3c59dc580f869e4a7c508234598 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sun, 15 Sep 2002 07:30:59 +0000 Subject: [PATCH] merged deleted code back git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/dc.cpp | 4 +++- src/mac/dc.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp index 9e151e2a2e..14ced3443b 100644 --- a/src/mac/carbon/dc.cpp +++ b/src/mac/carbon/dc.cpp @@ -1650,7 +1650,7 @@ void wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he macText = wxMacMakeMacStringFromPC( string ) ; text = macText ; length = macText.Length() ; - } + } else { text = string ; @@ -2043,6 +2043,8 @@ void wxDC::MacInstallPen() const wxDash* dash ; int number = m_pen.GetDashes(&dash) ; // right now we don't allocate larger pixmaps + // int number = + m_pen.GetDashes(&dash) ; for ( int i = 0 ; i < 8 ; ++i ) { pat.pat[i] = dash[0] ; diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp index 9e151e2a2e..14ced3443b 100644 --- a/src/mac/dc.cpp +++ b/src/mac/dc.cpp @@ -1650,7 +1650,7 @@ void wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he macText = wxMacMakeMacStringFromPC( string ) ; text = macText ; length = macText.Length() ; - } + } else { text = string ; @@ -2043,6 +2043,8 @@ void wxDC::MacInstallPen() const wxDash* dash ; int number = m_pen.GetDashes(&dash) ; // right now we don't allocate larger pixmaps + // int number = + m_pen.GetDashes(&dash) ; for ( int i = 0 ; i < 8 ; ++i ) { pat.pat[i] = dash[0] ; -- 2.47.2