explicitly return NFR_UNICODE from WM_NOTIFYFORMAT when using MSLU

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

diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp
index 50daa9708f5015097acb48c4e05a28bc64ccb6d5..6ebd852390580af98c23ba38761c31d017bfca6b 100644 (file)
--- a/src/mac/textctrl.cpp
+++ b/src/mac/textctrl.cpp
@@ -24,6 +24,8 @@
   #include <stat.h>
 #endif
 
   #include <stat.h>
 #endif
 

+#include "wx/msgdlg.h"
+

 #if wxUSE_STD_IOSTREAM
     #if wxUSE_IOSTREAMH
         #include <fstream.h>
 #if wxUSE_STD_IOSTREAM
     #if wxUSE_IOSTREAMH
         #include <fstream.h>


@@ -53,9 +55,9 @@
 #include <Scrap.h>
 #endif
 #include <MacTextEditor.h>
 #include <Scrap.h>
 #endif
 #include <MacTextEditor.h>

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

 #include "wx/mac/uma.h"
 
 #define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL
 #include "wx/mac/uma.h"
 
 #define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL


@@ -67,8 +69,6 @@ extern wxControl *wxFindControlFromMacControl(ControlHandle inControl ) ;
 // moment is to avoid setting the true focus on the control, the proper solution at the end would be to have
 // an alternate path for carbon key events that routes automatically into the same wx flow of events
 
 // moment is to avoid setting the true focus on the control, the proper solution at the end would be to have
 // an alternate path for carbon key events that routes automatically into the same wx flow of events
 

-#include "MacTextEditor.h"
-

 /* part codes */
 
 /* kmUPTextPart is the part code we return to indicate the user has clicked
 /* part codes */
 
 /* kmUPTextPart is the part code we return to indicate the user has clicked


@@ -216,8 +216,17 @@ static pascal void TPPaneDrawProc(ControlRef theControl, ControlPartCode thePart
                 InvalWindowRect( GetControlOwner( theControl ) , &oldbounds ) ;
             SetRect(&varsp->fRFocusOutline, bounds.left, bounds.top, bounds.right, bounds.bottom);
             SetRect(&varsp->fRTextOutline, bounds.left, bounds.top, bounds.right, bounds.bottom);
                 InvalWindowRect( GetControlOwner( theControl ) , &oldbounds ) ;
             SetRect(&varsp->fRFocusOutline, bounds.left, bounds.top, bounds.right, bounds.bottom);
             SetRect(&varsp->fRTextOutline, bounds.left, bounds.top, bounds.right, bounds.bottom);

-            SetRect(&varsp->fRTextArea, bounds.left + 2 , bounds.top + (varsp->fMultiline ? 0 : 2) ,
-                bounds.right - (varsp->fMultiline ? 0 : 2), bounds.bottom - (varsp->fMultiline ? 0 : 2));
+
+            if (!wxFindControlFromMacControl(theControl)->HasFlag(wxNO_BORDER))
+            {
+                SetRect(&varsp->fRTextArea, bounds.left + 2 , bounds.top + (varsp->fMultiline ? 0 : 2) ,
+                    bounds.right - (varsp->fMultiline ? 0 : 2), bounds.bottom - (varsp->fMultiline ? 0 : 2));
+            }
+            else
+            {
+                SetRect(&varsp->fRTextArea, bounds.left , bounds.top ,
+                    bounds.right, bounds.bottom);
+            }

             RectRgn(varsp->fTextBackgroundRgn, &varsp->fRTextOutline);
             if ( IsControlVisible( theControl ) )
                 TXNSetFrameBounds(  varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left,
             RectRgn(varsp->fTextBackgroundRgn, &varsp->fRTextOutline);
             if ( IsControlVisible( theControl ) )
                 TXNSetFrameBounds(  varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left,


@@ -237,9 +246,12 @@ static pascal void TPPaneDrawProc(ControlRef theControl, ControlPartCode thePart
             TXNDraw(varsp->fTXNRec, NULL);
                 /* restore the drawing environment */
                 /* draw the text frame and focus frame (if necessary) */
             TXNDraw(varsp->fTXNRec, NULL);
                 /* restore the drawing environment */
                 /* draw the text frame and focus frame (if necessary) */

