merged deleted code back

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

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index 9e151e2a2e1a34981b3ce048f9e1697f6f59f4c9..14ced3443b169137d204a291ee35388c423ad4d0 100644 (file)
--- 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 9e151e2a2e1a34981b3ce048f9e1697f6f59f4c9..14ced3443b169137d204a291ee35388c423ad4d0 100644 (file)
--- 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] ;