Committing in .

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

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index ffd659b5eb13f999496a60bb314acc2ef5295fcf..ed7226ccf8c13e6bb3a4e71e233ae1fa580d0591 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -61,6 +61,88 @@
 #include "wx/mac/uma.h"
 
 #define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL
 #include "wx/mac/uma.h"
 
 #define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL

+#if TARGET_API_MAC_OSX
+ #define wxMAC_USE_MLTE 1
+ #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+ #define wxMAC_USE_MLTE_HIVIEW 1
+ #else
+ #define wxMAC_USE_MLTE_HIVIEW 0
+ #endif
+#else
+ // there is no unicodetextctrl on classic, and hopefully MLTE works better there
+ #define wxMAC_USE_MLTE 1
+ #define wxMAC_USE_MLTE_HIVIEW 0
+#endif
+
+#if wxMAC_USE_MLTE
+
+TXNFrameOptions FrameOptionsFromWXStyle( long wxStyle )
+{
+    TXNFrameOptions frameOptions =
+        kTXNDontDrawCaretWhenInactiveMask ;
+    if ( ! ( wxStyle & wxTE_NOHIDESEL ) )
+        frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ;
+
+    if ( wxStyle & wxTE_MULTILINE )
+    {
+        if ( ! ( wxStyle & wxTE_DONTWRAP ) )
+            frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
+        else
+        {
+            frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
+            frameOptions |= kTXNWantHScrollBarMask ;
+        }
+
+        if ( !(wxStyle & wxTE_NO_VSCROLL ) )
+            frameOptions |= kTXNWantVScrollBarMask ;
+    }
+    else
+        frameOptions |= kTXNSingleLineOnlyMask ;
+    return frameOptions ;
+}
+
+void AdjustAttributesFromWXStyle( TXNObject txn , long wxStyle , bool visible )
+{
+    TXNControlTag iControlTags[3] = { kTXNDoFontSubstitution, kTXNWordWrapStateTag };
+    TXNControlData iControlData[3] = { {false}, {kTXNNoAutoWrap} };
+    int toptag = 2 ;
+#if TARGET_API_MAC_OSX
+    iControlTags[2] = kTXNVisibilityTag ;
+    iControlData[2].uValue = visible ;
+    toptag++ ;
+#endif        
+    
+    if ( wxStyle & wxTE_MULTILINE )
+    {
+        if (wxStyle & wxTE_DONTWRAP)
+            iControlData[1].uValue = kTXNNoAutoWrap ;
+        else
+            iControlData[1].uValue = kTXNAutoWrap ;
+        
+    }
+    verify_noerr( TXNSetTXNObjectControls( txn, false, toptag,
+                                        iControlTags, iControlData )) ;
+
+    Str255 fontName ;
+    SInt16 fontSize ;
+    Style fontStyle ;
+
+    GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+
+    TXNTypeAttributes typeAttr[] =
+    {
+        {   kTXNQDFontNameAttribute , kTXNQDFontNameAttributeSize , { (void*) fontName } } ,
+        {   kTXNQDFontSizeAttribute , kTXNFontSizeAttributeSize , { (void*) (fontSize << 16) } } ,
+        {   kTXNQDFontStyleAttribute , kTXNQDFontStyleAttributeSize , {  (void*) normal } } ,
+    } ;
+
+    verify_noerr( TXNSetTypeAttributes (txn, sizeof( typeAttr ) / sizeof(TXNTypeAttributes) , typeAttr,
+          kTXNStartOffset,
+          kTXNEndOffset) );
+
+}
+
+#if !wxMAC_USE_MLTE_HIVIEW

 
 // CS:TODO we still have a problem getting properly at the text events of a control because under Carbon
 // the MLTE engine registers itself for the key events thus the normal flow never occurs, the only measure for the
 
 // CS:TODO we still have a problem getting properly at the text events of a control because under Carbon
 // the MLTE engine registers itself for the key events thus the normal flow never occurs, the only measure for the