-            DrawThemeEditTextFrame(&varsp->fRTextOutline, varsp->fIsActive ? kThemeStateActive: kThemeStateInactive);
-            if ((**tpvars).fIsActive && varsp->fInFocus) 
-                DrawThemeFocusRect(&varsp->fRFocusOutline, true);
+            if (!wxFindControlFromMacControl(theControl)->HasFlag(wxNO_BORDER))
+            {
+                DrawThemeEditTextFrame(&varsp->fRTextOutline, varsp->fIsActive ? kThemeStateActive: kThemeStateInactive);
+                if ((**tpvars).fIsActive && varsp->fInFocus) 
+                    DrawThemeFocusRect(&varsp->fRFocusOutline, true);
+            }

                 /* release our globals */
             HSetState((Handle) tpvars, state);
         }
                 /* release our globals */
             HSetState((Handle) tpvars, state);
         }


@@ -419,9 +431,12 @@ static pascal void TPPaneActivateProc(ControlHandle theControl, Boolean activati
             /* redraw the frame */
         if ( IsControlVisible( theControl ) )
         {
             /* redraw the frame */
         if ( IsControlVisible( theControl ) )
         {

-            DrawThemeEditTextFrame(&varsp->fRTextOutline, varsp->fIsActive ? kThemeStateActive: kThemeStateInactive);
-            if (varsp->fInFocus) 
-                DrawThemeFocusRect(&varsp->fRFocusOutline, varsp->fIsActive);
+            if (!wxFindControlFromMacControl(theControl)->HasFlag(wxNO_BORDER))
+            {
+                DrawThemeEditTextFrame(&varsp->fRTextOutline, varsp->fIsActive ? kThemeStateActive: kThemeStateInactive);
+                if (varsp->fInFocus) 
+                    DrawThemeFocusRect(&varsp->fRFocusOutline, varsp->fIsActive);
+            }

         }
         HSetState((Handle) tpvars, state);
     }
         }
         HSetState((Handle) tpvars, state);
     }


