render characters on OSX one by one as fractional widths leads to errors otherwise

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

diff --git a/samples/caret/caret.cpp b/samples/caret/caret.cpp
index a1f025a653b9ad65ad94b1906983d40f99724ff2..596fa4b653a1e2e0b063c85160a3baccd1c0bb78 100644 (file)
--- a/samples/caret/caret.cpp
+++ b/samples/caret/caret.cpp
@@ -412,7 +412,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     wxPaintDC dc( this );
     PrepareDC( dc );
     dc.Clear();
     wxPaintDC dc( this );
     PrepareDC( dc );
     dc.Clear();

-
+    

     dc.SetFont( m_font );
 
     for ( int y = 0; y < m_yChars; y++ )
     dc.SetFont( m_font );
 
     for ( int y = 0; y < m_yChars; y++ )


@@ -424,10 +424,17 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
             wxChar ch = CharAt(x, y);
             if ( !ch )
                 ch = wxT(' ');
             wxChar ch = CharAt(x, y);
             if ( !ch )
                 ch = wxT(' ');

+#ifdef __WXOSX__
+            dc.DrawText(ch, m_xMargin + x * m_widthChar,
+                        m_yMargin + y * m_heightChar );
+#else

             line += ch;
             line += ch;

+#endif

         }
 
         }
 

+#ifndef __WXOSX__

         dc.DrawText( line, m_xMargin, m_yMargin + y * m_heightChar );
         dc.DrawText( line, m_xMargin, m_yMargin + y * m_heightChar );

+#endif

     }
 }
 
     }
 }