@@ -168,11 +250,13 @@ OSStatus MLTESetObjectVisibility( STPTextPaneVars *varsp, Boolean vis , long wxS
     TXNControlData iControlData[1] = {{ vis }};
     err = ::TXNSetTXNObjectControls( varsp->fTXNRec, false, 1, iControlTags, iControlData );
 #endif
     TXNControlData iControlData[1] = {{ vis }};
     err = ::TXNSetTXNObjectControls( varsp->fTXNRec, false, 1, iControlTags, iControlData );
 #endif

-    if ( vis )
+    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(varsp->fUserPaneRec);
+    if ( vis && textctrl )

     {
         Rect bounds ;
         UMAGetControlBoundsInWindowCoords( varsp->fUserPaneRec, &bounds);
         TPCalculateBounds( varsp , bounds ) ;
     {
         Rect bounds ;
         UMAGetControlBoundsInWindowCoords( varsp->fUserPaneRec, &bounds);
         TPCalculateBounds( varsp , bounds ) ;

+        wxMacWindowClipper cl(textctrl) ;

         TXNSetFrameBounds( varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left,
             varsp->fRTextArea.bottom, varsp->fRTextArea.right, varsp->fTXNFrame);
         TXNShowSelection( varsp->fTXNRec, kTXNShowStart);
         TXNSetFrameBounds( varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left,
             varsp->fRTextArea.bottom, varsp->fRTextArea.right, varsp->fTXNFrame);
         TXNShowSelection( varsp->fTXNRec, kTXNShowStart);


@@ -204,7 +288,8 @@ static void TPUpdateVisibility(ControlRef theControl) {
         // we only recalculate when visible, otherwise scrollbars get drawn at incorrect places
         if ( varsp->fVisible )
         {
         // we only recalculate when visible, otherwise scrollbars get drawn at incorrect places
         if ( varsp->fVisible )
         {

-            TXNSetFrameBounds(  varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left,
+            wxMacWindowClipper cl(textctrl) ;
+            TXNSetFrameBounds( varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left,

                 varsp->fRTextArea.bottom, varsp->fRTextArea.right, varsp->fTXNFrame);
         }
         InvalWindowRect( GetControlOwner( theControl ) , &oldBounds ) ;
                 varsp->fRTextArea.bottom, varsp->fRTextArea.right, varsp->fTXNFrame);
         }
         InvalWindowRect( GetControlOwner( theControl ) , &oldBounds ) ;


@@ -557,7 +642,7 @@ OSStatus mUPOpenControl(STPTextPaneVars* &handle, ControlRef theControl, long wx
     SetControlData(theControl, kControlEntireControl, kControlUserPaneKeyDownProcTag, sizeof(gTPKeyProc), &gTPKeyProc);
     SetControlData(theControl, kControlEntireControl, kControlUserPaneActivateProcTag, sizeof(gTPActivateProc), &gTPActivateProc);
     SetControlData(theControl, kControlEntireControl, kControlUserPaneFocusProcTag, sizeof(gTPFocusProc), &gTPFocusProc);
     SetControlData(theControl, kControlEntireControl, kControlUserPaneKeyDownProcTag, sizeof(gTPKeyProc), &gTPKeyProc);
     SetControlData(theControl, kControlEntireControl, kControlUserPaneActivateProcTag, sizeof(gTPActivateProc), &gTPActivateProc);
     SetControlData(theControl, kControlEntireControl, kControlUserPaneFocusProcTag, sizeof(gTPFocusProc), &gTPFocusProc);

-
+    

         /* calculate the rectangles used by the control */
     UMAGetControlBoundsInWindowCoords(theControl, &bounds);
     varsp->fRTextOutlineRegion = NewRgn() ;
         /* calculate the rectangles used by the control */
     UMAGetControlBoundsInWindowCoords(theControl, &bounds);
     varsp->fRTextOutlineRegion = NewRgn() ;


@@ -568,26 +653,7 @@ OSStatus mUPOpenControl(STPTextPaneVars* &handle, ControlRef theControl, long wx
 
         /* create the new edit field */
 
 
         /* create the new edit field */
 

-    TXNFrameOptions frameOptions =
-        kTXNDontDrawCaretWhenInactiveMask ;
-    if ( ! ( wxStyle & wxTE_NOHIDESEL ) )
-        frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ;
-
-    if ( wxStyle & wxTE_MULTILINE )
-    {
-        if ( ! ( wxStyle & wxTE_DONTWRAP ) )
-            frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
-        else
-        {
-            frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
-            frameOptions |= kTXNWantHScrollBarMask ;
-        }
-
-        if ( !(wxStyle & wxTE_NO_VSCROLL ) )
-            frameOptions |= kTXNWantVScrollBarMask ;
-    }
-    else
-        frameOptions |= kTXNSingleLineOnlyMask ;
+    TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( wxStyle ) ;

 
     verify_noerr(TXNNewObject(NULL, varsp->fOwner, &varsp->fRTextArea,
         frameOptions ,
 
     verify_noerr(TXNNewObject(NULL, varsp->fOwner, &varsp->fRTextArea,
         frameOptions ,


@@ -596,40 +662,7 @@ OSStatus mUPOpenControl(STPTextPaneVars* &handle, ControlRef theControl, long wx
         kTXNSystemDefaultEncoding,
         &varsp->fTXNRec, &varsp->fTXNFrame, (TXNObjectRefcon) varsp));
 
         kTXNSystemDefaultEncoding,
         &varsp->fTXNRec, &varsp->fTXNFrame, (TXNObjectRefcon) varsp));
 

-    TXNControlTag iControlTags[3] = { kTXNDoFontSubstitution, kTXNWordWrapStateTag };
-    TXNControlData iControlData[3] = { {false}, {kTXNAutoWrap} };
-    int toptag = 2 ;
-#if TARGET_API_MAC_OSX
-    iControlTags[2] = kTXNVisibilityTag ;
-    iControlData[2].uValue = false ;
-    toptag++ ;
-#endif        
-    iControlData[1].uValue = varsp->fVisible ;
-    
-    if ( (wxStyle & wxTE_MULTILINE) && (wxStyle & wxTE_DONTWRAP) )
-        iControlData[2].uValue = kTXNNoAutoWrap ;
-
-    verify_noerr( TXNSetTXNObjectControls( varsp->fTXNRec, false, toptag,
-                                        iControlTags, iControlData )) ;
-
-    Str255 fontName ;
-    SInt16 fontSize ;
-    Style fontStyle ;
-
-    GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
-
-    TXNTypeAttributes typeAttr[] =
-    {
-        {   kTXNQDFontNameAttribute , kTXNQDFontNameAttributeSize , { (void*) fontName } } ,
-        {   kTXNQDFontSizeAttribute , kTXNFontSizeAttributeSize , { (void*) (fontSize << 16) } } ,
-        {   kTXNQDFontStyleAttribute , kTXNQDFontStyleAttributeSize , {  (void*) normal } } ,
-    } ;
-
-    err = TXNSetTypeAttributes (varsp->fTXNRec, sizeof( typeAttr ) / sizeof(TXNTypeAttributes) , typeAttr,
-          kTXNStartOffset,
-          kTXNEndOffset);
-
-
+    AdjustAttributesFromWXStyle( varsp->fTXNRec , wxStyle , varsp->fVisible ) ;

         /* perform final activations and setup for our text field.  Here,
         we assume that the window is going to be the 'active' window. */
     TPActivatePaneText(varsp, varsp->fIsActive && varsp->fInFocus);
         /* perform final activations and setup for our text field.  Here,
         we assume that the window is going to be the 'active' window. */
     TPActivatePaneText(varsp, varsp->fIsActive && varsp->fInFocus);


@@ -637,27 +670,11 @@ OSStatus mUPOpenControl(STPTextPaneVars* &handle, ControlRef theControl, long wx
     return err;
 }
 
     return err;
 }
 

+#else
+struct STPTextPaneVars
+{
+} ;

 
 

-
-
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
-
-BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
-    EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
-    EVT_CHAR(wxTextCtrl::OnChar)
-    EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
-    EVT_MENU(wxID_COPY, wxTextCtrl::OnCopy)
-    EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste)
-    EVT_MENU(wxID_UNDO, wxTextCtrl::OnUndo)
-    EVT_MENU(wxID_REDO, wxTextCtrl::OnRedo)
-
-    EVT_UPDATE_UI(wxID_CUT, wxTextCtrl::OnUpdateCut)
-    EVT_UPDATE_UI(wxID_COPY, wxTextCtrl::OnUpdateCopy)
-    EVT_UPDATE_UI(wxID_PASTE, wxTextCtrl::OnUpdatePaste)
-    EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo)
-    EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
-END_EVENT_TABLE()

 #endif
 
 static void SetTXNData( STPTextPaneVars *varsp, TXNObject txn , const wxString& st , TXNOffset start , TXNOffset end )
 #endif
 
 static void SetTXNData( STPTextPaneVars *varsp, TXNObject txn , const wxString& st , TXNOffset start , TXNOffset end )


@@ -683,6 +700,29 @@ static void SetTXNData( STPTextPaneVars *varsp, TXNObject txn , const wxString&
 #endif  
 }
 
 #endif  
 }
 

+
+#endif
+
+#if !USE_SHARED_LIBRARY
+IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
+
+BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
+    EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
+    EVT_CHAR(wxTextCtrl::OnChar)
+    EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
+    EVT_MENU(wxID_COPY, wxTextCtrl::OnCopy)
+    EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste)
+    EVT_MENU(wxID_UNDO, wxTextCtrl::OnUndo)
+    EVT_MENU(wxID_REDO, wxTextCtrl::OnRedo)
+
+    EVT_UPDATE_UI(wxID_CUT, wxTextCtrl::OnUpdateCut)
+    EVT_UPDATE_UI(wxID_COPY, wxTextCtrl::OnUpdateCopy)
+    EVT_UPDATE_UI(wxID_PASTE, wxTextCtrl::OnUpdatePaste)
+    EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo)
+    EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
+END_EVENT_TABLE()
+#endif
+

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


@@ -697,11 +737,15 @@ void wxTextCtrl::Init()
 
 wxTextCtrl::~wxTextCtrl()
 {
 
 wxTextCtrl::~wxTextCtrl()
 {

+#if wxMAC_USE_MLTE

     SetControlReference((ControlRef)m_macControl, 0) ;
     SetControlReference((ControlRef)m_macControl, 0) ;

+#if !wxMAC_USE_MLTE_HIVIEW

     TXNDeleteObject((TXNObject)m_macTXN);
     TXNDeleteObject((TXNObject)m_macTXN);

+#endif

     /* delete our private storage */
     free(m_macTXNvars);
     /* zero the control reference */
     /* delete our private storage */
     free(m_macTXNvars);
     /* zero the control reference */

+#endif

 }
 
 
 }
 
 


@@ -736,7 +780,36 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
 
     wxString st = str ;
     wxMacConvertNewlines13To10( &st ) ;
 
     wxString st = str ;
     wxMacConvertNewlines13To10( &st ) ;

+#if wxMAC_USE_MLTE

     {
     {

+#if wxMAC_USE_MLTE_HIVIEW
+        HIRect hr = { bounds.left , bounds.top , bounds.right - bounds.left , bounds.bottom- bounds.top } ;
+        HIViewRef scrollView = NULL ;
+        TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( style ) ;
+
+        if ( frameOptions & (kTXNWantVScrollBarMask|kTXNWantHScrollBarMask) )
+        {
+            HIScrollViewCreate(( frameOptions & kTXNWantHScrollBarMask ? kHIScrollViewOptionsHorizScroll : 0) | 
+                ( frameOptions & kTXNWantVScrollBarMask ? kHIScrollViewOptionsVertScroll: 0 ) , &scrollView ) ;
+           
+               HIViewSetFrame( scrollView, &hr );
+               HIViewSetVisible( scrollView, true );
+        }
+        HIViewRef textView ;
+        HITextViewCreate( NULL , 0, frameOptions , (ControlRef*) &textView ) ;
+        m_macTXN = HITextViewGetTXNObject( textView) ;
+        AdjustAttributesFromWXStyle( (TXNObject) m_macTXN , style , true ) ;
+        HIViewSetVisible( (ControlRef) textView , true ) ;
+        if ( scrollView )
+        {
+            HIViewAddSubview( scrollView , textView ) ;
+            m_macControl = (WXWidget) scrollView ;
+        }
+        else
+        {
+            m_macControl = (WXWidget) textView ;
+        }
+#else

         short featurSet;
 
         featurSet = kControlSupportsEmbedding | kControlSupportsFocus  | kControlWantsIdle
         short featurSet;
 
         featurSet = kControlSupportsEmbedding | kControlSupportsFocus  | kControlWantsIdle


@@ -750,6 +823,8 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
         mUPOpenControl( varsp, (ControlRef) m_macControl, m_windowStyle );
         m_macTXNvars = varsp ;
         m_macTXN =  varsp->fTXNRec ;
         mUPOpenControl( varsp, (ControlRef) m_macControl, m_windowStyle );
         m_macTXNvars = varsp ;
         m_macTXN =  varsp->fTXNRec ;

+#endif
+

         if ( style & wxTE_PASSWORD )
         {
             UniChar c = 0xA5 ;
         if ( style & wxTE_PASSWORD )
         {
             UniChar c = 0xA5 ;


@@ -758,17 +833,24 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
     }
     MacPostControlCreate(pos,size) ;
         
     }
     MacPostControlCreate(pos,size) ;
         

+#if !wxMAC_USE_MLTE_HIVIEW

     if ( MacIsReallyShown() )
         MLTESetObjectVisibility( (STPTextPaneVars*) m_macTXNvars, true , GetWindowStyle() ) ;
     if ( MacIsReallyShown() )
         MLTESetObjectVisibility( (STPTextPaneVars*) m_macTXNvars, true , GetWindowStyle() ) ;

+#endif

 
     {
        wxMacWindowClipper clipper( this ) ;
 
     {
        wxMacWindowClipper clipper( this ) ;

+#if !wxMAC_USE_MLTE_HIVIEW

         TPUpdateVisibility( (ControlRef) m_macControl ) ;
         TPUpdateVisibility( (ControlRef) m_macControl ) ;

+#endif

         SetTXNData( (STPTextPaneVars *)m_macTXNvars , (TXNObject) m_macTXN , st , kTXNStartOffset, kTXNEndOffset ) ;
 
         TXNSetSelection( (TXNObject) m_macTXN, 0, 0);
         TXNShowSelection( (TXNObject) m_macTXN, kTXNShowStart);
     }
         SetTXNData( (STPTextPaneVars *)m_macTXNvars , (TXNObject) m_macTXN , st , kTXNStartOffset, kTXNEndOffset ) ;
 
         TXNSetSelection( (TXNObject) m_macTXN, 0, 0);
         TXNShowSelection( (TXNObject) m_macTXN, kTXNShowStart);
     }

+    
+    // in case MLTE is catching events before we get the chance to do so, we'd have to reintroduce the tlw-handler in front :
+    // parent->MacGetTopLevelWindow()->MacInstallTopLevelWindowEventHandler() ;

 
     SetBackgroundColour( *wxWHITE ) ;
 
 
     SetBackgroundColour( *wxWHITE ) ;
 


@@ -781,16 +863,23 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
     {
         SetEditable( false ) ;
     }
     {
         SetEditable( false ) ;
     }

+#else
+    wxMacCFStringHolder cf(st , m_font.GetEncoding()) ;
+    CreateEditUnicodeTextControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds , cf , style & wxTE_PASSWORD , NULL , (ControlRef*) &m_macControl ) ;
+    MacPostControlCreate(pos,size) ;
+#endif
+        

 
     return TRUE;
 }
 
 void wxTextCtrl::MacVisibilityChanged() 
 {
 
     return TRUE;
 }
 
 void wxTextCtrl::MacVisibilityChanged() 
 {

+#if wxMAC_USE_MLTE && !wxMAC_USE_MLTE_HIVIEW

     MLTESetObjectVisibility((STPTextPaneVars*) m_macTXNvars , MacIsReallyShown() , GetWindowStyle() ) ;
     if ( !MacIsReallyShown() )
         InvalWindowRect( GetControlOwner( (ControlHandle) m_macControl ) , &((STPTextPaneVars *)m_macTXNvars)->fRBounds ) ;
     MLTESetObjectVisibility((STPTextPaneVars*) m_macTXNvars , MacIsReallyShown() , GetWindowStyle() ) ;
     if ( !MacIsReallyShown() )
         InvalWindowRect( GetControlOwner( (ControlHandle) m_macControl ) , &((STPTextPaneVars *)m_macTXNvars)->fRBounds ) ;

-
+#endif

 }
 
 void wxTextCtrl::MacEnabledStateChanged() 
 }
 
 void wxTextCtrl::MacEnabledStateChanged() 