@@ -460,10 +475,7 @@ static pascal ControlPartCode TPPaneFocusProc(ControlHandle theControl, ControlF
                 kControlFocusNoPart, otherwise return a non-zero part code.
             kUserClickedToFocusPart - is a constant defined for this example.  You should
                 define your own value for handling click-to-focus type events. */
                 kControlFocusNoPart, otherwise return a non-zero part code.
             kUserClickedToFocusPart - is a constant defined for this example.  You should
                 define your own value for handling click-to-focus type events. */

-            /* save the drawing state */
-        SetPort((**tpvars).fDrawingEnvironment);
-        wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ;
-            /* calculate the next highlight state */
+             /* calculate the next highlight state */

         switch (action) {
             default:
             case kControlFocusNoPart:
         switch (action) {
             default:
             case kControlFocusNoPart:


@@ -485,8 +497,14 @@ static pascal ControlPartCode TPPaneFocusProc(ControlHandle theControl, ControlF
         new focus state */
         if ( IsControlVisible( theControl ) )
         {
         new focus state */
         if ( IsControlVisible( theControl ) )
         {

-            DrawThemeEditTextFrame(&varsp->fRTextOutline, varsp->fIsActive ? kThemeStateActive: kThemeStateInactive);
-            DrawThemeFocusRect(&varsp->fRFocusOutline, varsp->fIsActive && varsp->fInFocus);
+            if (!wxFindControlFromMacControl(theControl)->HasFlag(wxNO_BORDER))
+            {
+           /* save the drawing state */
+               SetPort((**tpvars).fDrawingEnvironment);
+               wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ;
+                DrawThemeEditTextFrame(&varsp->fRTextOutline, varsp->fIsActive ? kThemeStateActive: kThemeStateInactive);
+                DrawThemeFocusRect(&varsp->fRFocusOutline, varsp->fIsActive && varsp->fInFocus);
+            }

         }
             /* done */
         HSetState((Handle) tpvars, state);
         }
             /* done */
         HSetState((Handle) tpvars, state);


@@ -548,8 +566,17 @@ OSStatus mUPOpenControl(ControlHandle theControl, long wxStyle )
     GetControlBounds(theControl, &bounds);
     SetRect(&varsp->fRFocusOutline, bounds.left, bounds.top, bounds.right, bounds.bottom);
     SetRect(&varsp->fRTextOutline, bounds.left, bounds.top, bounds.right, bounds.bottom);
     GetControlBounds(theControl, &bounds);
     SetRect(&varsp->fRFocusOutline, bounds.left, bounds.top, bounds.right, bounds.bottom);
     SetRect(&varsp->fRTextOutline, bounds.left, bounds.top, bounds.right, bounds.bottom);

-    SetRect(&varsp->fRTextArea, bounds.left + 2 , bounds.top + (varsp->fMultiline ? 0 : 2) ,
-        bounds.right - (varsp->fMultiline ? 0 : 2), bounds.bottom - (varsp->fMultiline ? 0 : 2));
+    if ((wxStyle & wxNO_BORDER) != wxNO_BORDER)
+    {
+        SetRect(&varsp->fRTextArea, bounds.left + 2 , bounds.top + (varsp->fMultiline ? 0 : 2) ,
+                bounds.right - (varsp->fMultiline ? 0 : 2), bounds.bottom - (varsp->fMultiline ? 0 : 2));
+    }
+    else
+    {
+        SetRect(&varsp->fRTextArea, bounds.left , bounds.top ,
+                bounds.right, bounds.bottom);
+    }
+    

         /* calculate the background region for the text.  In this case, it's kindof
         and irregular region because we're setting the scroll bar a little ways inside
         of the text area. */
         /* calculate the background region for the text.  In this case, it's kindof
         and irregular region because we're setting the scroll bar a little ways inside
         of the text area. */


@@ -657,6 +684,29 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
 END_EVENT_TABLE()
 #endif
 
 END_EVENT_TABLE()
 #endif
 

+static void SetTXNData( TXNObject txn , const wxString& st , TXNOffset start , TXNOffset end )
+{
+#if wxUSE_UNICODE
+#if SIZEOF_WCHAR_T == 2
+       size_t len = st.Len() ;
+    TXNSetData( txn , kTXNUnicodeTextData,  (void*)st.wc_str(), len * 2,
+      start, end);
+#else
+       wxMBConvUTF16BE converter ;
+       ByteCount byteBufferLen = converter.WC2MB( NULL , st.wc_str() , 0 ) ;
+       UniChar *unibuf = (UniChar*) malloc(byteBufferLen) ;
+       converter.WC2MB( (char*) unibuf , st.wc_str() , byteBufferLen ) ;
+    TXNSetData( txn , kTXNUnicodeTextData,  (void*)unibuf, byteBufferLen ,
+      start, end);
+       free( unibuf ) ;
+#endif
+#else
+       wxCharBuffer text =  st.mb_str(wxConvLocal)  ;
+    TXNSetData( txn , kTXNTextData,  (void*)text.data(), strlen( text ) ,
+      start, end);
+#endif    
+}
+

 // Text item
 void wxTextCtrl::Init()
 {
 // Text item
 void wxTextCtrl::Init()
 {


@@ -687,7 +737,7 @@ const short kVerticalMargin = 2 ;
 const short kHorizontalMargin = 2 ;
 
 bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
 const short kHorizontalMargin = 2 ;
 
 bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,

-           const wxString& st,
+           const wxString& str,

            const wxPoint& pos,
            const wxSize& size, long style,
            const wxValidator& validator,
            const wxPoint& pos,
            const wxSize& size, long style,
            const wxValidator& validator,


@@ -708,7 +758,12 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
         return FALSE;
 
     wxSize mySize = size ;
         return FALSE;
 
     wxSize mySize = size ;

-    if ( m_macUsesTXN )
+    if (style & wxNO_BORDER)
+    {
+        m_macHorizontalBorder = 0 ;
+        m_macVerticalBorder = 0 ;
+    }
+    else if ( m_macUsesTXN )

     {
         m_macHorizontalBorder = 5 ; // additional pixels around the real control
         m_macVerticalBorder = 3 ;
     {
         m_macHorizontalBorder = 5 ; // additional pixels around the real control
         m_macVerticalBorder = 3 ;


@@ -747,6 +802,8 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
         m_editable = FALSE ;
     }
 
         m_editable = FALSE ;
     }
 

+    wxString st = str ;
+    wxMacConvertNewlines13To10( &st ) ;

     if ( !m_macUsesTXN )
     {
         m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , "\p" , false , 0 , 0 , 1,
     if ( !m_macUsesTXN )
     {
         m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , "\p" , false , 0 , 0 , 1,


@@ -771,7 +828,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
 
     if ( !m_macUsesTXN )
     {
 
     if ( !m_macUsesTXN )
     {

-       wxCharBuffer text = wxMacStringToCString( st ) ;
+       wxCharBuffer text = st.mb_str(wxConvLocal) ;

         ::SetControlData( (ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , strlen(text) , text ) ;
     }
     else
         ::SetControlData( (ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , strlen(text) , text ) ;
     }
     else


@@ -781,14 +838,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
         tpvars = (STPTextPaneVars **) GetControlReference((ControlHandle) m_macControl);
             /* set the text in the record */
         m_macTXN =  (**tpvars).fTXNRec ;
         tpvars = (STPTextPaneVars **) GetControlReference((ControlHandle) m_macControl);
             /* set the text in the record */
         m_macTXN =  (**tpvars).fTXNRec ;

-#if wxUSE_UNICODE
-        TXNSetData( ((TXNObject) m_macTXN) , kTXNUnicodeTextData,  (void*)st.wc_str(), st.Length() * 2,
-          kTXNStartOffset, kTXNEndOffset);
-#else
-       wxCharBuffer text = wxMacStringToCString( st ) ;
-        TXNSetData( ((TXNObject) m_macTXN) , kTXNTextData,  (void*)text.data(), strlen( text ) ,
-          kTXNStartOffset, kTXNEndOffset);
-#endif
+        SetTXNData( (TXNObject) m_macTXN , st , kTXNStartOffset, kTXNEndOffset ) ;

         m_macTXNvars = tpvars ;
         m_macUsesTXN = true ;
         TXNSetSelection( (TXNObject) m_macTXN, 0, 0);
         m_macTXNvars = tpvars ;
         m_macUsesTXN = true ;
         TXNSetSelection( (TXNObject) m_macTXN, 0, 0);


@@ -817,7 +867,7 @@ wxString wxTextCtrl::GetValue() const
             ::GetControlData( (ControlHandle) m_macControl, 0,
                 ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag,
                 actualSize , buf.data() , &actualSize ) ;
             ::GetControlData( (ControlHandle) m_macControl, 0,
                 ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag,
                 actualSize , buf.data() , &actualSize ) ;

-            result = wxMacMakeStringFromCString( buf ) ;
+            result = wxString( buf , wxConvLocal) ;

         }
     }
     else
         }
     }
     else


@@ -832,13 +882,20 @@ wxString wxTextCtrl::GetValue() const
         }
         else
         {
         }
         else
         {

-            actualSize = GetHandleSize( theText ) ;
+            actualSize = GetHandleSize( theText ) / sizeof( UniChar) ;

             if ( actualSize > 0 )
             {
                 wxChar *ptr = result.GetWriteBuf(actualSize*sizeof(wxChar)) ;
             if ( actualSize > 0 )
             {
                 wxChar *ptr = result.GetWriteBuf(actualSize*sizeof(wxChar)) ;

+#if SIZEOF_WCHAR_T == 2                                

                 wxStrncpy( ptr , (wxChar*) *theText , actualSize ) ;
                 wxStrncpy( ptr , (wxChar*) *theText , actualSize ) ;

+#else
+                               wxMBConvUTF16BE converter ;
+                               HLock( theText ) ;
+                               converter.MB2WC( ptr , (const char*)*theText , actualSize ) ;
+                               HUnlock( theText ) ;
+#endif

                 ptr[actualSize] = 0 ;
                 ptr[actualSize] = 0 ;

-                result.UngetWriteBuf( actualSize ) ;
+                result.UngetWriteBuf( actualSize *sizeof(wxChar) ) ;

             }
             DisposeHandle( theText ) ;
         }
             }
             DisposeHandle( theText ) ;
         }


@@ -856,14 +913,14 @@ wxString wxTextCtrl::GetValue() const
             if ( actualSize > 0 )
             {
                 HLock( theText ) ;
             if ( actualSize > 0 )
             {
                 HLock( theText ) ;

-                result = wxMacMakeStringFromCString( *theText , actualSize ) ;
+                result = wxString( *theText , wxConvLocal , actualSize ) ;

                 HUnlock( theText ) ;
             }
             DisposeHandle( theText ) ;
         }
 #endif
     }
                 HUnlock( theText ) ;
             }
             DisposeHandle( theText ) ;
         }
 #endif
     }

