fix for always terminating intermediate UniChar String for 4 bytes wchar_t

[wxWidgets.git] / src / mac / dc.cpp

diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp
index bfd36c8421f7a034fa538bf5c30d6db69a139f44..d906bac5a4d663f7fb4decde458db5767c17edfd 100644 (file)
--- a/src/mac/dc.cpp
+++ b/src/mac/dc.cpp
@@ -28,10 +28,10 @@ using namespace std ;
 #endif
 
 #include "wx/mac/private.h"
 #endif
 
 #include "wx/mac/private.h"

-#include "ATSUnicode.h"
-#include "TextCommon.h"
-#include "TextEncodingConverter.h"
-#include "FixMath.h"
+#include <ATSUnicode.h>
+#include <TextCommon.h>
+#include <TextEncodingConverter.h>
+#include <FixMath.h>

 #if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 #endif
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 #endif


@@ -1476,6 +1476,7 @@ void  wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
     int i = 0 ;
     int line = 0 ;
     {
     int i = 0 ;
     int line = 0 ;
     {

+#if 0 // we don't have to do all that here

         while( i < length )
         {
             if( strtext[i] == 13 || strtext[i] == 10)
         while( i < length )
         {
             if( strtext[i] == 13 || strtext[i] == 10)


@@ -1515,6 +1516,21 @@ void  wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
                 {
                     wxCharBuffer text = linetext.mb_str(wxConvLocal) ; 
                     ::DrawText( text , 0 , strlen(text) ) ;
                 {
                     wxCharBuffer text = linetext.mb_str(wxConvLocal) ; 
                     ::DrawText( text , 0 , strlen(text) ) ;

+                    if ( m_backgroundMode != wxTRANSPARENT )
+                    {
+                        Point bounds={0,0} ;
+                        Rect background = frame ;
+                        SInt16 baseline ;
+                        ::GetThemeTextDimensions( mString,
+                            kThemeCurrentPortFont,
+                            kThemeStateActive,
+                            false,
+                            &bounds,
+                            &baseline );
+                        background.right = background.left + bounds.h ;
+                        background.bottom = background.top + bounds.v ;
+                        ::EraseRect( &background ) ;
+                    }

                     line++ ;
                     ::MoveTo( xx , yy + line*(fi.descent + fi.ascent + fi.leading) );
                 }
                     line++ ;
                     ::MoveTo( xx , yy + line*(fi.descent + fi.ascent + fi.leading) );
                 }


@@ -1523,6 +1539,8 @@ void  wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
             i++ ;
         }
         wxString linetext = strtext.Mid( laststop , i - laststop ) ;
             i++ ;
         }
         wxString linetext = strtext.Mid( laststop , i - laststop ) ;

+#endif // 0
+        wxString linetext = strtext ;

 #if TARGET_CARBON
         if ( useDrawThemeText )
         {
 #if TARGET_CARBON
         if ( useDrawThemeText )
         {


@@ -1556,6 +1574,14 @@ void  wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
 #endif
         {
             wxCharBuffer text = linetext.mb_str(wxConvLocal) ; 
 #endif
         {
             wxCharBuffer text = linetext.mb_str(wxConvLocal) ; 

+            if ( m_backgroundMode != wxTRANSPARENT )
+            {
+                Rect frame = { yy - fi.ascent + line*(fi.descent + fi.ascent + fi.leading)  ,xx , yy - fi.ascent + (line+1)*(fi.descent + fi.ascent + fi.leading) , xx + 10000 } ;
+                short width = ::TextWidth( text , 0 , strlen(text) ) ;
+                frame.right = frame.left + width ;
+
+                ::EraseRect( &frame ) ;
+            }

             ::DrawText( text , 0 , strlen(text) ) ;
          }
     }
             ::DrawText( text , 0 , strlen(text) ) ;
          }
     }


@@ -1602,6 +1628,7 @@ void  wxDC::DoGetTextExtent( const wxString &strtext, wxCoord *width, wxCoord *h
     if ( width )
     {
         *width = 0 ;
     if ( width )
     {
         *width = 0 ;

+#if 0 // apparently we don't have to do all that

         while( i < length )
         {
             if( strtext[i] == 13 || strtext[i] == 10)
         while( i < length )
         {
             if( strtext[i] == 13 || strtext[i] == 10)


@@ -1637,6 +1664,8 @@ void  wxDC::DoGetTextExtent( const wxString &strtext, wxCoord *width, wxCoord *h
         }
         
         wxString linetext = strtext.Mid( laststop , i - laststop ) ;
         }
         
         wxString linetext = strtext.Mid( laststop , i - laststop ) ;

+#endif // 0
+        wxString linetext = strtext ;

 #if TARGET_CARBON
         if ( useGetThemeText )
         {
 #if TARGET_CARBON
         if ( useGetThemeText )
         {