@@ -800,10 +889,10 @@ void wxTextCtrl::MacEnabledStateChanged()
 
 wxString wxTextCtrl::GetValue() const
 {
 
 wxString wxTextCtrl::GetValue() const
 {

-    Size actualSize = 0;

     wxString result ;
     wxString result ;

+#if wxMAC_USE_MLTE

     OSStatus err ;
     OSStatus err ;

-
+    Size actualSize = 0;

     {
 #if wxUSE_UNICODE
         Handle theText ;
     {
 #if wxUSE_UNICODE
         Handle theText ;


@@ -862,13 +951,35 @@ wxString wxTextCtrl::GetValue() const
         }
 #endif
     }
         }
 #endif
     }

+#else
+    CFStringRef value = NULL ;
+    Size    actualSize = 0 ;
+
+    verify_noerr( GetControlData( (ControlRef) m_macControl , 0, GetWindowStyle() & wxTE_PASSWORD ? 
+        kControlEditTextPasswordCFStringTag : kControlEditTextCFStringTag, 
+                    sizeof(CFStringRef), &value, &actualSize ) );
+    if ( value )
+    {
+        wxMacCFStringHolder cf(value) ;
+        result = cf.AsString() ;
+    }
+#endif

     wxMacConvertNewlines10To13( &result ) ;
     return result ;
 }
 
 void wxTextCtrl::GetSelection(long* from, long* to) const
     wxMacConvertNewlines10To13( &result ) ;
     return result ;
 }
 
 void wxTextCtrl::GetSelection(long* from, long* to) const