-
+    wxMacConvertNewlines10To13( &result ) ;

     return result ;
 }
 
     return result ;
 }
 


@@ -876,15 +933,17 @@ void wxTextCtrl::GetSelection(long* from, long* to) const
    }
    else
    {
    }
    else
    {

-        TXNGetSelection(  ((TXNObject) m_macTXN) , (TXNOffset*) from , (TXNOffset*) to ) ;
+        TXNGetSelection( (TXNObject) m_macTXN , (TXNOffset*) from , (TXNOffset*) to ) ;

    }
 }
 
    }
 }
 

-void wxTextCtrl::SetValue(const wxString& st)
+void wxTextCtrl::SetValue(const wxString& str)

 {
 {

+    wxString st = str ;
+    wxMacConvertNewlines13To10( &st ) ;

     if ( !m_macUsesTXN )
     {
     if ( !m_macUsesTXN )
     {

-       wxCharBuffer text = wxMacStringToCString( st ) ;
+       wxCharBuffer text =  st.mb_str(wxConvLocal) ;

         ::SetControlData( (ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , strlen(text) , text ) ;
     }
     else
         ::SetControlData( (ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , strlen(text) , text ) ;
     }
     else


@@ -892,14 +951,7 @@ void wxTextCtrl::SetValue(const wxString& st)
         bool formerEditable = m_editable ;
         if ( !formerEditable )
             SetEditable(true) ;
         bool formerEditable = m_editable ;
         if ( !formerEditable )
             SetEditable(true) ;

-#if wxUSE_UNICODE
-        TXNSetData( ((TXNObject) m_macTXN), kTXNUnicodeTextData,  (void*)st.wc_str(), st.Length() * 2 ,
-          kTXNStartOffset, kTXNEndOffset);
-#else
-       wxCharBuffer text = wxMacStringToCString( st ) ;
-        TXNSetData( ((TXNObject) m_macTXN), kTXNTextData,  (void*)text.data(), strlen( text ) ,
-          kTXNStartOffset, kTXNEndOffset);
-#endif
+        SetTXNData( (TXNObject) m_macTXN , st , kTXNStartOffset, kTXNEndOffset ) ;

         TXNSetSelection( (TXNObject) m_macTXN, 0, 0);
         TXNShowSelection( (TXNObject) m_macTXN, kTXNShowStart);
         if ( !formerEditable )
         TXNSetSelection( (TXNObject) m_macTXN, 0, 0);
         TXNShowSelection( (TXNObject) m_macTXN, kTXNShowStart);
         if ( !formerEditable )


@@ -1167,8 +1219,10 @@ long wxTextCtrl::GetLastPosition() const
     }
 }
 
     }
 }
 

