compilation fix for wxOSX/Cocoa: don't use Carbon functions in common to all OS X...

[wxWidgets.git] / src / osx / carbon / textctrl.cpp

diff --git a/src/osx/carbon/textctrl.cpp b/src/osx/carbon/textctrl.cpp
index bf54b621eb83527521602b5a2a9591ccf502ebe6..e0089b8859f8695dca747a3c768a96216585c595 100644 (file)
--- a/src/osx/carbon/textctrl.cpp
+++ b/src/osx/carbon/textctrl.cpp
@@ -234,7 +234,7 @@ public :
 
     void AdjustCreationAttributes( const wxColour& background, bool visible ) ;
 
 
     void AdjustCreationAttributes( const wxColour& background, bool visible ) ;
 

-    virtual void SetFont( const wxFont & font, const wxColour& foreground, long windowStyle ) ;
+    virtual void SetFont( const wxFont & font, const wxColour& foreground, long windowStyle, bool ignoreBlack ) ;

     virtual void SetBackgroundColour(const wxColour& col );
     virtual void SetStyle( long start, long end, const wxTextAttr& style ) ;
     virtual void Copy() ;
     virtual void SetBackgroundColour(const wxColour& col );
     virtual void SetStyle( long start, long end, const wxTextAttr& style ) ;
     virtual void Copy() ;


@@ -893,7 +893,7 @@ void wxMacMLTEControl::AdjustCreationAttributes(const wxColour &background,
     } ;
 
     err = TXNSetTypeAttributes(
     } ;
 
     err = TXNSetTypeAttributes(

-        m_txn, sizeof(typeAttr) / sizeof(TXNTypeAttributes),
+        m_txn, WXSIZEOF(typeAttr),

         typeAttr, kTXNStartOffset, kTXNEndOffset );
     verify_noerr( err );
 
         typeAttr, kTXNStartOffset, kTXNEndOffset );
     verify_noerr( err );
 


@@ -1080,7 +1080,8 @@ void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , lo
 
 void wxMacMLTEControl::SetFont(const wxFont & font,
                                const wxColour& foreground,
 
 void wxMacMLTEControl::SetFont(const wxFont & font,
                                const wxColour& foreground,

-                               long WXUNUSED(windowStyle))
+                               long WXUNUSED(windowStyle),
+                               bool WXUNUSED(ignoreBlack))

 {
     wxMacEditHelper help( m_txn ) ;
     TXNSetAttribute( wxTextAttr( foreground, wxNullColour, font ), kTXNStartOffset, kTXNEndOffset ) ;
 {
     wxMacEditHelper help( m_txn ) ;
     TXNSetAttribute( wxTextAttr( foreground, wxNullColour, font ), kTXNStartOffset, kTXNEndOffset ) ;


@@ -1124,6 +1125,15 @@ long wxMacMLTEControl::GetLastPosition() const
     wxTextPos actualsize = 0 ;
 
     Handle theText ;
     wxTextPos actualsize = 0 ;
 
     Handle theText ;

+#if wxUSE_UNICODE
+    OSErr err = TXNGetDataEncoded( m_txn, kTXNStartOffset, kTXNEndOffset, &theText, kTXNUnicodeTextData );
+    // all done
+    if ( err == noErr )
+    {
+        actualsize = GetHandleSize( theText )/sizeof(UniChar);
+        DisposeHandle( theText ) ;
+    }
+#else

     OSErr err = TXNGetDataEncoded( m_txn, kTXNStartOffset, kTXNEndOffset, &theText, kTXNTextData );
 
     // all done
     OSErr err = TXNGetDataEncoded( m_txn, kTXNStartOffset, kTXNEndOffset, &theText, kTXNTextData );
 
     // all done


@@ -1132,6 +1142,7 @@ long wxMacMLTEControl::GetLastPosition() const
         actualsize = GetHandleSize( theText ) ;
         DisposeHandle( theText ) ;
     }
         actualsize = GetHandleSize( theText ) ;
         DisposeHandle( theText ) ;
     }

+#endif

     else
     {
         actualsize = 0 ;
     else
     {
         actualsize = 0 ;