-{
+{    
+#if wxMAC_USE_MLTE

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

+#else
+    ControlEditTextSelectionRec sel ;
+    Size actualSize ;
+    verify_noerr( GetControlData( (ControlRef) m_macControl , 0, kControlEditTextSelectionTag, 
+                    sizeof(ControlEditTextSelectionRec), &sel, &actualSize ) );
+    if ( from ) *from = sel.selStart ;
+    if ( to ) *to = sel.selEnd ;
+#endif

 }
 
 void wxTextCtrl::SetValue(const wxString& str)
 }
 
 void wxTextCtrl::SetValue(const wxString& str)


@@ -879,21 +990,30 @@ void wxTextCtrl::SetValue(const wxString& str)
 
     wxString st = str ;
     wxMacConvertNewlines13To10( &st ) ;
 
     wxString st = str ;
     wxMacConvertNewlines13To10( &st ) ;

-
+#if wxMAC_USE_MLTE

     {
         wxMacWindowClipper c( this ) ;
         bool formerEditable = m_editable ;
         if ( !formerEditable )
             SetEditable(true) ;
 
     {
         wxMacWindowClipper c( this ) ;
         bool formerEditable = m_editable ;
         if ( !formerEditable )
             SetEditable(true) ;
 

+#if !wxMAC_USE_MLTE_HIVIEW

         // otherwise scrolling might have problems ?
         TPUpdateVisibility( ( (STPTextPaneVars *)m_macTXNvars)->fUserPaneRec ) ;
         // otherwise scrolling might have problems ?
         TPUpdateVisibility( ( (STPTextPaneVars *)m_macTXNvars)->fUserPaneRec ) ;

+#endif

         SetTXNData( (STPTextPaneVars *)m_macTXNvars , (TXNObject) m_macTXN , st , kTXNStartOffset, kTXNEndOffset ) ;
         TXNSetSelection( (TXNObject) m_macTXN, 0, 0);
         TXNShowSelection( (TXNObject) m_macTXN, kTXNShowStart);
         if ( !formerEditable )
             SetEditable(formerEditable) ;
     }
         SetTXNData( (STPTextPaneVars *)m_macTXNvars , (TXNObject) m_macTXN , st , kTXNStartOffset, kTXNEndOffset ) ;
         TXNSetSelection( (TXNObject) m_macTXN, 0, 0);
         TXNShowSelection( (TXNObject) m_macTXN, kTXNShowStart);
         if ( !formerEditable )
             SetEditable(formerEditable) ;
     }