-void wxTextCtrl::Replace(long from, long to, const wxString& value)
+void wxTextCtrl::Replace(long from, long to, const wxString& str)

 {
 {

+    wxString value = str ;
+    wxMacConvertNewlines13To10( &value ) ;

     if ( !m_macUsesTXN )
     {
         ControlEditTextSelectionRec selection ;
     if ( !m_macUsesTXN )
     {
         ControlEditTextSelectionRec selection ;


@@ -1187,13 +1241,7 @@ void wxTextCtrl::Replace(long from, long to, const wxString& value)
             SetEditable(true) ;
         TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
         TXNClear( ((TXNObject) m_macTXN) ) ;
             SetEditable(true) ;
         TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
         TXNClear( ((TXNObject) m_macTXN) ) ;

-#if wxUSE_UNICODE
-        TXNSetData( ((TXNObject) m_macTXN), kTXNUnicodeTextData,  (void*)value.wc_str(), value.Length() * 2 ,
-          kTXNUseCurrentSelection, kTXNUseCurrentSelection);
-#else
-        TXNSetData( ((TXNObject) m_macTXN), kTXNTextData,  (void*)value.c_str(), value.Length(),
-            kTXNUseCurrentSelection, kTXNUseCurrentSelection);
-#endif
+        SetTXNData( (TXNObject) m_macTXN , str , kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ;

         if ( !formerEditable )
             SetEditable( formerEditable ) ;
     }
         if ( !formerEditable )
             SetEditable( formerEditable ) ;
     }


@@ -1270,11 +1318,13 @@ bool wxTextCtrl::LoadFile(const wxString& file)
     return FALSE;
 }
 
     return FALSE;
 }
 

-void wxTextCtrl::WriteText(const wxString& st)
+void wxTextCtrl::WriteText(const wxString& str)

 {
 {

+    wxString st = str ;
+    wxMacConvertNewlines13To10( &st ) ;

     if ( !m_macUsesTXN )
     {
     if ( !m_macUsesTXN )
     {

-       wxCharBuffer text = wxMacStringToCString( st ) ;
+       wxCharBuffer text =  st.mb_str(wxConvLocal) ;

         TEInsert( text , strlen(text) , ((TEHandle) m_macTE) ) ;
     }
     else
         TEInsert( text , strlen(text) , ((TEHandle) m_macTE) ) ;
     }
     else


@@ -1284,14 +1334,7 @@ void wxTextCtrl::WriteText(const wxString& st)
             SetEditable(true) ;
         long start , end , dummy ;
         GetSelection( &start , &dummy ) ;
             SetEditable(true) ;
         long start , end , dummy ;
         GetSelection( &start , &dummy ) ;

-#if wxUSE_UNICODE
-        TXNSetData( ((TXNObject) m_macTXN), kTXNUnicodeTextData,  (void*)st.wc_str(), st.Length() * 2 ,
-          kTXNUseCurrentSelection, kTXNUseCurrentSelection);
-#else
-       wxCharBuffer text = wxMacStringToCString( st ) ;
-        TXNSetData( ((TXNObject) m_macTXN), kTXNTextData,  (void*)text.data(), strlen( text ) ,
-          kTXNUseCurrentSelection, kTXNUseCurrentSelection);
-#endif
+        SetTXNData( (TXNObject) m_macTXN , st , kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ;

         GetSelection( &dummy , &end ) ;
         SetStyle( start , end , GetDefaultStyle() ) ;
         if ( !formerEditable )
         GetSelection( &dummy , &end ) ;
         SetStyle( start , end , GetDefaultStyle() ) ;
         if ( !formerEditable )


@@ -1308,10 +1351,6 @@ void wxTextCtrl::AppendText(const wxString& text)
 
 void wxTextCtrl::Clear()
 {
 
 void wxTextCtrl::Clear()
 {

-    if ( !IsEditable() )
-    {
-        return ;
-    }

     if ( !m_macUsesTXN )
     {
         ::SetControlData((ControlHandle)  m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 0 , (char*) ((const char*)NULL) ) ;
     if ( !m_macUsesTXN )
     {
         ::SetControlData((ControlHandle)  m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 0 , (char*) ((const char*)NULL) ) ;


@@ -1425,7 +1464,12 @@ bool wxTextCtrl::CanRedo() const
     return FALSE ;
 }
 
     return FALSE ;
 }
 

-// Makes 'unmodified'
+// Makes modifie or unmodified
+void wxTextCtrl::MarkDirty()
+{
+    m_dirty = true;
+}
+

 void wxTextCtrl::DiscardEdits()
 {
     m_dirty = false;
 void wxTextCtrl::DiscardEdits()
 {
     m_dirty = false;


@@ -1433,16 +1477,23 @@ void wxTextCtrl::DiscardEdits()
 
 int wxTextCtrl::GetNumberOfLines() const
 {
 
 int wxTextCtrl::GetNumberOfLines() const
 {

-    // TODO change this if possible to reflect real lines
-    wxString content = GetValue() ;
-
-    int count = 1;
-    for (size_t i = 0; i < content.Length() ; i++)
+    if ( m_macUsesTXN ) 

     {
     {

-        if (content[i] == '\r') count++;
+        ItemCount lines ;
+        TXNGetLineCount((TXNObject)m_macTXN, &lines ) ;
+        return lines ;

     }
     }

+    else
+    {          
+        wxString content = GetValue() ;

 
 

-    return count;
+        int count = 1;
+        for (size_t i = 0; i < content.Length() ; i++)
+        {
+            if (content[i] == '\r') count++;
+        }
+        return count;
+    }

 }
 
 long wxTextCtrl::XYToPosition(long x, long y) const
 }
 
 long wxTextCtrl::XYToPosition(long x, long y) const


@@ -1458,7 +1509,27 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
 
 void wxTextCtrl::ShowPosition(long pos)
 {
 
 void wxTextCtrl::ShowPosition(long pos)
 {

-    // TODO
+#if TARGET_RT_MAC_MACHO && defined(AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER)
+    if ( m_macUsesTXN ) 
+    {
+        Point current ;
+        Point desired ;
+        TXNOffset selstart , selend ;
+        TXNGetSelection(  (TXNObject) m_macTXN , &selstart , &selend) ;
+        TXNOffsetToPoint( (TXNObject) m_macTXN,  selstart , &current);
+        TXNOffsetToPoint( (TXNObject) m_macTXN,  pos , &desired);
+        //TODO use HIPoints for 10.3 and above
+        if ( (UInt32) TXNScroll != (UInt32) kUnresolvedCFragSymbolAddress )
+        {
+            OSErr theErr = noErr;
+            SInt32 dv = desired.v - current.v ;
+            SInt32 dh = desired.h - current.h ;
+            TXNShowSelection(  (TXNObject) m_macTXN , true ) ;
+            theErr = TXNScroll( (TXNObject) m_macTXN, kTXNScrollUnitsInPixels , kTXNScrollUnitsInPixels , &dv , &dh );          
+            wxASSERT_MSG( theErr == noErr, _T("TXNScroll returned an error!") );
+        }
+    }
+#endif

 }
 
 int wxTextCtrl::GetLineLength(long lineNo) const
 }
 
 int wxTextCtrl::GetLineLength(long lineNo) const


@@ -1477,12 +1548,12 @@ int wxTextCtrl::GetLineLength(long lineNo) const
             for (size_t j = i; j < content.Length(); j++)
             {
                 count++;
             for (size_t j = i; j < content.Length(); j++)
             {
                 count++;

-                if (content[j] == '\r') return count;
+                if (content[j] == '\n') return count;

             }
 
             return count;
         }
             }
 
             return count;
         }

-        if (content[i] == '\r') count++;
+        if (content[i] == '\n') count++;

     }
     return 0;
 }
     }
     return 0;
 }


@@ -1503,7 +1574,7 @@ wxString wxTextCtrl::GetLineText(long lineNo) const
 
             for (size_t j = i; j < content.Length(); j++)
             {
 
             for (size_t j = i; j < content.Length(); j++)
             {

-                if (content[j] == '\r')
+                if (content[j] == '\n')

                     return tmp;
 
                 tmp += content[j];
                     return tmp;
 
                 tmp += content[j];


@@ -1511,7 +1582,7 @@ wxString wxTextCtrl::GetLineText(long lineNo) const
 
             return tmp;
         }
 
             return tmp;
         }

-        if (content[i] == '\r') count++;
+        if (content[i] == '\n') count++;

     }
     return wxEmptyString ;
 }
     }
     return wxEmptyString ;
 }