+#else
+    wxMacCFStringHolder cf(st , m_font.GetEncoding() ) ;
+    CFStringRef value = cf ;
+    verify_noerr( SetControlData(  (ControlRef) m_macControl , 0, GetWindowStyle() & wxTE_PASSWORD ? 
+        kControlEditTextPasswordCFStringTag : kControlEditTextCFStringTag, 
+        sizeof(CFStringRef), &value ) );
+#endif

 }
 
 void wxTextCtrl::SetMaxLength(unsigned long len)
 }
 
 void wxTextCtrl::SetMaxLength(unsigned long len)


@@ -906,6 +1026,7 @@ bool wxTextCtrl::SetFont( const wxFont& font )
     if ( !wxTextCtrlBase::SetFont( font ) )
         return FALSE ;
         
     if ( !wxTextCtrlBase::SetFont( font ) )
         return FALSE ;
         

+#if wxMAC_USE_MLTE        

     wxMacWindowClipper c( this ) ;
     bool formerEditable = m_editable ;
     if ( !formerEditable )
     wxMacWindowClipper c( this ) ;
     bool formerEditable = m_editable ;
     if ( !formerEditable )


@@ -942,11 +1063,13 @@ bool wxTextCtrl::SetFont( const wxFont& font )
 
     if ( !formerEditable )
         SetEditable(formerEditable) ;
 
     if ( !formerEditable )
         SetEditable(formerEditable) ;

+#endif

     return true ;
 }
 
 bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
 {
     return true ;
 }
 
 bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
 {

+#if wxMAC_USE_MLTE

     bool formerEditable = m_editable ;
     if ( !formerEditable )
         SetEditable(true) ;
     bool formerEditable = m_editable ;
     if ( !formerEditable )
         SetEditable(true) ;


@@ -995,7 +1118,7 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
     }
     if ( !formerEditable )
         SetEditable(formerEditable) ;
     }
     if ( !formerEditable )
         SetEditable(formerEditable) ;

-
+#endif

     return TRUE ;
 }
 
     return TRUE ;
 }
 


@@ -1011,9 +1134,11 @@ void wxTextCtrl::Copy()
 {
     if (CanCopy())
     {
 {
     if (CanCopy())
     {

+#if wxMAC_USE_MLTE

         ClearCurrentScrap();
         TXNCopy((TXNObject)m_macTXN);
         TXNConvertToPublicScrap();
         ClearCurrentScrap();
         TXNCopy((TXNObject)m_macTXN);
         TXNConvertToPublicScrap();

+#endif

     }
 }
 
     }
 }
 


@@ -1021,10 +1146,11 @@ void wxTextCtrl::Cut()
 {
     if (CanCut())
     {
 {
     if (CanCut())
     {

+#if wxMAC_USE_MLTE

         ClearCurrentScrap();
         TXNCut((TXNObject)m_macTXN);
         TXNConvertToPublicScrap();
         ClearCurrentScrap();
         TXNCut((TXNObject)m_macTXN);
         TXNConvertToPublicScrap();

-
+#endif

         wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
         event.SetString( GetValue() ) ;
         event.SetEventObject( this );
         wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
         event.SetString( GetValue() ) ;
         event.SetEventObject( this );


@@ -1036,11 +1162,11 @@ void wxTextCtrl::Paste()
 {
     if (CanPaste())
     {
 {
     if (CanPaste())
     {

-
+#if wxMAC_USE_MLTE

         TXNConvertFromPublicScrap();
         TXNPaste((TXNObject)m_macTXN);
         SetStyle( kTXNUseCurrentSelection , kTXNUseCurrentSelection , GetDefaultStyle() ) ;
         TXNConvertFromPublicScrap();
         TXNPaste((TXNObject)m_macTXN);
         SetStyle( kTXNUseCurrentSelection , kTXNUseCurrentSelection , GetDefaultStyle() ) ;

-
+#endif

         wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
         event.SetString( GetValue() ) ;
         event.SetEventObject( this );
         wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
         event.SetString( GetValue() ) ;
         event.SetEventObject( this );


@@ -1073,7 +1199,11 @@ bool wxTextCtrl::CanPaste() const
     if (!IsEditable())
         return FALSE;
 
     if (!IsEditable())
         return FALSE;
 

+#if wxMAC_USE_MLTE

     return TXNIsScrapPastable() ;
     return TXNIsScrapPastable() ;

+#else
+    return true ;
+#endif

 }
 
 void wxTextCtrl::SetEditable(bool editable)
 }
 
 void wxTextCtrl::SetEditable(bool editable)


@@ -1081,11 +1211,11 @@ void wxTextCtrl::SetEditable(bool editable)
     if ( editable != m_editable )
     {
         m_editable = editable ;
     if ( editable != m_editable )
     {
         m_editable = editable ;

-
+#if wxMAC_USE_MLTE

         TXNControlTag tag[] = { kTXNIOPrivilegesTag } ;
         TXNControlData data[] = { { editable ? kTXNReadWrite : kTXNReadOnly } } ;
         TXNSetTXNObjectControls( (TXNObject) m_macTXN , false , sizeof(tag) / sizeof (TXNControlTag) , tag , data ) ;
         TXNControlTag tag[] = { kTXNIOPrivilegesTag } ;
         TXNControlData data[] = { { editable ? kTXNReadWrite : kTXNReadOnly } } ;
         TXNSetTXNObjectControls( (TXNObject) m_macTXN , false , sizeof(tag) / sizeof (TXNControlTag) , tag , data ) ;

-
+#endif

     }
 }
 
     }
 }
 


@@ -1110,7 +1240,8 @@ long wxTextCtrl::GetInsertionPoint() const
 long wxTextCtrl::GetLastPosition() const
 {
     Handle theText ;
 long wxTextCtrl::GetLastPosition() const
 {
     Handle theText ;

-    long actualsize ;
+    long actualsize = 0 ;
+#if wxMAC_USE_MLTE

     OSErr err = TXNGetDataEncoded( (TXNObject) m_macTXN, kTXNStartOffset, kTXNEndOffset, &theText , kTXNTextData );
     /* all done */
     if ( err )
     OSErr err = TXNGetDataEncoded( (TXNObject) m_macTXN, kTXNStartOffset, kTXNEndOffset, &theText , kTXNTextData );
     /* all done */
     if ( err )


@@ -1122,11 +1253,13 @@ long wxTextCtrl::GetLastPosition() const
         actualsize = GetHandleSize( theText ) ;
         DisposeHandle( theText ) ;
     }
         actualsize = GetHandleSize( theText ) ;
         DisposeHandle( theText ) ;
     }

+#endif

     return actualsize ;
 }
 
 void wxTextCtrl::Replace(long from, long to, const wxString& str)
 {
     return actualsize ;
 }
 
 void wxTextCtrl::Replace(long from, long to, const wxString& str)
 {

+#if wxMAC_USE_MLTE

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


@@ -1140,10 +1273,12 @@ void wxTextCtrl::Replace(long from, long to, const wxString& str)
         SetEditable( formerEditable ) ;
 
     Refresh() ;
         SetEditable( formerEditable ) ;
 
     Refresh() ;

+#endif

 }
 
 void wxTextCtrl::Remove(long from, long to)
 {
 }
 
 void wxTextCtrl::Remove(long from, long to)
 {

+#if wxMAC_USE_MLTE

     bool formerEditable = m_editable ;
     if ( !formerEditable )
         SetEditable(true) ;
     bool formerEditable = m_editable ;
     if ( !formerEditable )
         SetEditable(true) ;


@@ -1153,20 +1288,26 @@ void wxTextCtrl::Remove(long from, long to)
         SetEditable( formerEditable ) ;
 
     Refresh() ;
         SetEditable( formerEditable ) ;
 
     Refresh() ;

+#endif

 }
 
 void wxTextCtrl::SetSelection(long from, long to)
 {
 }
 
 void wxTextCtrl::SetSelection(long from, long to)
 {

-    STPTextPaneVars *varsp = (STPTextPaneVars *) m_macTXNvars;
-    /* and our drawing environment as the operation
-    may force a redraw in the text area. */
-    SetPort(varsp->fDrawingEnvironment);
+#if wxMAC_USE_MLTE

     /* change the selection */
     if ((from == -1) && (to == -1))
        TXNSelectAll((TXNObject) m_macTXN);
     else
     /* change the selection */
     if ((from == -1) && (to == -1))
        TXNSelectAll((TXNObject) m_macTXN);
     else

-       TXNSetSelection( varsp->fTXNRec, from, to);
+       TXNSetSelection( (TXNObject) m_macTXN, from, to);

     TXNShowSelection( (TXNObject) m_macTXN, kTXNShowStart);
     TXNShowSelection( (TXNObject) m_macTXN, kTXNShowStart);

+#else
+    ControlEditTextSelectionRec sel ;
+    sel.selStart = from ;
+    sel.selEnd = to ;
+    verify_noerr( SetControlData( (ControlRef) m_macControl , 0, kControlEditTextSelectionTag, 
+                    sizeof(ControlEditTextSelectionRec), &sel ) );
+
+#endif

 }
 
 bool wxTextCtrl::LoadFile(const wxString& file)
 }
 
 bool wxTextCtrl::LoadFile(const wxString& file)


@@ -1183,19 +1324,28 @@ void wxTextCtrl::WriteText(const wxString& str)
 {
     wxString st = str ;
     wxMacConvertNewlines13To10( &st ) ;
 {
     wxString st = str ;
     wxMacConvertNewlines13To10( &st ) ;

-
+#if wxMAC_USE_MLTE

     bool formerEditable = m_editable ;
     if ( !formerEditable )
         SetEditable(true) ;
     bool formerEditable = m_editable ;
     if ( !formerEditable )
         SetEditable(true) ;

-    long start , end , dummy ;
-    GetSelection( &start , &dummy ) ;
-    SetTXNData( (STPTextPaneVars *)m_macTXNvars , (TXNObject) m_macTXN , st , kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ;
-    GetSelection( &dummy , &end ) ;
-    SetStyle( start , end , GetDefaultStyle() ) ;
+    {
+        wxMacWindowStateSaver( this ) ;
+        long start , end , dummy ;
+        GetSelection( &start , &dummy ) ;
+        SetTXNData( (STPTextPaneVars *)m_macTXNvars , (TXNObject) m_macTXN , st , kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ;
+        GetSelection( &dummy , &end ) ;
+        SetStyle( start , end , GetDefaultStyle() ) ;
+    }

     if ( !formerEditable )
         SetEditable( formerEditable ) ;
 
     MacRedrawControl() ;
     if ( !formerEditable )
         SetEditable( formerEditable ) ;
 
     MacRedrawControl() ;

+#else
+    wxMacCFStringHolder cf(st , m_font.GetEncoding() ) ;
+    CFStringRef value = cf ;
+    SetControlData(  (ControlRef) m_macControl , 0, kControlEditTextInsertCFStringRefTag, 
+        sizeof(CFStringRef), &value );
+#endif

 }
 
 void wxTextCtrl::AppendText(const wxString& text)
 }
 
 void wxTextCtrl::AppendText(const wxString& text)


@@ -1206,6 +1356,7 @@ void wxTextCtrl::AppendText(const wxString& text)
 
 void wxTextCtrl::Clear()
 {
 
 void wxTextCtrl::Clear()
 {

+#if wxMAC_USE_MLTE

     bool formerEditable = m_editable ;
     if ( !formerEditable )
         SetEditable(true) ;
     bool formerEditable = m_editable ;
     if ( !formerEditable )
         SetEditable(true) ;


@@ -1216,6 +1367,9 @@ void wxTextCtrl::Clear()
         SetEditable( formerEditable ) ;
 
     Refresh() ;
         SetEditable( formerEditable ) ;
 
     Refresh() ;

+#else
+    SetValue(wxEmptyString) ;
+#endif

 }
 
 bool wxTextCtrl::IsModified() const
 }
 
 bool wxTextCtrl::IsModified() const


@@ -1272,7 +1426,9 @@ void wxTextCtrl::Undo()
 {
     if (CanUndo())
     {
 {
     if (CanUndo())
     {

+#if wxMAC_USE_MLTE

         TXNUndo((TXNObject)m_macTXN); 
         TXNUndo((TXNObject)m_macTXN); 

+#endif

     }
 }
 
     }
 }
 


@@ -1280,7 +1436,9 @@ void wxTextCtrl::Redo()
 {
     if (CanRedo())
     {
 {
     if (CanRedo())
     {

+#if wxMAC_USE_MLTE

         TXNRedo((TXNObject)m_macTXN); 
         TXNRedo((TXNObject)m_macTXN); 

+#endif

     }
 }
 
     }
 }
 


@@ -1290,7 +1448,11 @@ bool wxTextCtrl::CanUndo() const
     {
         return false ; 
     }
     {
         return false ; 
     }

+#if wxMAC_USE_MLTE

     return TXNCanUndo((TXNObject)m_macTXN,NULL); 
     return TXNCanUndo((TXNObject)m_macTXN,NULL); 

+#else
+    return false ;
+#endif

 }
 
 bool wxTextCtrl::CanRedo() const
 }
 
 bool wxTextCtrl::CanRedo() const


@@ -1299,7 +1461,11 @@ bool wxTextCtrl::CanRedo() const
     {
         return false ; 
     }
     {
         return false ; 
     }

+#if wxMAC_USE_MLTE

     return TXNCanRedo((TXNObject)m_macTXN,NULL); 
     return TXNCanRedo((TXNObject)m_macTXN,NULL); 

+#else
+    return false ;
+#endif

 }
 
 // Makes modifie or unmodified
 }
 
 // Makes modifie or unmodified


@@ -1315,24 +1481,98 @@ void wxTextCtrl::DiscardEdits()
 
 int wxTextCtrl::GetNumberOfLines() const
 {
 
 int wxTextCtrl::GetNumberOfLines() const
 {

-    ItemCount lines ;
+    ItemCount lines = 0 ;
+#if wxMAC_USE_MLTE

     TXNGetLineCount((TXNObject)m_macTXN, &lines ) ;
     TXNGetLineCount((TXNObject)m_macTXN, &lines ) ;

+#endif

     return lines ;
 }
 
 long wxTextCtrl::XYToPosition(long x, long y) const
 {
     return lines ;
 }
 
 long wxTextCtrl::XYToPosition(long x, long y) const
 {

-    // TODO
+#if wxMAC_USE_MLTE
+    Point curpt ;
+    
+    long lastpos = GetLastPosition() ;
+    
+    // TODO find a better implementation : while we can get the 
+    // line metrics of a certain line, we don't get its starting
+    // position, so it would probably be rather a binary search
+    // for the start position
+    long xpos = 0 ; 
+    long ypos = 0 ;
+    int lastHeight = 0 ;
+
+    ItemCount n ;
+    for ( n = 0 ; n <= (ItemCount) lastpos ; ++n )
+    {
+        if ( y == ypos && x == xpos )
+            return n ;
+        
+        TXNOffsetToPoint( (TXNObject) m_macTXN,  n , &curpt);
+
+        if ( curpt.v > lastHeight )
+        {
+            xpos = 0 ;
+            if ( n > 0 )
+                ++ypos ;
+            lastHeight = curpt.v ;
+        }
+        else
+            ++xpos ;
+    }
+#endif    

     return 0;
 }
 
 bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
 {
     return 0;
 }
 
 bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
 {

+#if wxMAC_USE_MLTE
+    Point curpt ;
+    
+    long lastpos = GetLastPosition() ;
+    
+    if ( y ) *y = 0 ;
+    if ( x ) *x = 0 ;
+    
+    if ( pos <= lastpos )
+    {
+        // TODO find a better implementation : while we can get the 
+        // line metrics of a certain line, we don't get its starting
+        // position, so it would probably be rather a binary search
+        // for the start position
+        long xpos = 0 ; 
+        long ypos = 0 ;
+        int lastHeight = 0 ;
+
+        ItemCount n ;
+        for ( n = 0 ; n <= (ItemCount) pos ; ++n )
+        {
+            TXNOffsetToPoint( (TXNObject) m_macTXN,  n , &curpt);
+
+            if ( curpt.v > lastHeight )
+            {
+                xpos = 0 ;
+                if ( n > 0 )
+                    ++ypos ;
+                lastHeight = curpt.v ;
+            }
+            else
+                ++xpos ;
+        }
+        if ( y ) *y = ypos ;
+        if ( x ) *x = xpos ;
+    }
+#else
+    if ( y ) *y = 0 ;
+    if ( x ) *x = 0 ;
+#endif    

     return FALSE ;
 }
 
 void wxTextCtrl::ShowPosition(long pos)
 {
     return FALSE ;
 }
 
 void wxTextCtrl::ShowPosition(long pos)
 {

+#if wxMAC_USE_MLTE

 #if TARGET_RT_MAC_MACHO && defined(AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER)
     {
         Point current ;
 #if TARGET_RT_MAC_MACHO && defined(AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER)
     {
         Point current ;


@@ -1353,61 +1593,90 @@ void wxTextCtrl::ShowPosition(long pos)
         }
     }
 #endif
         }
     }
 #endif

+#endif

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

-    // TODO change this if possible to reflect real lines
-    wxString content = GetValue() ;
-
-    // Find line first
-    int count = 0;
-    for (size_t i = 0; i < content.Length() ; i++)
+#if wxMAC_USE_MLTE
+    Point curpt ;
+    if ( lineNo < GetNumberOfLines() )

     {
     {

-        if (count == lineNo)
+        // TODO find a better implementation : while we can get the 
+        // line metrics of a certain line, we don't get its starting
+        // position, so it would probably be rather a binary search
+        // for the start position
+        long xpos = 0 ; 
+        long ypos = 0 ;
+        int lastHeight = 0 ;
+        long lastpos = GetLastPosition() ;
+
+        ItemCount n ;
+        for ( n = 0 ; n <= (ItemCount) lastpos ; ++n )

         {
         {

-            // Count chars in line then
-            count = 0;
-            for (size_t j = i; j < content.Length(); j++)
+            TXNOffsetToPoint( (TXNObject) m_macTXN,  n , &curpt);
+
+            if ( curpt.v > lastHeight )

             {
             {

-                count++;
-                if (content[j] == '\n') return count;
+                if ( ypos == lineNo )
+                    return xpos ;
+                    
+                xpos = 0 ;
+                if ( n > 0 )
+                    ++ypos ;
+                lastHeight = curpt.v ;

             }
             }

-
-            return count;
+            else
+                ++xpos ;

         }
         }

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

     }
     }

+#endif

     return 0;
 }
 
 wxString wxTextCtrl::GetLineText(long lineNo) const
 {
     return 0;
 }
 
 wxString wxTextCtrl::GetLineText(long lineNo) const
 {

-    // TODO change this if possible to reflect real lines
+    Point curpt ;
+    wxString line ;
+#if wxMAC_USE_MLTE

     wxString content = GetValue() ;
 
     wxString content = GetValue() ;
 

-    // Find line first
-    int count = 0;
-    for (size_t i = 0; i < content.Length() ; i++)
+    if ( lineNo < GetNumberOfLines() )

     {
     {

-        if (count == lineNo)
+        // TODO find a better implementation : while we can get the 
+        // line metrics of a certain line, we don't get its starting
+        // position, so it would probably be rather a binary search
+        // for the start position
+        long xpos = 0 ; 
+        long ypos = 0 ;
+        int lastHeight = 0 ;
+        long lastpos = GetLastPosition() ;
+
+        ItemCount n ;
+        for ( n = 0 ; n <= (ItemCount)lastpos ; ++n )

         {
         {

-            // Add chars in line then
-            wxString tmp;
+            TXNOffsetToPoint( (TXNObject) m_macTXN,  n , &curpt);

 
 

-            for (size_t j = i; j < content.Length(); j++)
+            if ( curpt.v > lastHeight )

             {
             {

-                if (content[j] == '\n')
-                    return tmp;
-
-                tmp += content[j];
+                if ( ypos == lineNo )
+                    return line ;
+                    
+                xpos = 0 ;
+                if ( n > 0 )
+                    ++ypos ;
+                lastHeight = curpt.v ;
+            }
+            else
+            {
+                if ( ypos == lineNo )
+                    line += content[n] ;
+                ++xpos ;

             }
             }

-
-            return tmp;

         }
         }

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

     }
     }

-    return wxEmptyString ;
+#endif
+    return line ;

 }
 
 /*
 }
 
 /*