Border corrections

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

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 4270eefb1c7a176e1439cbb0bede4234bd5c9f2d..cffeb618221d31e6f0c7f4d2d20890d21bed731b 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -1,57 +1,333 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        textctrl.cpp
+// Name:        src/mac/carbon/textctrl.cpp

 // Purpose:     wxTextCtrl
 // Purpose:     wxTextCtrl

-// Author:      AUTHOR
-// Modified by:
-// Created:     ??/??/98
+// Author:      Stefan Csomor
+// Modified by: Ryan Norton (MLTE GetLineLength and GetLineText)
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "textctrl.h"
-#endif
-
-#include "wx/defs.h"
+#include "wx/wxprec.h"

 
 #if wxUSE_TEXTCTRL
 
 
 #if wxUSE_TEXTCTRL
 

+#include "wx/textctrl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/dc.h"
+    #include "wx/button.h"
+    #include "wx/menu.h"
+    #include "wx/settings.h"
+    #include "wx/msgdlg.h"
+    #include "wx/toplevel.h"
+#endif
+

 #ifdef __DARWIN__
 #ifdef __DARWIN__

-  #include <sys/types.h>
-  #include <sys/stat.h>
+    #include <sys/types.h>
+    #include <sys/stat.h>

 #else
 #else

-  #include <stat.h>
+    #include <stat.h>
+#endif
+
+#if wxUSE_STD_IOSTREAM
+    #if wxUSE_IOSTREAMH
+        #include <fstream.h>
+    #else
+        #include <fstream>
+    #endif

 #endif
 #endif

-#include <fstream.h>

 
 

-#include "wx/app.h"
-#include "wx/dc.h"
-#include "wx/button.h"
-#include "wx/panel.h"
-#include "wx/textctrl.h"
-#include "wx/notebook.h"
-#include "wx/tabctrl.h"
-#include "wx/settings.h"

 #include "wx/filefn.h"
 #include "wx/filefn.h"

-#include "wx/utils.h"
+#include "wx/sysopt.h"

 
 #if defined(__BORLANDC__) && !defined(__WIN32__)
 
 #if defined(__BORLANDC__) && !defined(__WIN32__)

-  #include <alloc.h>
+    #include <alloc.h>

 #elif !defined(__MWERKS__) && !defined(__GNUWIN32) && !defined(__DARWIN__)
 #elif !defined(__MWERKS__) && !defined(__GNUWIN32) && !defined(__DARWIN__)

-  #include <malloc.h>
+    #include <malloc.h>
+#endif
+
+#ifndef __DARWIN__
+#include <MacTextEditor.h>
+#include <ATSUnicode.h>
+#include <TextCommon.h>
+#include <TextEncodingConverter.h>

 #endif
 
 #include "wx/mac/uma.h"
 #endif
 
 #include "wx/mac/uma.h"

+#include "wx/mac/carbon/private/mactext.h"
+
+#ifndef __WXMAC_OSX__
+enum
+{
+    kTXNVisibilityTag = 'visb' // set the visibility state of the object
+};
+#endif
+
+
+class wxMacFunctor
+{
+public :
+    wxMacFunctor() {}
+    virtual ~wxMacFunctor() {}
+
+    virtual void* operator()() = 0 ;
+
+    static void* CallBackProc( void *param )
+    {
+        wxMacFunctor* f = (wxMacFunctor*) param ;
+        void *result = (*f)() ;
+        return result ;
+    }
+} ;
+
+template<typename classtype, typename param1type>
+
+class wxMacObjectFunctor1 : public wxMacFunctor
+{
+    typedef void (classtype::*function)( param1type p1 ) ;
+    typedef void (classtype::*ref_function)( const param1type& p1 ) ;
+public :
+    wxMacObjectFunctor1( classtype *obj , function f , param1type p1 ) :
+        wxMacFunctor()
+    {
+        m_object = obj ;
+        m_function = f ;
+        m_param1 = p1 ;
+    }
+
+    wxMacObjectFunctor1( classtype *obj , ref_function f , param1type p1 ) :
+        wxMacFunctor()
+    {
+        m_object = obj ;
+        m_refFunction = f ;
+        m_param1 = p1 ;
+    }
+
+    virtual ~wxMacObjectFunctor1() {}
+
+    virtual void* operator()()
+    {
+        (m_object->*m_function)( m_param1 ) ;
+        return NULL ;
+    }
+
+private :
+    classtype* m_object ;
+    param1type m_param1 ;
+    union
+    {
+        function m_function ;
+        ref_function m_refFunction ;
+    } ;
+} ;
+
+template<typename classtype, typename param1type>
+void* wxMacMPRemoteCall( classtype *object , void (classtype::*function)( param1type p1 ) , param1type p1 )
+{
+    wxMacObjectFunctor1<classtype, param1type> params(object, function, p1) ;
+    void *result =
+        MPRemoteCall( wxMacFunctor::CallBackProc , &params , kMPOwningProcessRemoteContext ) ;
+    return result ;
+}
+
+template<typename classtype, typename param1type>
+void* wxMacMPRemoteCall( classtype *object , void (classtype::*function)( const param1type& p1 ) , param1type p1 )
+{
+    wxMacObjectFunctor1<classtype,param1type> params(object, function, p1) ;
+    void *result =
+        MPRemoteCall( wxMacFunctor::CallBackProc , &params , kMPOwningProcessRemoteContext ) ;
+    return result ;
+}
+
+template<typename classtype, typename param1type>
+void* wxMacMPRemoteGUICall( classtype *object , void (classtype::*function)( param1type p1 ) , param1type p1 )
+{
+    wxMutexGuiLeave() ;
+    void *result = wxMacMPRemoteCall( object , function , p1 ) ;
+    wxMutexGuiEnter() ;
+    return result ;
+}
+
+template<typename classtype, typename param1type>
+void* wxMacMPRemoteGUICall( classtype *object , void (classtype::*function)( const param1type& p1 ) , param1type p1 )
+{
+    wxMutexGuiLeave() ;
+    void *result = wxMacMPRemoteCall( object , function , p1 ) ;
+    wxMutexGuiEnter() ;
+    return result ;
+}
+
+
+// common parts for implementations based on MLTE
+
+class wxMacMLTEControl : public wxMacTextControl
+{
+public :
+    wxMacMLTEControl( wxTextCtrl *peer ) ;
+
+    virtual wxString GetStringValue() const ;
+    virtual void SetStringValue( const wxString &str ) ;
+
+    static TXNFrameOptions FrameOptionsFromWXStyle( long wxStyle ) ;
+
+    void AdjustCreationAttributes( const wxColour& background, bool visible ) ;
+
+    virtual void SetFont( const wxFont & font, const wxColour& foreground, long windowStyle ) ;
+    virtual void SetBackground( const wxBrush &brush ) ;
+    virtual void SetStyle( long start, long end, const wxTextAttr& style ) ;
+    virtual void Copy() ;
+    virtual void Cut() ;
+    virtual void Paste() ;
+    virtual bool CanPaste() const ;
+    virtual void SetEditable( bool editable ) ;
+    virtual wxTextPos GetLastPosition() const ;
+    virtual void Replace( long from, long to, const wxString &str ) ;
+    virtual void Remove( long from, long to ) ;
+    virtual void GetSelection( long* from, long* to ) const ;
+    virtual void SetSelection( long from, long to ) ;
+
+    virtual void WriteText( const wxString& str ) ;
+
+    virtual bool HasOwnContextMenu() const
+    {
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+        if ( UMAGetSystemVersion() >= 0x1040 )
+        {
+            TXNCommandEventSupportOptions options ;
+            TXNGetCommandEventSupport( m_txn , & options ) ;
+            return options & kTXNSupportEditCommandProcessing ;
+        }
+#endif
+
+        return false ;
+    }

 
 

-#define wxUSE_MLTE 0
+    virtual void CheckSpelling(bool check)
+    {
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+    TXNSetSpellCheckAsYouType( m_txn, (Boolean) check );
+#endif
+    }
+    virtual void Clear() ;
+
+    virtual bool CanUndo() const ;
+    virtual void Undo() ;
+    virtual bool CanRedo()  const;
+    virtual void Redo() ;
+    virtual int GetNumberOfLines() const ;
+    virtual long XYToPosition(long x, long y) const ;
+    virtual bool PositionToXY(long pos, long *x, long *y) const ;
+    virtual void ShowPosition( long pos ) ;
+    virtual int GetLineLength(long lineNo) const ;
+    virtual wxString GetLineText(long lineNo) const ;
+
+    void SetTXNData( const wxString& st , TXNOffset start , TXNOffset end ) ;
+    TXNObject GetTXNObject() { return m_txn ; }
+
+protected :
+    void TXNSetAttribute( const wxTextAttr& style , long from , long to ) ;
+
+    TXNObject m_txn ;
+} ;
+
+#if TARGET_API_MAC_OSX
+
+// implementation available under OSX
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+
+class wxMacMLTEHIViewControl : public wxMacMLTEControl
+{
+public :
+    wxMacMLTEHIViewControl( wxTextCtrl *wxPeer,
+                             const wxString& str,
+                             const wxPoint& pos,
+                             const wxSize& size, long style ) ;
+    virtual ~wxMacMLTEHIViewControl() ;
+
+    virtual OSStatus SetFocus( ControlFocusPart focusPart ) ;
+    virtual bool HasFocus() const ;
+    virtual void SetBackground( const wxBrush &brush) ;
+
+protected :
+    HIViewRef m_scrollView ;
+    HIViewRef m_textView ;
+};
+
+#endif
+
+#endif
+
+// 'classic' MLTE implementation
+
+class wxMacMLTEClassicControl : public wxMacMLTEControl
+{
+public :
+    wxMacMLTEClassicControl( wxTextCtrl *wxPeer,
+                             const wxString& str,
+                             const wxPoint& pos,
+                             const wxSize& size, long style ) ;
+    virtual ~wxMacMLTEClassicControl() ;
+
+    virtual void VisibilityChanged(bool shown) ;
+    virtual void SuperChangedPosition() ;
+
+    virtual void            MacControlUserPaneDrawProc(wxInt16 part) ;
+    virtual wxInt16         MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) ;
+    virtual wxInt16         MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) ;
+    virtual void            MacControlUserPaneIdleProc() ;
+    virtual wxInt16         MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) ;
+    virtual void            MacControlUserPaneActivateProc(bool activating) ;
+    virtual wxInt16         MacControlUserPaneFocusProc(wxInt16 action) ;
+    virtual void            MacControlUserPaneBackgroundProc(void* info) ;
+
+    virtual bool SetupCursor( const wxPoint& WXUNUSED(pt) )
+    {
+        MacControlUserPaneIdleProc();
+        return true;
+    }
+
+    virtual void            SetRect( Rect *r ) ;
+
+protected :
+    OSStatus                 DoCreate();
+
+    void                    MacUpdatePosition() ;
+    void                    MacActivatePaneText(bool setActive) ;
+    void                    MacFocusPaneText(bool setFocus) ;
+    void                    MacSetObjectVisibility(bool vis) ;
+
+private :
+    TXNFrameID              m_txnFrameID ;
+    GrafPtr                 m_txnPort ;
+    WindowRef               m_txnWindow ;
+    // bounds of the control as we last did set the txn frames
+    Rect                    m_txnControlBounds ;
+    Rect                    m_txnVisBounds ;
+
+#ifdef __WXMAC_OSX__
+    static pascal void TXNScrollActionProc( ControlRef controlRef , ControlPartCode partCode ) ;
+    static pascal void TXNScrollInfoProc(
+        SInt32 iValue, SInt32 iMaximumValue,
+        TXNScrollBarOrientation iScrollBarOrientation, SInt32 iRefCon ) ;
+
+    ControlRef              m_sbHorizontal ;
+    SInt32                  m_lastHorizontalValue ;
+    ControlRef              m_sbVertical ;
+    SInt32                  m_lastVerticalValue ;
+#endif
+};

 
 

-#if wxUSE_MLTE == 0 // old textctrl implementation

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)

 
 

-BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
+BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
+    EVT_ERASE_BACKGROUND( wxTextCtrl::OnEraseBackground )

     EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
     EVT_CHAR(wxTextCtrl::OnChar)
     EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
     EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
     EVT_CHAR(wxTextCtrl::OnChar)
     EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)


@@ -59,236 +335,221 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
     EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste)
     EVT_MENU(wxID_UNDO, wxTextCtrl::OnUndo)
     EVT_MENU(wxID_REDO, wxTextCtrl::OnRedo)
     EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste)
     EVT_MENU(wxID_UNDO, wxTextCtrl::OnUndo)
     EVT_MENU(wxID_REDO, wxTextCtrl::OnRedo)

+    EVT_MENU(wxID_CLEAR, wxTextCtrl::OnDelete)
+    EVT_MENU(wxID_SELECTALL, wxTextCtrl::OnSelectAll)
+
+    EVT_CONTEXT_MENU(wxTextCtrl::OnContextMenu)

 
     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)
 
     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)

+    EVT_UPDATE_UI(wxID_CLEAR, wxTextCtrl::OnUpdateDelete)
+    EVT_UPDATE_UI(wxID_SELECTALL, wxTextCtrl::OnUpdateSelectAll)

 END_EVENT_TABLE()
 END_EVENT_TABLE()

-#endif

 
 

-// Text item
-wxTextCtrl::wxTextCtrl()
+
+void wxTextCtrl::Init()

 {
 {

+    m_editable = true ;
+    m_dirty = false;
+
+    m_maxLength = 0;
+    m_privateContextMenu = NULL;
+    m_triggerOnSetValue = true ;

 }
 
 }
 

-const short kVerticalMargin = 2 ;
-const short kHorizontalMargin = 2 ;
+wxTextCtrl::~wxTextCtrl()
+{
+    delete m_privateContextMenu;
+}

 
 

-bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
-           const wxString& st,
-           const wxPoint& pos,
-           const wxSize& size, long style,
-           const wxValidator& validator,
-           const wxString& name)
+bool wxTextCtrl::Create( wxWindow *parent,
+    wxWindowID id,
+    const wxString& str,
+    const wxPoint& pos,
+    const wxSize& size,
+    long style,
+    const wxValidator& validator,
+    const wxString& name )

 {
 {

-    // base initialization
-    if ( !CreateBase(parent, id, pos, size, style, validator, name) )
-        return FALSE;
+    m_macIsUserPane = false ;
+    m_editable = true ;

 
 

-    wxSize mySize = size ;
-    if ( UMAHasAppearance() )
-    {
-        m_macHorizontalBorder = 5 ; // additional pixels around the real control
-        m_macVerticalBorder = 5 ;
-    }
-    else
+    if ( ! (style & wxNO_BORDER) )
+        style = (style & ~wxBORDER_MASK) | wxSUNKEN_BORDER ;
+
+    if ( !wxTextCtrlBase::Create( parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), validator, name ) )
+        return false;
+
+    if ( m_windowStyle & wxTE_MULTILINE )

     {
     {

-        m_macHorizontalBorder = 0 ; // additional pixels around the real control
-        m_macVerticalBorder = 0 ;
+        // always turn on this style for multi-line controls
+        m_windowStyle |= wxTE_PROCESS_ENTER;
+        style |= wxTE_PROCESS_ENTER ;

     }
 
     }
 

+    CreatePeer( str, pos, size, style );

 
 

-    Rect bounds ;
-    Str255 title ;
+    MacPostControlCreate(pos, size) ;
+
+    // only now the embedding is correct and we can do a positioning update
+
+    MacSuperChangedPosition() ;
+
+    if ( m_windowStyle & wxTE_READONLY)
+        SetEditable( false ) ;

 
 

-    if ( mySize.y == -1 )
+    SetCursor( wxCursor( wxCURSOR_IBEAM ) ) ;
+
+    return true;
+}
+
+void wxTextCtrl::CreatePeer(
+           const wxString& str,
+           const wxPoint& pos,
+           const wxSize& size, long style )
+{
+    bool forceMLTE = false ;
+
+#if wxUSE_SYSTEM_OPTIONS
+    if (wxSystemOptions::HasOption( wxMAC_TEXTCONTROL_USE_MLTE ) && (wxSystemOptions::GetOptionInt( wxMAC_TEXTCONTROL_USE_MLTE ) == 1))

     {
     {

-        if ( UMAHasAppearance() )
-            mySize.y = 13 ;
-        else
-            mySize.y = 24 ;
-        
-        mySize.y += 2 * m_macVerticalBorder ;
+        forceMLTE = true ;

     }
     }

+#endif

 
 

-    MacPreControlCreate( parent , id ,  "" , pos , mySize ,style, validator , name , &bounds , title ) ;
+    if ( UMAGetSystemVersion() >= 0x1050 )
+        forceMLTE = false;

 
 

-    if ( m_windowStyle & wxTE_MULTILINE )
+    if ( UMAGetSystemVersion() >= 0x1030 && !forceMLTE )

     {
     {

-        wxASSERT_MSG( !(m_windowStyle & wxTE_PROCESS_ENTER),
-                      wxT("wxTE_PROCESS_ENTER style is ignored for multiline text controls (they always process it)") );
+        if ( m_windowStyle & wxTE_MULTILINE )
+            m_peer = new wxMacMLTEHIViewControl( this , str , pos , size , style ) ;
+    }

 
 

-        m_windowStyle |= wxTE_PROCESS_ENTER;
+    if ( !m_peer )
+    {
+        if ( !(m_windowStyle & wxTE_MULTILINE) && !forceMLTE )
+        {
+            m_peer = new wxMacUnicodeTextControl( this , str , pos , size , style ) ;
+        }

     }
 
     }
 

+    // the horizontal single line scrolling bug that made us keep the classic implementation
+    // is fixed in 10.5
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
+    if ( !m_peer )
+        m_peer = new wxMacMLTEClassicControl( this , str , pos , size , style ) ;
+#endif
+}

 
 

-    m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , "\p" , true , 0 , 0 , 1, 
-        ( style & wxTE_PASSWORD ) ? kControlEditTextPasswordProc : kControlEditTextProc , (long) this ) ;
-    MacPostControlCreate() ;
+void wxTextCtrl::MacSuperChangedPosition()
+{
+    wxWindow::MacSuperChangedPosition() ;
+    GetPeer()->SuperChangedPosition() ;
+}

 
 

-    wxString value ;
-    
-    {
-        TEHandle teH ;
-        long size ;
-   
-        ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
-        (*teH)->lineHeight = -1 ;
-    }
-    
-    if( wxApp::s_macDefaultEncodingIsPC )
-        value = wxMacMakeMacStringFromPC( st ) ;
-    else
-        value = st ;
-    ::SetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , value.Length() , (char*) ((const char*)value) ) ;
+void wxTextCtrl::MacVisibilityChanged()
+{
+    GetPeer()->VisibilityChanged( MacIsReallyShown() ) ;
+}
+
+void wxTextCtrl::MacEnabledStateChanged()
+{
+}

 
 

-  return TRUE;
+void wxTextCtrl::MacCheckSpelling(bool check)
+{
+    GetPeer()->CheckSpelling(check);

 }
 
 wxString wxTextCtrl::GetValue() const
 {
 }
 
 wxString wxTextCtrl::GetValue() const
 {

-    Size actualsize;
-    ::GetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ;
-    wxBuffer[actualsize] = 0 ;
-    if( wxApp::s_macDefaultEncodingIsPC )
-        return wxMacMakePCStringFromMac( wxBuffer ) ;
-    else
-        return wxString(wxBuffer);
+    return GetPeer()->GetStringValue() ;

 }
 
 void wxTextCtrl::GetSelection(long* from, long* to) const
 {
 }
 
 void wxTextCtrl::GetSelection(long* from, long* to) const
 {

-   ControlEditTextSelectionRec selection ;
-   TEHandle teH ;
-   long size ;
-   
-   ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
-
-    *from = (**teH).selStart;
-    *to = (**teH).selEnd;
+    GetPeer()->GetSelection( from , to ) ;

 }
 
 }
 

-void wxTextCtrl::SetValue(const wxString& st)
+void wxTextCtrl::DoSetValue(const wxString& str, int flags)

 {
 {

-    wxString value ;
-    
-    if( wxApp::s_macDefaultEncodingIsPC )
-        value = wxMacMakeMacStringFromPC( st ) ;
-    else
-        value = st ;
-    ::SetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , value.Length() , (char*) ((const char*)value) ) ;
-    WindowRef window = GetMacRootWindow() ;
-    if ( window )
+    // optimize redraws
+    if ( GetValue() == str )
+        return;
+
+    GetPeer()->SetStringValue( str ) ;
+
+    if ( (flags & SetValue_SendEvent) && m_triggerOnSetValue )

     {
     {

-        wxWindow* win = wxFindWinFromMacWindow( window ) ;
-        if ( win )
-        {
-            wxMacDrawingHelper help( win ) ;
-            // the mac control manager always assumes to have the origin at 0,0
-            SetOrigin( 0 , 0 ) ;
-            
-            bool            hasTabBehind = false ;
-            wxWindow* parent = GetParent() ;
-            while ( parent )
-            {
-                if( parent->MacGetWindowData() )
-                {
-                    ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
-                    break ;
-                }
-                
-                if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ||  parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
-                {
-                    if ( ((wxControl*)parent)->GetMacControl() )
-                        SetUpControlBackground( ((wxControl*)parent)->GetMacControl() , -1 , true ) ;
-                    break ;
-                }
-                
-                parent = parent->GetParent() ;
-            } 
-            
-            UMADrawControl( m_macControl ) ;
-            ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
-        }
+        SendTextUpdatedEvent();

     }
 }
 
     }
 }
 

+void wxTextCtrl::SetMaxLength(unsigned long len)
+{
+    m_maxLength = len ;
+}
+
+bool wxTextCtrl::SetFont( const wxFont& font )
+{
+    if ( !wxTextCtrlBase::SetFont( font ) )
+        return false ;
+
+    GetPeer()->SetFont( font , GetForegroundColour() , GetWindowStyle() ) ;
+
+    return true ;
+}
+
+bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
+{
+    GetPeer()->SetStyle( start , end , style ) ;
+
+    return true ;
+}
+
+bool wxTextCtrl::SetDefaultStyle(const wxTextAttr& style)
+{
+    wxTextCtrlBase::SetDefaultStyle( style ) ;
+    SetStyle( kTXNUseCurrentSelection , kTXNUseCurrentSelection , GetDefaultStyle() ) ;
+
+    return true ;
+}
+

 // Clipboard operations
 // Clipboard operations

+

 void wxTextCtrl::Copy()
 {
     if (CanCopy())
 void wxTextCtrl::Copy()
 {
     if (CanCopy())

-    {
-        TEHandle teH ;
-        long size ;
-   
-                 ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
-                   TECopy( teH ) ;
-        ClearCurrentScrap();
-                   TEToScrap() ;
-    }
+        GetPeer()->Copy() ;

 }
 
 void wxTextCtrl::Cut()
 {
     if (CanCut())
     {
 }
 
 void wxTextCtrl::Cut()
 {
     if (CanCut())
     {

-        TEHandle teH ;
-        long size ;
-   
-                 ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
-                   TECut( teH ) ;
-        ClearCurrentScrap();
-                   TEToScrap() ;
-                   //  MacInvalidateControl() ;
-         }
+        GetPeer()->Cut() ;
+
+        wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );
+        event.SetEventObject( this );
+        GetEventHandler()->ProcessEvent( event );
+      }

 }
 
 void wxTextCtrl::Paste()
 {
     if (CanPaste())
     {
 }
 
 void wxTextCtrl::Paste()
 {
     if (CanPaste())
     {

-        TEHandle teH ;
-        long size ;
-   
-        ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
-        TEFromScrap() ;
-        TEPaste( teH ) ;
-        WindowRef window = GetMacRootWindow() ;
-        if ( window )
-        {
-            wxWindow* win = wxFindWinFromMacWindow( window ) ;
-            if ( win )
-            {
-                wxMacDrawingHelper help( win ) ;
-                // the mac control manager always assumes to have the origin at 0,0
-                SetOrigin( 0 , 0 ) ;
-                
-                bool            hasTabBehind = false ;
-                wxWindow* parent = GetParent() ;
-                while ( parent )
-                {
-                    if( parent->MacGetWindowData() )
-                    {
-                        ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
-                        break ;
-                    }
-                    
-                    if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ||  parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
-                    {
-                        if ( ((wxControl*)parent)->GetMacControl() )
-                            SetUpControlBackground( ((wxControl*)parent)->GetMacControl() , -1 , true ) ;
-                        break ;
-                    }
-                    
-                    parent = parent->GetParent() ;
-                } 
-                
-                UMADrawControl( m_macControl ) ;
-                ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
-            }
-        }
+        GetPeer()->Paste() ;
+
+        // TODO: eventually we should add setting the default style again
+
+        wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );
+        event.SetEventObject( this );
+        GetEventHandler()->ProcessEvent( event );

     }
 }
 
     }
 }
 


@@ -296,59 +557,38 @@ bool wxTextCtrl::CanCopy() const
 {
     // Can copy if there's a selection
     long from, to;
 {
     // Can copy if there's a selection
     long from, to;

-    GetSelection(& from, & to);
+    GetSelection( &from, &to );
+

     return (from != to);
 }
 
 bool wxTextCtrl::CanCut() const
 {
     return (from != to);
 }
 
 bool wxTextCtrl::CanCut() const
 {

+    if ( !IsEditable() )
+        return false;
+

     // Can cut if there's a selection
     long from, to;
     // Can cut if there's a selection
     long from, to;

-    GetSelection(& from, & to);
+    GetSelection( &from, &to );
+

     return (from != to);
 }
 
 bool wxTextCtrl::CanPaste() const
 {
     if (!IsEditable())
     return (from != to);
 }
 
 bool wxTextCtrl::CanPaste() const
 {
     if (!IsEditable())

-        return FALSE;
+        return false;

 
 

-    long offset ;
-#if TARGET_CARBON
-    OSStatus err = noErr;
-    ScrapRef scrapRef;
-    
-    err = GetCurrentScrap( &scrapRef );
-    if ( err != noTypeErr && err != memFullErr )    
-    {
-        ScrapFlavorFlags    flavorFlags;
-        Size                byteCount;
-        
-        if (( err = GetScrapFlavorFlags( scrapRef, 'TEXT', &flavorFlags )) == noErr)
-        {
-            if (( err = GetScrapFlavorSize( scrapRef, 'TEXT', &byteCount )) == noErr)
-            {
-                return TRUE ;
-            }
-        }
-    }
-    return FALSE;
-    
-#else
-    if ( GetScrap( NULL , 'TEXT' , &offset ) > 0 )
-    {
-        return TRUE ;
-    }
-#endif
-    return FALSE ;
+    return GetPeer()->CanPaste() ;

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

-    if ( editable )
-        UMAActivateControl( m_macControl ) ;
-    else
-        UMADeactivateControl( m_macControl ) ;
+    if ( editable != m_editable )
+    {
+        m_editable = editable ;
+        GetPeer()->SetEditable( editable ) ;
+    }

 }
 
 void wxTextCtrl::SetInsertionPoint(long pos)
 }
 
 void wxTextCtrl::SetInsertionPoint(long pos)


@@ -358,158 +598,115 @@ void wxTextCtrl::SetInsertionPoint(long pos)
 
 void wxTextCtrl::SetInsertionPointEnd()
 {
 
 void wxTextCtrl::SetInsertionPointEnd()
 {

-    long pos = GetLastPosition();
-    SetInsertionPoint(pos);
+    wxTextPos pos = GetLastPosition();
+    SetInsertionPoint( pos );

 }
 
 long wxTextCtrl::GetInsertionPoint() const
 {
 }
 
 long wxTextCtrl::GetInsertionPoint() const
 {

-   ControlEditTextSelectionRec selection ;
-   TEHandle teH ;
-   long size ;
-   
-   ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
-//   ::GetControlData( m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection , &size ) ;
-    return (**teH).selStart ;
+    long begin, end ;
+    GetSelection( &begin , &end ) ;
+
+    return begin ;

 }
 
 }
 

-long wxTextCtrl::GetLastPosition() const
+wxTextPos wxTextCtrl::GetLastPosition() const

 {
 {

-   ControlEditTextSelectionRec selection ;
-   TEHandle teH ;
-   long size ;
-   
-   ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
-   
-//   ::GetControlData( m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection , &size ) ;
-    return (**teH).teLength ;
+    return GetPeer()->GetLastPosition() ;

 }
 
 }
 

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

 {
 {

-    TEHandle teH ;
-    long size ;
-   
-    ControlEditTextSelectionRec selection ;
-   
-    selection.selStart = from ;
-    selection.selEnd = to ;
-    ::SetControlData( m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ;
-        ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
-    TESetSelect( from , to  , teH ) ;
-    TEDelete( teH ) ;
-        TEInsert( value , value.Length() , teH ) ;
-    Refresh() ;
+    GetPeer()->Replace( from , to , str ) ;

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

-    TEHandle teH ;
-    long size ;
-   
-    ControlEditTextSelectionRec selection ;
-   
-    selection.selStart = from ;
-    selection.selEnd = to ;
-    ::SetControlData( m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ;
-    ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
-    TEDelete( teH ) ;
-    Refresh() ;
+    GetPeer()->Remove( from , to ) ;

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

-   ControlEditTextSelectionRec selection ;
-   TEHandle teH ;
-   long size ;
-   
-   ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
-   
-   selection.selStart = from ;
-   selection.selEnd = to ;
-   
-   ::SetControlData( m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ;
-   TESetSelect( selection.selStart , selection.selEnd , teH ) ;
+    GetPeer()->SetSelection( from , to ) ;

 }
 
 }
 

-bool wxTextCtrl::LoadFile(const wxString& file)
+void wxTextCtrl::WriteText(const wxString& str)

 {
 {

-    if ( wxTextCtrlBase::LoadFile(file) )
+    // TODO: this MPRemoting will be moved into a remoting peer proxy for any command
+    if ( !wxIsMainThread() )

     {
     {

-        return TRUE;
-    }
+        // unfortunately CW 8 is not able to correctly deduce the template types,
+        // so we have to instantiate explicitly
+        wxMacMPRemoteGUICall<wxTextCtrl,wxString>( this , &wxTextCtrl::WriteText , str ) ;

 
 

-    return FALSE;
-}
+        return ;
+    }

 
 

-void wxTextCtrl::WriteText(const wxString& text)
-{
-    TEHandle teH ;
-    long size ;
-   
-    memcpy( wxBuffer, text , text.Length() ) ;
-    wxBuffer[text.Length() ] = 0 ;
-//    wxMacConvertNewlines( wxBuffer , wxBuffer ) ;
-   
-    ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
-   
-        TEInsert( wxBuffer , strlen( wxBuffer) , teH ) ;
-        Refresh() ;
+    GetPeer()->WriteText( str ) ;

 }
 
 void wxTextCtrl::AppendText(const wxString& text)
 {
     SetInsertionPointEnd();
 }
 
 void wxTextCtrl::AppendText(const wxString& text)
 {
     SetInsertionPointEnd();

-    WriteText(text);
+    WriteText( text );

 }
 
 void wxTextCtrl::Clear()
 {
 }
 
 void wxTextCtrl::Clear()
 {

-    ::SetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 0 , (char*) ((const char*)NULL) ) ;
-    Refresh() ;
+    GetPeer()->Clear() ;

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

-    return TRUE;
+    return m_dirty;

 }
 
 bool wxTextCtrl::IsEditable() const
 {
 }
 
 bool wxTextCtrl::IsEditable() const
 {

-    return IsEnabled();
+    return IsEnabled() && m_editable ;

 }
 
 bool wxTextCtrl::AcceptsFocus() const
 {
     // we don't want focus if we can't be edited
 }
 
 bool wxTextCtrl::AcceptsFocus() const
 {
     // we don't want focus if we can't be edited

-    return IsEditable() && wxControl::AcceptsFocus();
+    return /*IsEditable() && */ wxControl::AcceptsFocus();

 }
 
 wxSize wxTextCtrl::DoGetBestSize() const
 {
 }
 
 wxSize wxTextCtrl::DoGetBestSize() const
 {

-    int wText = 100 ;
-    
-    int hText ;
-        if ( UMAHasAppearance() )
-            hText = 13 ;
-        else
-            hText = 24 ;
-    hText += 2 * m_macHorizontalBorder ;
-/*
-    int cx, cy;
-    wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
-
-    int wText = DEFAULT_ITEM_WIDTH;
+    int wText, hText;

 
 

-    int hText = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
+    // these are the numbers from the HIG:
+    // we reduce them by the borders first
+    wText = 100 ;

 
 

-    return wxSize(wText, hText);
-*/
-    if ( m_windowStyle & wxTE_MULTILINE )
+    switch ( m_windowVariant )

     {
     {

-        hText *= wxMin(GetNumberOfLines(), 5);
+        case wxWINDOW_VARIANT_NORMAL :
+            hText = 22 - 6 ;
+            break ;
+
+        case wxWINDOW_VARIANT_SMALL :
+            hText = 19 - 6 ;
+            break ;
+
+        case wxWINDOW_VARIANT_MINI :
+            hText = 15 - 6 ;
+            break ;
+
+        default :
+            hText = 22 - 6;
+            break ;

     }
     }

-    //else: for single line control everything is ok
+
+    // as the above numbers have some free space around the text
+    // we get 5 lines like this anyway
+    if ( m_windowStyle & wxTE_MULTILINE )
+         hText *= 5 ;
+
+    if ( !HasFlag(wxNO_BORDER) )
+        hText += 6 ;
+

     return wxSize(wText, hText);
 }
 
     return wxSize(wText, hText);
 }
 


@@ -520,217 +717,228 @@ wxSize wxTextCtrl::DoGetBestSize() const
 void wxTextCtrl::Undo()
 {
     if (CanUndo())
 void wxTextCtrl::Undo()
 {
     if (CanUndo())

-    {
-    }
+        GetPeer()->Undo() ;

 }
 
 void wxTextCtrl::Redo()
 {
     if (CanRedo())
 }
 
 void wxTextCtrl::Redo()
 {
     if (CanRedo())

-    {
-    }
+        GetPeer()->Redo() ;

 }
 
 bool wxTextCtrl::CanUndo() const
 {
 }
 
 bool wxTextCtrl::CanUndo() const
 {

-    return FALSE ;
+    if ( !IsEditable() )
+        return false ;
+
+    return GetPeer()->CanUndo() ;

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

-    return FALSE ;
+    if ( !IsEditable() )
+        return false ;
+
+    return GetPeer()->CanRedo() ;
+}
+
+void wxTextCtrl::MarkDirty()
+{
+    m_dirty = true;

 }
 
 }
 

-// Makes 'unmodified'

 void wxTextCtrl::DiscardEdits()
 {
 void wxTextCtrl::DiscardEdits()
 {

-    // TODO
+    m_dirty = false;

 }
 
 int wxTextCtrl::GetNumberOfLines() const
 {
 }
 
 int wxTextCtrl::GetNumberOfLines() const
 {

-    Size actualsize;
-    ::GetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ;
-    
-    int count = 1;
-    for (int i = 0; i < actualsize; i++)
-    {
-        if (wxBuffer[i] == '\r') count++;
-    }
-    
-    return count;
+    return GetPeer()->GetNumberOfLines() ;

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

-    // TODO
-    return 0;
+    return GetPeer()->XYToPosition( x , y ) ;

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

-    return FALSE ;
+    return GetPeer()->PositionToXY( pos , x , y ) ;

 }
 
 void wxTextCtrl::ShowPosition(long pos)
 {
 }
 
 void wxTextCtrl::ShowPosition(long pos)
 {

-    // TODO
+    return GetPeer()->ShowPosition(pos) ;

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

-    Size actualsize;
-    ::GetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ;
-    
-    // Find line first
-    int count = 0;
-    for (int i = 0; i < actualsize; i++)
-    {
-        if (count == lineNo)
-        {
-            // Count chars in line then
-            count = 0;
-            for (int j = i; j < actualsize; j++)
-            {
-                count++;
-                if (wxBuffer[j] == '\r') return count;
-            }
-            
-            return count;
-        }
-        if (wxBuffer[i] == '\r') count++;
-    }
-    
-    return 0;
+    return GetPeer()->GetLineLength(lineNo) ;

 }
 
 wxString wxTextCtrl::GetLineText(long lineNo) const
 {
 }
 
 wxString wxTextCtrl::GetLineText(long lineNo) const
 {

-    Size actualsize;
-    ::GetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ;
-    
-    // Find line first
-    int count = 0;
-    for (int i = 0; i < actualsize; i++)
-    {
-        if (count == lineNo)
-        {
-            // Add chars in line then
-            wxString tmp("");
-            
-            for (int j = i; j < actualsize; j++)
-            {
-                if (wxBuffer[j] == '\r')
-                    return tmp;
-                    
-                tmp += wxBuffer[j];
-            }
-            
-            return tmp;
-        }
-        if (wxBuffer[i] == '\r') count++;
-    }
-    
-    return wxString("");
+    return GetPeer()->GetLineText(lineNo) ;

 }
 
 }
 

-/*
- * Text item
- */
- 

 void wxTextCtrl::Command(wxCommandEvent & event)
 {
 void wxTextCtrl::Command(wxCommandEvent & event)
 {

-    SetValue (event.GetString());
-    ProcessCommand (event);
+    SetValue(event.GetString());
+    ProcessCommand(event);

 }
 
 void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event)
 {
     // By default, load the first file into the text window.
     if (event.GetNumberOfFiles() > 0)
 }
 
 void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event)
 {
     // By default, load the first file into the text window.
     if (event.GetNumberOfFiles() > 0)

-    {
-        LoadFile(event.GetFiles()[0]);
-    }
+        LoadFile( event.GetFiles()[0] );
+}
+
+void wxTextCtrl::OnEraseBackground(wxEraseEvent& event)
+{
+    // all erasing should be done by the real mac control implementation
+    // while this is true for MLTE under classic, the HITextView is somehow
+    // transparent but background erase is not working correctly, so intercept
+    // things while we can...
+    event.Skip() ;

 }
 
 }
 

-void wxTextCtrl::OnChar(wxKeyEvent& key_event)
+void wxTextCtrl::OnChar(wxKeyEvent& event)

 {
 {

-    bool eat_key = FALSE;
+    int key = event.GetKeyCode() ;
+    bool eat_key = false ;
+
+    if ( key == 'a' && event.MetaDown() )
+    {
+        SelectAll() ;
+
+        return ;
+    }
+
+    if ( key == 'c' && event.MetaDown() )
+    {
+        if ( CanCopy() )
+            Copy() ;
+
+        return ;
+    }
+
+    if ( !IsEditable() && key != WXK_LEFT && key != WXK_RIGHT && key != WXK_DOWN && key != WXK_UP && key != WXK_TAB &&
+        !( key == WXK_RETURN && ( (m_windowStyle & wxTE_PROCESS_ENTER) || (m_windowStyle & wxTE_MULTILINE) ) )
+//        && key != WXK_PAGEUP && key != WXK_PAGEDOWN && key != WXK_HOME && key != WXK_END
+        )
+    {
+        // eat it
+        return ;
+    }
+
+    // Check if we have reached the max # of chars (if it is set), but still
+    // allow navigation and deletion
+    if ( !IsMultiLine() && m_maxLength && GetValue().length() >= m_maxLength &&
+        key != WXK_LEFT && key != WXK_RIGHT && key != WXK_TAB &&
+        key != WXK_BACK && !( key == WXK_RETURN && (m_windowStyle & wxTE_PROCESS_ENTER) )
+       )
+    {
+        // eat it, we don't want to add more than allowed # of characters
+
+        // TODO: generate EVT_TEXT_MAXLEN()
+        return;
+    }
+
+    // assume that any key not processed yet is going to modify the control
+    m_dirty = true;
+
+    if ( key == 'v' && event.MetaDown() )
+    {
+        if ( CanPaste() )
+            Paste() ;

 
 

-    switch ( key_event.KeyCode() )
+        return ;
+    }
+
+    if ( key == 'x' && event.MetaDown() )
+    {
+        if ( CanCut() )
+            Cut() ;
+
+        return ;
+    }
+
+    switch ( key )

     {
         case WXK_RETURN:
     {
         case WXK_RETURN:

-            if (m_windowStyle & wxPROCESS_ENTER)
+            if (m_windowStyle & wxTE_PROCESS_ENTER)

             {
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
                 event.SetEventObject( this );
                 event.SetString( GetValue() );
                 if ( GetEventHandler()->ProcessEvent(event) )
                     return;
             {
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
                 event.SetEventObject( this );
                 event.SetString( GetValue() );
                 if ( GetEventHandler()->ProcessEvent(event) )
                     return;

-            } 
+            }
+

             if ( !(m_windowStyle & wxTE_MULTILINE) )
             {
             if ( !(m_windowStyle & wxTE_MULTILINE) )
             {

-                wxWindow *parent = GetParent();
-                while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) {
-                  parent = parent->GetParent() ;
-                }
-                if ( parent && parent->GetDefaultItem() )
+                wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+                if ( tlw && tlw->GetDefaultItem() )

                 {
                 {

-                    wxButton *def = wxDynamicCast(parent->GetDefaultItem(),
-                                                          wxButton);
+                    wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton);

                     if ( def && def->IsEnabled() )
                     {
                         wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
                         event.SetEventObject(def);
                         def->Command(event);
                     if ( def && def->IsEnabled() )
                     {
                         wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
                         event.SetEventObject(def);
                         def->Command(event);

+

                         return ;
                         return ;

-                   }
+                    }

                 }
                 }

-               
-                // this will make wxWindows eat the ENTER key so that
-                // we actually prevent line wrapping in a single line
-                // text control
-                eat_key = TRUE;
-            }

 
 

+                // this will make wxWidgets eat the ENTER key so that
+                // we actually prevent line wrapping in a single line text control
+                eat_key = true;
+            }

             break;
 
         case WXK_TAB:
             break;
 
         case WXK_TAB:

-            // always produce navigation event - even if we process TAB
-            // ourselves the fact that we got here means that the user code
-            // decided to skip processing of this TAB - probably to let it
-            // do its default job.
+            if ( !(m_windowStyle & wxTE_PROCESS_TAB))

             {
             {

-                wxNavigationKeyEvent eventNav;
-                eventNav.SetDirection(!key_event.ShiftDown());
-                eventNav.SetWindowChange(key_event.ControlDown());
-                eventNav.SetEventObject(this);
-
-                if ( GetParent()->GetEventHandler()->ProcessEvent(eventNav) )
-                    return;
+                int flags = 0;
+                if (!event.ShiftDown())
+                    flags |= wxNavigationKeyEvent::IsForward ;
+                if (event.ControlDown())
+                    flags |= wxNavigationKeyEvent::WinChange ;
+                Navigate(flags);

 
 

-                key_event.Skip() ;

                 return;
             }
                 return;
             }

+            else
+            {
+                // This is necessary (don't know why);
+                // otherwise the tab will not be inserted.
+                WriteText(wxT("\t"));
+                eat_key = true;
+            }
+            break;
+
+        default:

             break;
     }
             break;
     }

-    
-    EventRecord *ev = wxTheApp->MacGetCurrentEvent();
-    short keychar = short(ev->message & charCodeMask);
+

     if (!eat_key)
     {
     if (!eat_key)
     {

-        short keycode = short(ev->message & keyCodeMask) >> 8 ;
-        ::HandleControlKey( m_macControl , keycode , keychar , ev->modifiers );
+        // perform keystroke handling
+        event.Skip(true) ;

     }
     }

-    if ( keychar >= 0x20 ||
-         key_event.KeyCode() == WXK_RETURN ||
-         key_event.KeyCode() == WXK_DELETE || 
-         key_event.KeyCode() == WXK_BACK)
+
+    if ( ( key >= 0x20 && key < WXK_START ) ||
+         ( key >= WXK_NUMPAD0 && key <= WXK_DIVIDE ) ||
+         key == WXK_RETURN ||
+         key == WXK_DELETE ||
+         key == WXK_BACK)

     {
     {

-        wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
-        event.SetString( GetValue() ) ;
-        event.SetEventObject( this );
-        GetEventHandler()->ProcessEvent(event);
+        wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
+        event1.SetEventObject( this );
+        wxPostEvent( GetEventHandler(), event1 );

     }
 }
 
     }
 }
 


@@ -738,31 +946,45 @@ void wxTextCtrl::OnChar(wxKeyEvent& key_event)
 // standard handlers for standard edit menu events
 // ----------------------------------------------------------------------------
 
 // standard handlers for standard edit menu events
 // ----------------------------------------------------------------------------
 

-void wxTextCtrl::OnCut(wxCommandEvent& event)
+void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event))

 {
     Cut();
 }
 
 {
     Cut();
 }
 

-void wxTextCtrl::OnCopy(wxCommandEvent& event)
+void wxTextCtrl::OnCopy(wxCommandEvent& WXUNUSED(event))

 {
     Copy();
 }
 
 {
     Copy();
 }
 

-void wxTextCtrl::OnPaste(wxCommandEvent& event)
+void wxTextCtrl::OnPaste(wxCommandEvent& WXUNUSED(event))

 {
     Paste();
 }
 
 {
     Paste();
 }
 

-void wxTextCtrl::OnUndo(wxCommandEvent& event)
+void wxTextCtrl::OnUndo(wxCommandEvent& WXUNUSED(event))

 {
     Undo();
 }
 
 {
     Undo();
 }
 

-void wxTextCtrl::OnRedo(wxCommandEvent& event)
+void wxTextCtrl::OnRedo(wxCommandEvent& WXUNUSED(event))

 {
     Redo();
 }
 
 {
     Redo();
 }
 

+void wxTextCtrl::OnDelete(wxCommandEvent& WXUNUSED(event))
+{
+    long from, to;
+
+    GetSelection( &from, &to );
+    if (from != -1 && to != -1)
+        Remove( from, to );
+}
+
+void wxTextCtrl::OnSelectAll(wxCommandEvent& WXUNUSED(event))
+{
+    SetSelection(-1, -1);
+}
+

 void wxTextCtrl::OnUpdateCut(wxUpdateUIEvent& event)
 {
     event.Enable( CanCut() );
 void wxTextCtrl::OnUpdateCut(wxUpdateUIEvent& event)
 {
     event.Enable( CanCut() );


@@ -788,1790 +1010,2185 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
     event.Enable( CanRedo() );
 }
 
     event.Enable( CanRedo() );
 }
 

-#else
-
-extern wxApp *wxTheApp ;
-// CS:We will replace the TextEdit by using the MultiLanguageTextEngine based on the following code written by apple
-
-/*
-    File: mUPControl.c
-    
-    Description:
-        mUPControl implementation.
+void wxTextCtrl::OnUpdateDelete(wxUpdateUIEvent& event)
+{
+    long from, to;

 
 

-    Copyright:
-        © Copyright 2000 Apple Computer, Inc. All rights reserved.
-    
-    Disclaimer:
-        IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc.
-        ("Apple") in consideration of your agreement to the following terms, and your
-        use, installation, modification or redistribution of this Apple software
-        constitutes acceptance of these terms.  If you do not agree with these terms,
-        please do not use, install, modify or redistribute this Apple software.
-
-        In consideration of your agreement to abide by the following terms, and subject
-        to these terms, Apple grants you a personal, non-exclusive license, under AppleÕs
-        copyrights in this original Apple software (the "Apple Software"), to use,
-        reproduce, modify and redistribute the Apple Software, with or without
-        modifications, in source and/or binary forms; provided that if you redistribute
-        the Apple Software in its entirety and without modifications, you must retain
-        this notice and the following text and disclaimers in all such redistributions of
-        the Apple Software.  Neither the name, trademarks, service marks or logos of
-        Apple Computer, Inc. may be used to endorse or promote products derived from the
-        Apple Software without specific prior written permission from Apple.  Except as
-        expressly stated in this notice, no other rights or licenses, express or implied,
-        are granted by Apple herein, including but not limited to any patent rights that
-        may be infringed by your derivative works or by other works in which the Apple
-        Software may be incorporated.
-
-        The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
-        WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
-        WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-        PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
-        COMBINATION WITH YOUR PRODUCTS.
-
-        IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
-        CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-        GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-        ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
-        OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
-        (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
-        ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    Change History (most recent first):
-        Fri, Jan 28, 2000 -- created
-*/
-
-#include "MacTextEditor.h"
-
-/* part codes */
-
-/* kmUPTextPart is the part code we return to indicate the user has clicked
-    in the text area of our control */
-#define kmUPTextPart 1
-
-/* kmUPScrollPart is the part code we return to indicate the user has clicked
-    in the scroll bar part of the control. */
-#define kmUPScrollPart 2
-
-
-/* routines for using existing user pane controls.
-    These routines are useful for cases where you would like to use an
-    existing user pane control in, say, a dialog window as a scrolling
-    text edit field.*/
-    
-/* mUPOpenControl initializes a user pane control so it will be drawn
-    and will behave as a scrolling text edit field inside of a window.
-    This routine performs all of the initialization steps necessary,
-    except it does not create the user pane control itself.  theControl
-    should refer to a user pane control that you have either created
-    yourself or extracted from a dialog's control heirarchy using
-    the GetDialogItemAsControl routine.  */
-OSStatus mUPOpenControl(ControlHandle theControl);
+    GetSelection( &from, &to );
+    event.Enable( from != -1 && to != -1 && from != to && IsEditable() ) ;
+}

 
 

-/* mUPCloseControl deallocates all of the structures allocated
-    by mUPOpenControl.  */
-OSStatus mUPCloseControl(ControlHandle theControl);
+void wxTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event)
+{
+    event.Enable(GetLastPosition() > 0);
+}

 
 

+// CS: Context Menus only work with MLTE implementations or non-multiline HIViews at the moment

 
 

+void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event)
+{
+    if ( GetPeer()->HasOwnContextMenu() )
+    {
+        event.Skip() ;
+        return ;
+    }

 
 

-/* routines for creating new scrolling text user pane controls.
-    These routines allow you to create new scrolling text
-    user pane controls. */
+    if (m_privateContextMenu == NULL)
+    {
+        m_privateContextMenu = new wxMenu;
+        m_privateContextMenu->Append(wxID_UNDO, _("&Undo"));
+        m_privateContextMenu->Append(wxID_REDO, _("&Redo"));
+        m_privateContextMenu->AppendSeparator();
+        m_privateContextMenu->Append(wxID_CUT, _("Cu&t"));
+        m_privateContextMenu->Append(wxID_COPY, _("&Copy"));
+        m_privateContextMenu->Append(wxID_PASTE, _("&Paste"));
+        m_privateContextMenu->Append(wxID_CLEAR, _("&Delete"));
+        m_privateContextMenu->AppendSeparator();
+        m_privateContextMenu->Append(wxID_SELECTALL, _("Select &All"));
+    }

 
 

-/* mUPCreateControl creates a new user pane control and then it passes it
-    to mUPOpenControl to initialize it as a scrolling text user pane control. */
-OSStatus mUPCreateControl(WindowPtr theWindow, Rect *bounds, ControlHandle *theControl);
+    if (m_privateContextMenu != NULL)
+        PopupMenu(m_privateContextMenu);
+}

 
 

-/* mUPDisposeControl calls mUPCloseControl and then it calls DisposeControl. */
-OSStatus mUPDisposeControl(ControlHandle theControl);
+bool wxTextCtrl::MacSetupCursor( const wxPoint& pt )
+{
+    if ( !GetPeer()->SetupCursor( pt ) )
+        return wxWindow::MacSetupCursor( pt ) ;
+    else
+        return true ;
+}

 
 

+#if !TARGET_API_MAC_OSX

 
 

-/* Utility Routines */
+// user pane implementation

 
 

-    /* mUPSetText replaces the contents of the selection with the unicode
-    text described by the text and count parameters:.
-        text = pointer to unicode text buffer
-        count = number of bytes in the buffer.  */
-OSStatus mUPSetText(ControlHandle theControl, char* text, long count);
+void wxTextCtrl::MacControlUserPaneDrawProc(wxInt16 part)
+{
+    GetPeer()->MacControlUserPaneDrawProc( part ) ;
+}

 
 

-/* mUPGetText returns the current text data being displayed inside of
-    the mUPControl.  When noErr is returned, *theText contain a new
-    handle containing all of the Unicode text copied from the current
-    selection.  It is the caller's responsibiliby to dispose of this handle. */
-OSStatus mUPGetText(ControlHandle theControl, Handle *theText);
+wxInt16 wxTextCtrl::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y)
+{
+    return GetPeer()->MacControlUserPaneHitTestProc( x , y ) ;
+}

 
 

+wxInt16 wxTextCtrl::MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc)
+{
+    return GetPeer()->MacControlUserPaneTrackingProc( x , y , actionProc ) ;
+}

 
 

-/* mUPSetSelection sets the text selection and autoscrolls the text view
-    so either the cursor or the selction is in the view. */
-void mUPSetSelection(ControlHandle theControl, long selStart, long selEnd);
+void wxTextCtrl::MacControlUserPaneIdleProc()
+{
+    GetPeer()->MacControlUserPaneIdleProc( ) ;
+}

 
 

+wxInt16 wxTextCtrl::MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers)
+{
+    return GetPeer()->MacControlUserPaneKeyDownProc( keyCode , charCode , modifiers ) ;
+}

 
 

+void wxTextCtrl::MacControlUserPaneActivateProc(bool activating)
+{
+    GetPeer()->MacControlUserPaneActivateProc( activating ) ;
+}

 
 

-/* IsmUPControl returns true if theControl is not NULL
-    and theControl refers to a mUP Control.  */
-Boolean IsmUPControl(ControlHandle theControl);
+wxInt16 wxTextCtrl::MacControlUserPaneFocusProc(wxInt16 action)
+{
+    return GetPeer()->MacControlUserPaneFocusProc( action ) ;
+}

 
 

+void wxTextCtrl::MacControlUserPaneBackgroundProc(void* info)
+{
+    GetPeer()->MacControlUserPaneBackgroundProc( info ) ;
+}

 
 

+#endif

 
 

-/* Edit commands for mUP Controls. */
-enum {
-    kmUPCut = 1,
-    kmUPCopy = 2,
-    kmUPPaste = 3,
-    kmUPClear = 4
-};
+// ----------------------------------------------------------------------------
+// implementation base class
+// ----------------------------------------------------------------------------

 
 

+wxMacTextControl::wxMacTextControl(wxTextCtrl* peer) :
+    wxMacControl( peer )
+{
+}

 
 

-/* mUPDoEditCommand performs the editing command specified
-    in the editCommand parameter.  The mUPControl's text
-    and scroll bar are redrawn and updated as necessary. */
-void mUPDoEditCommand(ControlHandle theControl, short editCommand);
+wxMacTextControl::~wxMacTextControl()
+{
+}

 
 

+void wxMacTextControl::SetStyle(long WXUNUSED(start),
+                                long WXUNUSED(end),
+                                const wxTextAttr& WXUNUSED(style))
+{
+}

 
 

+void wxMacTextControl::Copy()
+{
+}

 
 

+void wxMacTextControl::Cut()
+{
+}

 
 

-/* mUPGetContents returns the entire contents of the control including the text
-    and the formatting information. */
-OSStatus mUPGetContents(ControlHandle theControl, Handle *theContents);
-/* mUPSetContents replaces the contents of the selection with the data stored in the handle. */
-OSStatus mUPSetContents(ControlHandle theControl, Handle theContents);
+void wxMacTextControl::Paste()
+{
+}

 
 

-enum {
-    kShiftKeyCode = 56
-};
+bool wxMacTextControl::CanPaste() const
+{
+    return false ;
+}

 
 

-/* kUserClickedToFocusPart is a part code we pass to the SetKeyboardFocus
-    routine.  In our focus switching routine this part code is understood
-    as meaning 'the user has clicked in the control and we need to switch
-    the current focus to ourselves before we can continue'. */
-#define kUserClickedToFocusPart 100
-
-
-/* kmUPClickScrollDelayTicks is a time measurement in ticks used to
-    slow the speed of 'auto scrolling' inside of our clickloop routine.
-    This value prevents the text from wizzzzzing by while the mouse
-    is being held down inside of the text area. */
-#define kmUPClickScrollDelayTicks 3
-
-
-/* STPTextPaneVars is a structure used for storing the the mUP Control's
-    internal variables and state information.  A handle to this record is
-    stored in the pane control's reference value field using the
-    SetControlReference routine. */
-
-typedef struct {
-        /* OS records referenced */
-    TXNObject fTXNRec; /* the txn record */
-    TXNFrameID fTXNFrame; /* the txn frame ID */
-    ControlHandle fUserPaneRec;  /* handle to the user pane control */
-    WindowPtr fOwner; /* window containing control */
-    GrafPtr fDrawingEnvironment; /* grafport where control is drawn */
-        /* flags */
-    Boolean fInFocus; /* true while the focus rect is drawn around the control */
-    Boolean fIsActive; /* true while the control is drawn in the active state */
-    Boolean fTEActive; /* reflects the activation state of the text edit record */ 
-    Boolean fInDialogWindow; /* true if displayed in a dialog window */ 
-        /* calculated locations */
-    Rect fRTextArea; /* area where the text is drawn */
-    Rect fRFocusOutline;  /* rectangle used to draw the focus box */
-    Rect fRTextOutline; /* rectangle used to draw the border */
-    RgnHandle fTextBackgroundRgn; /* background region for the text, erased before calling TEUpdate */
-        /* our focus advance override routine */
-    EventHandlerUPP handlerUPP;
-    EventHandlerRef handlerRef;
-} STPTextPaneVars;
-
-
-
-
-/* Univerals Procedure Pointer variables used by the
-    mUP Control.  These variables are set up
-    the first time that mUPOpenControl is called. */
-ControlUserPaneDrawUPP gTPDrawProc = NULL;
-ControlUserPaneHitTestUPP gTPHitProc = NULL;
-ControlUserPaneTrackingUPP gTPTrackProc = NULL;
-ControlUserPaneIdleUPP gTPIdleProc = NULL;
-ControlUserPaneKeyDownUPP gTPKeyProc = NULL;
-ControlUserPaneActivateUPP gTPActivateProc = NULL;
-ControlUserPaneFocusUPP gTPFocusProc = NULL;
+void wxMacTextControl::SetEditable(bool WXUNUSED(editable))
+{
+}

 
 

-    /* events handled by our focus advance override routine */
-#if TARGET_CARBON
-static const EventTypeSpec gMLTEEvents[] = { { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } };
-#define kMLTEEventCount (sizeof( gMLTEEvents ) / sizeof( EventTypeSpec ))
-#endif
+wxTextPos wxMacTextControl::GetLastPosition() const
+{
+    return GetStringValue().length() ;
+}

 
 

+void wxMacTextControl::Replace( long from , long to , const wxString &val )
+{
+    SetSelection( from , to ) ;
+    WriteText( val ) ;
+}

 
 

-/* TPActivatePaneText activates or deactivates the text edit record
-    according to the value of setActive.  The primary purpose of this
-    routine is to ensure each call is only made once. */
-static void TPActivatePaneText(STPTextPaneVars **tpvars, Boolean setActive) {
-    STPTextPaneVars *varsp;
-    varsp = *tpvars;
-    if (varsp->fTEActive != setActive) {
-    
-        varsp->fTEActive = setActive;
-        
-        TXNActivate(varsp->fTXNRec, varsp->fTXNFrame, varsp->fTEActive);
-        
-        if (varsp->fInFocus)
-            TXNFocus( varsp->fTXNRec, varsp->fTEActive);
-    }
+void wxMacTextControl::Remove( long from , long to )
+{
+    SetSelection( from , to ) ;
+    WriteText( wxEmptyString) ;

 }
 
 }
 

+void wxMacTextControl::Clear()
+{
+    SetStringValue( wxEmptyString ) ;
+}

 
 

-/* TPFocusPaneText set the focus state for the text record. */
-static void TPFocusPaneText(STPTextPaneVars **tpvars, Boolean setFocus) {
-    STPTextPaneVars *varsp;
-    varsp = *tpvars;
-    if (varsp->fInFocus != setFocus) {
-        varsp->fInFocus = setFocus;
-        TXNFocus( varsp->fTXNRec, varsp->fInFocus);
-    }
+bool wxMacTextControl::CanUndo() const
+{
+    return false ;

 }
 
 }
 

+void wxMacTextControl::Undo()
+{
+}

 
 

-/* TPPaneDrawProc is called to redraw the control and for update events
-    referring to the control.  This routine erases the text area's background,
-    and redraws the text.  This routine assumes the scroll bar has been
-    redrawn by a call to DrawControls. */
-static pascal void TPPaneDrawProc(ControlRef theControl, ControlPartCode thePart) {
-    STPTextPaneVars **tpvars, *varsp;
-    char state;
-    Rect bounds;
-        /* set up our globals */
-    tpvars = (STPTextPaneVars **) GetControlReference(theControl);
-    if (tpvars != NULL) {
-        state = HGetState((Handle) tpvars);
-        HLock((Handle) tpvars);
-        varsp = *tpvars;
-            
-            /* save the drawing state */
-        SetPort((**tpvars).fDrawingEnvironment);
-            /* verify our boundary */
-        GetControlBounds(theControl, &bounds);
-        if ( ! EqualRect(&bounds, &varsp->fRTextArea) ) {
-            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, bounds.top, bounds.right, bounds.bottom);
-            RectRgn(varsp->fTextBackgroundRgn, &varsp->fRTextOutline);
-            TXNSetFrameBounds(  varsp->fTXNRec, bounds.top, bounds.left, bounds.bottom, bounds.right, varsp->fTXNFrame);
-        }
+bool wxMacTextControl::CanRedo()  const
+{
+    return false ;
+}

 
 

-            /* update the text region */
-        EraseRgn(varsp->fTextBackgroundRgn);
-        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);
-            /* release our globals */
-        HSetState((Handle) tpvars, state);
-    }
-}
-
-
-/* TPPaneHitTestProc is called when the control manager would
-    like to determine what part of the control the mouse resides over.
-    We also call this routine from our tracking proc to determine how
-    to handle mouse clicks. */
-static pascal ControlPartCode TPPaneHitTestProc(ControlHandle theControl, Point where) {
-    STPTextPaneVars **tpvars;
-    ControlPartCode result;
-    char state;
-        /* set up our locals and lock down our globals*/
-    result = 0;
-    tpvars = (STPTextPaneVars **) GetControlReference(theControl);
-    if (tpvars != NULL) {
-        state = HGetState((Handle) tpvars);
-        HLock((Handle) tpvars);
-            /* find the region where we clicked */
-        if (PtInRect(where, &(**tpvars).fRTextArea)) {
-            result = kmUPTextPart;
-        } else result = 0;
-            /* release oure globals */
-        HSetState((Handle) tpvars, state);
-    }
-    return result;
+void wxMacTextControl::Redo()
+{

 }
 
 }
 

+long wxMacTextControl::XYToPosition(long WXUNUSED(x), long WXUNUSED(y)) const
+{
+    return 0 ;
+}

 
 

+bool wxMacTextControl::PositionToXY(long WXUNUSED(pos),
+                                    long *WXUNUSED(x),
+                                    long *WXUNUSED(y)) const
+{
+    return false ;
+}

 
 

+void wxMacTextControl::ShowPosition( long WXUNUSED(pos) )
+{
+}

 
 

+int wxMacTextControl::GetNumberOfLines() const
+{
+    ItemCount lines = 0 ;
+    wxString content = GetStringValue() ;
+    lines = 1;

 
 

-/* TPPaneTrackingProc is called when the mouse is being held down
-    over our control.  This routine handles clicks in the text area
-    and in the scroll bar. */
-static pascal ControlPartCode TPPaneTrackingProc(ControlHandle theControl, Point startPt, ControlActionUPP actionProc) {
-    STPTextPaneVars **tpvars, *varsp;
-    char state;
-    ControlPartCode partCodeResult;
-        /* make sure we have some variables... */
-    partCodeResult = 0;
-    tpvars = (STPTextPaneVars **) GetControlReference(theControl);
-    if (tpvars != NULL) {
-            /* lock 'em down */
-        state = HGetState((Handle) tpvars);
-        HLock((Handle) tpvars);
-        varsp = *tpvars;
-            /* we don't do any of these functions unless we're in focus */
-        if ( ! varsp->fInFocus) {
-            WindowPtr owner;
-            owner = GetControlOwner(theControl);
-            ClearKeyboardFocus(owner);
-            SetKeyboardFocus(owner, theControl, kUserClickedToFocusPart);
-        }
-            /* find the location for the click */
-        switch (TPPaneHitTestProc(theControl, startPt)) {
-                
-                /* handle clicks in the text part */
-            case kmUPTextPart:
-                {   SetPort((**tpvars).fDrawingEnvironment);
-                    TXNClick( varsp->fTXNRec, GetCurrentEventRecord());
-                }
-                break;
-            
-        }
-        
-        HSetState((Handle) tpvars, state);
+    for (size_t i = 0; i < content.length() ; i++)
+    {
+        if (content[i] == '\r')
+            lines++;

     }
     }

-    return partCodeResult;
+
+    return lines ;

 }
 
 }
 

+wxString wxMacTextControl::GetLineText(long lineNo) const
+{
+    // TODO: change this if possible to reflect real lines
+    wxString content = GetStringValue() ;

 
 

-/* TPPaneIdleProc is our user pane idle routine.  When our text field
-    is active and in focus, we use this routine to set the cursor. */
-static pascal void TPPaneIdleProc(ControlHandle theControl) {
-    STPTextPaneVars **tpvars, *varsp;
-        /* set up locals */
-    tpvars = (STPTextPaneVars **) GetControlReference(theControl);
-    if (tpvars != NULL) {
-            /* if we're not active, then we have nothing to say about the cursor */
-        if ((**tpvars).fIsActive) {
-            char state;
-            Rect bounds;
-            Point mousep;
-                /* lock down the globals */
-            state = HGetState((Handle) tpvars);
-            HLock((Handle) tpvars);
-            varsp = *tpvars;
-                /* get the current mouse coordinates (in our window) */
-#if TARGET_CARBON
-            SetPort(GetWindowPort(GetControlOwner(theControl)));
-#else
-            SetPort((GrafPtr) GetWindowPort(GetControlOwner(theControl)));
-#endif
-            GetMouse(&mousep);
-                /* there's a 'focus thing' and an 'unfocused thing' */
-            if (varsp->fInFocus) {
-                    /* flash the cursor */
-                SetPort((**tpvars).fDrawingEnvironment);
-                TXNIdle(varsp->fTXNRec);
-                /* set the cursor */
-                if (PtInRect(mousep, &varsp->fRTextArea)) {
-                    RgnHandle theRgn;
-                    RectRgn((theRgn = NewRgn()), &varsp->fRTextArea);
-                    TXNAdjustCursor(varsp->fTXNRec, theRgn);
-                    DisposeRgn(theRgn);
-                 } else SetThemeCursor(kThemeArrowCursor);
-            } else {
-                /* if it's in our bounds, set the cursor */
-                GetControlBounds(theControl, &bounds);
-                if (PtInRect(mousep, &bounds))
-                    SetThemeCursor(kThemeArrowCursor);
-            }
-            
-            HSetState((Handle) tpvars, state);
-        }
-    }
-}
+    // Find line first
+    int count = 0;
+    for (size_t i = 0; i < content.length() ; i++)
+    {
+        if (count == lineNo)
+        {
+            // Add chars in line then
+            wxString tmp;
+
+            for (size_t j = i; j < content.length(); j++)
+            {
+                if (content[j] == '\n')
+                    return tmp;

 
 

+                tmp += content[j];
+            }

 
 

-/* TPPaneKeyDownProc is called whenever a keydown event is directed
-    at our control.  Here, we direct the keydown event to the text
-    edit record and redraw the scroll bar and text field as appropriate. */
-static pascal ControlPartCode TPPaneKeyDownProc(ControlHandle theControl,
-                            SInt16 keyCode, SInt16 charCode, SInt16 modifiers) {
-    STPTextPaneVars **tpvars;
-    tpvars = (STPTextPaneVars **) GetControlReference(theControl);
-    if (tpvars != NULL) {
-        if ((**tpvars).fInFocus) {
-                /* turn autoscrolling on and send the key event to text edit */
-            SetPort((**tpvars).fDrawingEnvironment);
-            TXNKeyDown( (**tpvars).fTXNRec, GetCurrentEventRecord());
+            return tmp;

         }
         }

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

     }
     }

-    return kControlEntireControl;
+
+    return wxEmptyString ;

 }
 
 }
 

+int wxMacTextControl::GetLineLength(long lineNo) const
+{
+    // TODO: change this if possible to reflect real lines
+    wxString content = GetStringValue() ;

 
 

-/* TPPaneActivateProc is called when the window containing
-    the user pane control receives activate events. Here, we redraw
-    the control and it's text as necessary for the activation state. */
-static pascal void TPPaneActivateProc(ControlHandle theControl, Boolean activating) {
-    Rect bounds;
-    STPTextPaneVars **tpvars, *varsp;
-    char state;
-        /* set up locals */
-    tpvars = (STPTextPaneVars **) GetControlReference(theControl);
-    if (tpvars != NULL) {
-        state = HGetState((Handle) tpvars);
-        HLock((Handle) tpvars);
-        varsp = *tpvars;
-            /* de/activate the text edit record */
-        SetPort((**tpvars).fDrawingEnvironment);
-            GetControlBounds(theControl, &bounds);
-            varsp->fIsActive = activating;
-            TPActivatePaneText(tpvars, varsp->fIsActive && varsp->fInFocus);
-            /* redraw the frame */
-        DrawThemeEditTextFrame(&varsp->fRTextOutline, varsp->fIsActive ? kThemeStateActive: kThemeStateInactive);
-        if (varsp->fInFocus) DrawThemeFocusRect(&varsp->fRFocusOutline, varsp->fIsActive);
-        HSetState((Handle) tpvars, state);
-    }
-}
-
-
-/* TPPaneFocusProc is called when every the focus changes to or
-    from our control.  Herein, switch the focus appropriately
-    according to the parameters and redraw the control as
-    necessary.  */
-static pascal ControlPartCode TPPaneFocusProc(ControlHandle theControl, ControlFocusPart action) {
-    ControlPartCode focusResult;
-    STPTextPaneVars **tpvars, *varsp;
-    char state;
-        /* set up locals */
-    focusResult = kControlFocusNoPart;
-    tpvars = (STPTextPaneVars **) GetControlReference(theControl);
-    if (tpvars != NULL) {
-        state = HGetState((Handle) tpvars);
-        HLock((Handle) tpvars);
-        varsp = *tpvars;
-            /* if kControlFocusPrevPart and kControlFocusNextPart are received when the user is
-            tabbing forwards (or shift tabbing backwards) through the items in the dialog,
-            and kControlFocusNextPart will be received.  When the user clicks in our field
-            and it is not the current focus, then the constant kUserClickedToFocusPart will
-            be received.  The constant kControlFocusNoPart will be received when our control
-            is the current focus and the user clicks in another control.  In your focus routine,
-            you should respond to these codes as follows:
-
-            kControlFocusNoPart - turn off focus and return kControlFocusNoPart.  redraw
-                the control and the focus rectangle as necessary.
-
-            kControlFocusPrevPart or kControlFocusNextPart - toggle focus on or off
-                depending on its current state.  redraw the control and the focus rectangle
-                as appropriate for the new focus state.  If the focus state is 'off', return the constant
-                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);
-            /* calculate the next highlight state */
-        switch (action) {
-            default:
-            case kControlFocusNoPart:
-                TPFocusPaneText(tpvars, false);
-                focusResult = kControlFocusNoPart;
-                break;
-            case kUserClickedToFocusPart:
-                TPFocusPaneText(tpvars, true);
-                focusResult = 1;
-                break;
-            case kControlFocusPrevPart:
-            case kControlFocusNextPart:
-                TPFocusPaneText(tpvars, ( ! varsp->fInFocus));
-                focusResult = varsp->fInFocus ? 1 : kControlFocusNoPart;
-                break;
+    // Find line first
+    int count = 0;
+    for (size_t i = 0; i < content.length() ; i++)
+    {
+        if (count == lineNo)
+        {
+            // Count chars in line then
+            count = 0;
+            for (size_t j = i; j < content.length(); j++)
+            {
+                count++;
+                if (content[j] == '\n')
+                    return count;
+            }
+
+            return count;

         }
         }

-            TPActivatePaneText(tpvars, varsp->fIsActive && varsp->fInFocus);
-            /* redraw the text fram and focus rectangle to indicate the
-            new focus state */
-        DrawThemeEditTextFrame(&varsp->fRTextOutline, varsp->fIsActive ? kThemeStateActive: kThemeStateInactive);
-        DrawThemeFocusRect(&varsp->fRFocusOutline, varsp->fIsActive && varsp->fInFocus);
-            /* done */
-        HSetState((Handle) tpvars, state);
+
+        if (content[i] == '\n')
+            count++;

     }
     }

-    return focusResult;
-}

 
 

+    return 0 ;
+}

 
 

+// ----------------------------------------------------------------------------
+// standard unicode control implementation
+// ----------------------------------------------------------------------------

 
 

+#if TARGET_API_MAC_OSX

 
 

+// the current unicode textcontrol implementation has a bug : only if the control
+// is currently having the focus, the selection can be retrieved by the corresponding
+// data tag. So we have a mirroring using a member variable
+// TODO : build event table using virtual member functions for wxMacControl

 
 

+static const EventTypeSpec unicodeTextControlEventList[] =
+{
+    { kEventClassControl , kEventControlSetFocusPart } ,
+} ;

 
 

+static pascal OSStatus wxMacUnicodeTextControlControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    OSStatus result = eventNotHandledErr ;
+    wxMacUnicodeTextControl* focus = (wxMacUnicodeTextControl*) data ;
+    wxMacCarbonEvent cEvent( event ) ;

 
 

+    switch ( GetEventKind( event ) )
+    {
+        case kEventControlSetFocusPart :
+        {
+            ControlPartCode controlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode );
+            if ( controlPart == kControlFocusNoPart )
+            {
+                // about to loose focus -> store selection to field
+                focus->GetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &focus->m_selection );
+            }
+            result = CallNextEventHandler(handler,event) ;
+            if ( controlPart != kControlFocusNoPart )
+            {
+                // about to gain focus -> set selection from field
+                focus->SetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &focus->m_selection );
+            }
+            break;
+        }
+        default:
+            break ;
+    }

 
 

+    return result ;
+}

 
 

+static pascal OSStatus wxMacUnicodeTextControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    OSStatus result = eventNotHandledErr ;

 
 

+    switch ( GetEventClass( event ) )
+    {
+        case kEventClassControl :
+            result = wxMacUnicodeTextControlControlEventHandler( handler , event , data ) ;
+            break ;

 
 

-//This our carbon event handler for unicode key downs
-#if TARGET_CARBON
-static pascal OSStatus FocusAdvanceOverride(EventHandlerCallRef myHandler, EventRef event, void* userData) {
-    WindowRef window;
-    STPTextPaneVars **tpvars;
-    OSStatus err;
-    unsigned short mUnicodeText;
-    ByteCount charCounts=0;
-        /* get our window pointer */
-    tpvars = (STPTextPaneVars **) userData;
-    window = (**tpvars).fOwner;
-        //find out how many bytes are needed
-    err = GetEventParameter(event, kEventParamTextInputSendText,
-                typeUnicodeText, NULL, 0, &charCounts, NULL);
-    if (err != noErr) goto bail;
-        /* we're only looking at single characters */
-    if (charCounts != 2) { err = eventNotHandledErr; goto bail; }
-        /* get the character */
-    err = GetEventParameter(event, kEventParamTextInputSendText, 
-                typeUnicodeText, NULL, sizeof(mUnicodeText),
-                &charCounts, (char*) &mUnicodeText);
-    if (err != noErr) goto bail;
-        /* if it's not the tab key, forget it... */
-    if ((mUnicodeText != '\t')) { err = eventNotHandledErr; goto bail; }
-        /* advance the keyboard focus */
-    AdvanceKeyboardFocus(window);
-        /* noErr lets the CEM know we handled the event */
-    return noErr;
-bail:
-    return eventNotHandledErr;
+        default :
+            break ;
+    }
+    return result ;

 }
 }

-#endif

 
 

+DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacUnicodeTextControlEventHandler )

 
 

-/* mUPOpenControl initializes a user pane control so it will be drawn
-       and will behave as a scrolling text edit field inside of a window.
-       This routine performs all of the initialization steps necessary,
-       except it does not create the user pane control itself.  theControl
-       should refer to a user pane control that you have either created
-       yourself or extracted from a dialog's control heirarchy using
-       the GetDialogItemAsControl routine.  */
-OSStatus mUPOpenControl(ControlHandle theControl, bool multiline) {
-       Rect bounds;
-       WindowPtr theWindow;
-       STPTextPaneVars **tpvars, *varsp;
-       OSStatus err;
-       RGBColor rgbWhite = {0xFFFF, 0xFFFF, 0xFFFF};
-       TXNBackground tback;
-       
-               /* set up our globals */
-       if (gTPDrawProc == NULL) gTPDrawProc = NewControlUserPaneDrawUPP(TPPaneDrawProc);
-       if (gTPHitProc == NULL) gTPHitProc = NewControlUserPaneHitTestUPP(TPPaneHitTestProc);
-       if (gTPTrackProc == NULL) gTPTrackProc = NewControlUserPaneTrackingUPP(TPPaneTrackingProc);
-       if (gTPIdleProc == NULL) gTPIdleProc = NewControlUserPaneIdleUPP(TPPaneIdleProc);
-       if (gTPKeyProc == NULL) gTPKeyProc = NewControlUserPaneKeyDownUPP(TPPaneKeyDownProc);
-       if (gTPActivateProc == NULL) gTPActivateProc = NewControlUserPaneActivateUPP(TPPaneActivateProc);
-       if (gTPFocusProc == NULL) gTPFocusProc = NewControlUserPaneFocusUPP(TPPaneFocusProc);
-               
-               /* allocate our private storage */
-       tpvars = (STPTextPaneVars **) NewHandleClear(sizeof(STPTextPaneVars));
-       SetControlReference(theControl, (long) tpvars);
-       HLock((Handle) tpvars);
-       varsp = *tpvars;
-               /* set the initial settings for our private data */
-       varsp->fInFocus = false;
-       varsp->fIsActive = true;
-       varsp->fTEActive = false;
-       varsp->fUserPaneRec = theControl;
-       theWindow = varsp->fOwner = GetControlOwner(theControl);
-#if TARGET_CARBON
-    varsp->fDrawingEnvironment = GetWindowPort(varsp->fOwner);
-#else
-    varsp->fDrawingEnvironment = (GrafPtr) GetWindowPort(varsp->fOwner);
-#endif
-    varsp->fInDialogWindow = ( GetWindowKind(varsp->fOwner) == kDialogWindowKind );
-        /* set up the user pane procedures */
-    SetControlData(theControl, kControlEntireControl, kControlUserPaneDrawProcTag, sizeof(gTPDrawProc), &gTPDrawProc);
-    SetControlData(theControl, kControlEntireControl, kControlUserPaneHitTestProcTag, sizeof(gTPHitProc), &gTPHitProc);
-    SetControlData(theControl, kControlEntireControl, kControlUserPaneTrackingProcTag, sizeof(gTPTrackProc), &gTPTrackProc);
-    SetControlData(theControl, kControlEntireControl, kControlUserPaneIdleProcTag, sizeof(gTPIdleProc), &gTPIdleProc);
-    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 */
-    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, 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. */
-    RectRgn((varsp->fTextBackgroundRgn = NewRgn()), &varsp->fRTextOutline);
-
-        /* set up the drawing environment */
-    SetPort(varsp->fDrawingEnvironment);
-
-        /* create the new edit field */
-    TXNNewObject(NULL, varsp->fOwner, &varsp->fRTextArea,
-        kTXNWantVScrollBarMask | kTXNAlwaysWrapAtViewEdgeMask,
-        kTXNTextEditStyleFrameType,
-        kTXNTextensionFile,
-        kTXNSystemDefaultEncoding, 
-        &varsp->fTXNRec, &varsp->fTXNFrame, (TXNObjectRefcon) tpvars);
-        
-        /* set the field's background */
-    tback.bgType = kTXNBackgroundTypeRGB;
-    tback.bg.color = rgbWhite;
-    TXNSetBackground( varsp->fTXNRec, &tback);
-    
-        /* install our focus advance override routine */
-#if TARGET_CARBON
-    varsp->handlerUPP = NewEventHandlerUPP(FocusAdvanceOverride);
-    err = InstallWindowEventHandler( varsp->fOwner, varsp->handlerUPP,
-        kMLTEEventCount, gMLTEEvents, tpvars, &varsp->handlerRef );
-#endif
-        /* unlock our storage */
-    HUnlock((Handle) tpvars);
-        /* perform final activations and setup for our text field.  Here,
-        we assume that the window is going to be the 'active' window. */
-    TPActivatePaneText(tpvars, varsp->fIsActive && varsp->fInFocus);
-        /* all done */
-    return noErr;
+wxMacUnicodeTextControl::wxMacUnicodeTextControl( wxTextCtrl *wxPeer ) : wxMacTextControl( wxPeer )
+{

 }
 
 }
 

-
-
-/* mUPCloseControl deallocates all of the structures allocated
-    by mUPOpenControl.  */
-OSStatus mUPCloseControl(ControlHandle theControl) {
-    STPTextPaneVars **tpvars;
-        /* set up locals */
-    tpvars = (STPTextPaneVars **) GetControlReference(theControl);
-        /* release our sub records */
-    TXNDeleteObject((**tpvars).fTXNRec);
-        /* remove our focus advance override */
-    RemoveEventHandler((**tpvars).handlerRef);
-    DisposeEventHandlerUPP((**tpvars).handlerUPP);
-        /* delete our private storage */
-    DisposeHandle((Handle) tpvars);
-        /* zero the control reference */
-    SetControlReference(theControl, 0);
-    return noErr;
+wxMacUnicodeTextControl::wxMacUnicodeTextControl( wxTextCtrl *wxPeer,
+    const wxString& str,
+    const wxPoint& pos,
+    const wxSize& size, long style )
+    : wxMacTextControl( wxPeer )
+{
+    Create( wxPeer, str, pos, size, style );

 }
 
 }
 

+bool wxMacUnicodeTextControl::Create( wxTextCtrl *wxPeer,
+    const wxString& str,
+    const wxPoint& pos,
+    const wxSize& size, long style )
+{
+    m_font = wxPeer->GetFont() ;
+    m_windowStyle = style ;
+    m_selection.selStart = m_selection.selEnd = 0;
+    Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ;
+    wxString st = str ;
+    wxMacConvertNewlines10To13( &st ) ;
+    wxMacCFStringHolder cf(st , m_font.GetEncoding()) ;
+    CFStringRef cfr = cf ;

 
 

+    m_valueTag = kControlEditTextCFStringTag ;
+    CreateControl( wxPeer, &bounds, cfr );

 
 

+    if ( !(m_windowStyle & wxTE_MULTILINE) )
+        SetData<Boolean>( kControlEditTextPart , kControlEditTextSingleLineTag , true ) ;

 
 

-    /* mUPSetText replaces the contents of the selection with the unicode
-    text described by the text and count parameters:.
-        text = pointer to unicode text buffer
-        count = number of bytes in the buffer.  */
-OSStatus mUPSetText(ControlHandle theControl, char* text, long count) {
-    STPTextPaneVars **tpvars;
-        /* set up locals */
-    tpvars = (STPTextPaneVars **) GetControlReference(theControl);
-        /* set the text in the record */
-    return TXNSetData( (**tpvars).fTXNRec, kTXNUnicodeTextData, text, count,
-        kTXNUseCurrentSelection, kTXNUseCurrentSelection);
+    InstallControlEventHandler( m_controlRef , GetwxMacUnicodeTextControlEventHandlerUPP(),
+                                GetEventTypeCount(unicodeTextControlEventList), unicodeTextControlEventList, this,
+                                NULL);

 
 

-    return noErr;
+    return true;

 }
 
 }
 

-
-/* mUPSetSelection sets the text selection and autoscrolls the text view
-    so either the cursor or the selction is in the view. */
-void mUPSetSelection(ControlHandle theControl, long selStart, long selEnd) {
-    STPTextPaneVars **tpvars;
-        /* set up our locals */
-    tpvars = (STPTextPaneVars **) GetControlReference(theControl);
-        /* and our drawing environment as the operation
-        may force a redraw in the text area. */
-    SetPort((**tpvars).fDrawingEnvironment);
-        /* change the selection */
-    TXNSetSelection( (**tpvars).fTXNRec, selStart, selEnd);
+wxMacUnicodeTextControl::~wxMacUnicodeTextControl()
+{

 }
 
 }
 

+void wxMacUnicodeTextControl::VisibilityChanged(bool shown)
+{
+    if ( !(m_windowStyle & wxTE_MULTILINE) && shown )
+    {
+        // work around a refresh issue insofar as not always the entire content is shown,
+        // even if this would be possible
+        ControlEditTextSelectionRec sel ;
+        CFStringRef value = NULL ;

 
 

+        verify_noerr( GetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &sel ) );
+        verify_noerr( GetData<CFStringRef>( 0, m_valueTag, &value ) );
+        verify_noerr( SetData<CFStringRef>( 0, m_valueTag, &value ) );
+        verify_noerr( SetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &sel ) );

 
 

+        CFRelease( value ) ;
+    }
+}

 
 

-
-/* mUPGetText returns the current text data being displayed inside of
-    the mUPControl.  When noErr is returned, *theText contain a new
-    handle containing all of the Unicode text copied from the current
-    selection.  It is the caller's responsibiliby to dispose of this handle. */
-OSStatus mUPGetText(ControlHandle theControl, Handle *theText) {
-    STPTextPaneVars **tpvars;
-    OSStatus err;
-        /* set up locals */
-    tpvars = (STPTextPaneVars **) GetControlReference(theControl);
-        /* extract the text from the record */
-    err = TXNGetData( (**tpvars).fTXNRec, kTXNUseCurrentSelection, kTXNUseCurrentSelection, theText);
-        /* all done */
-    return err;
+wxString wxMacUnicodeTextControl::GetStringValue() const
+{
+    wxString result ;
+    CFStringRef value = GetData<CFStringRef>(0, m_valueTag) ;
+    if ( value )
+    {
+        wxMacCFStringHolder cf(value) ;
+        result = cf.AsString() ;
+    }
+
+#if '\n' == 10
+    wxMacConvertNewlines13To10( &result ) ;
+#else
+    wxMacConvertNewlines10To13( &result ) ;
+#endif
+
+    return result ;

 }
 
 }
 

+void wxMacUnicodeTextControl::SetStringValue( const wxString &str )
+{
+    wxString st = str ;
+    wxMacConvertNewlines10To13( &st ) ;
+    wxMacCFStringHolder cf( st , m_font.GetEncoding() ) ;
+    verify_noerr( SetData<CFStringRef>( 0, m_valueTag , cf ) ) ;
+}

 
 

+void wxMacUnicodeTextControl::CreateControl( wxTextCtrl* peer, const Rect* bounds, CFStringRef cfr )
+{
+    Boolean isPassword = ( m_windowStyle & wxTE_PASSWORD ) != 0 ;
+    if ( isPassword )
+    {
+        m_valueTag = kControlEditTextPasswordCFStringTag ;
+    }
+    OSStatus err = CreateEditUnicodeTextControl(
+        MAC_WXHWND(peer->MacGetTopLevelWindowRef()), bounds , cfr ,
+        isPassword , NULL , &m_controlRef ) ;
+    verify_noerr( err );
+}

 
 

-/* mUPCreateControl creates a new user pane control and then it passes it
-    to mUPOpenControl to initialize it as a scrolling text user pane control. */
-OSStatus mUPCreateControl(WindowPtr theWindow, Rect *bounds, ControlHandle *theControl) {
-    short featurSet;
-        /* the following feature set can be specified in CNTL resources by using
-        the value 1214.  When creating a user pane control, we pass this value
-        in the 'value' parameter. */
-    featurSet = kControlSupportsEmbedding | kControlSupportsFocus | kControlWantsIdle
-            | kControlWantsActivate | kControlHandlesTracking | kControlHasSpecialBackground
-            | kControlGetsFocusOnClick | kControlSupportsLiveFeedback;
-        /* create the control */
-    *theControl = NewControl(theWindow, bounds, "\p", true, featurSet, 0, featurSet, kControlUserPaneProc, 0);
-        /* set up the mUP specific features and data */
-    mUPOpenControl(*theControl);
-        /* all done.... */
-    return noErr;
+void wxMacUnicodeTextControl::Copy()
+{
+    SendHICommand( kHICommandCopy ) ;

 }
 
 }
 

+void wxMacUnicodeTextControl::Cut()
+{
+    SendHICommand( kHICommandCut ) ;
+}

 
 

-/* mUPDisposeControl calls mUPCloseControl and then it calls DisposeControl. */
-OSStatus mUPDisposeControl(ControlHandle theControl) {
-        /* deallocate the mUP specific data */
-    mUPCloseControl(theControl);
-        /* deallocate the user pane control itself */
-    DisposeControl(theControl);
-    return noErr;
+void wxMacUnicodeTextControl::Paste()
+{
+    SendHICommand( kHICommandPaste ) ;

 }
 
 }
 

+bool wxMacUnicodeTextControl::CanPaste() const
+{
+    return true ;
+}

 
 

+void wxMacUnicodeTextControl::SetEditable(bool WXUNUSED(editable))
+{
+#if 0 // leads to problem because text cannot be selected anymore
+    SetData<Boolean>( kControlEditTextPart , kControlEditTextLockedTag , (Boolean) !editable ) ;
+#endif
+}

 
 

+void wxMacUnicodeTextControl::GetSelection( long* from, long* to ) const
+{
+    ControlEditTextSelectionRec sel ;
+    if (HasFocus())
+        verify_noerr( GetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &sel ) ) ;
+    else
+        sel = m_selection ;

 
 

-/* IsmUPControl returns true if theControl is not NULL
-    and theControl refers to a mUP Control.  */
-Boolean IsmUPControl(ControlHandle theControl) {
-    Size theSize;
-    ControlUserPaneFocusUPP localFocusProc;
-        /* a NULL control is not a mUP control */
-    if (theControl == NULL) return false;
-        /* check if the control is using our focus procedure */
-    theSize = sizeof(localFocusProc);
-    if (GetControlData(theControl, kControlEntireControl, kControlUserPaneFocusProcTag,
-        sizeof(localFocusProc), &localFocusProc, &theSize) != noErr) return false;
-    if (localFocusProc != gTPFocusProc) return false;
-        /* all tests passed, it's a mUP control */
-    return true;
+    if ( from )
+        *from = sel.selStart ;
+    if ( to )
+        *to = sel.selEnd ;

 }
 
 }
 

+void wxMacUnicodeTextControl::SetSelection( long from , long to )
+{
+    ControlEditTextSelectionRec sel ;
+    wxString result ;
+    int textLength = 0 ;
+    CFStringRef value = GetData<CFStringRef>(0, m_valueTag) ;
+    if ( value )
+    {
+        wxMacCFStringHolder cf(value) ;
+        textLength = cf.AsString().length() ;
+    }

 
 

-/* mUPDoEditCommand performs the editing command specified
-    in the editCommand parameter.  The mUPControl's text
-    and scroll bar are redrawn and updated as necessary. */
-void mUPDoEditCommand(ControlHandle theControl, short editCommand) {
-    STPTextPaneVars **tpvars;
-        /* set up our locals */
-    tpvars = (STPTextPaneVars **) GetControlReference(theControl);
-        /* and our drawing environment as the operation
-        may force a redraw in the text area. */
-    SetPort((**tpvars).fDrawingEnvironment);
-        /* perform the editing command */
-    switch (editCommand) {
-        case kmUPCut:
-            ClearCurrentScrap();
-            TXNCut((**tpvars).fTXNRec); 
-            TXNConvertToPublicScrap();
-            break;
-        case kmUPCopy:
-            ClearCurrentScrap();
-            TXNCopy((**tpvars).fTXNRec);
-            TXNConvertToPublicScrap();
-            break;
-        case kmUPPaste:
-            TXNConvertFromPublicScrap();
-            TXNPaste((**tpvars).fTXNRec);
-            break;
-        case kmUPClear:
-            TXNClear((**tpvars).fTXNRec);
-            break;
+    if ((from == -1) && (to == -1))
+    {
+        from = 0 ;
+        to = textLength ;
+    }
+    else
+    {
+        from = wxMin(textLength,wxMax(from,0)) ;
+        to = wxMax(0,wxMin(textLength,to)) ;

     }
     }

+
+    sel.selStart = from ;
+    sel.selEnd = to ;
+    if ( HasFocus() )
+        SetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &sel ) ;
+    else
+        m_selection = sel;

 }
 
 }
 

+void wxMacUnicodeTextControl::WriteText( const wxString& str )
+{
+    wxString st = str ;
+    wxMacConvertNewlines10To13( &st ) ;

 
 

+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+    if ( HasFocus() )
+    {
+        wxMacCFStringHolder cf(st , m_font.GetEncoding() ) ;
+        CFStringRef value = cf ;
+        SetData<CFStringRef>( 0, kControlEditTextInsertCFStringRefTag, &value );
+    }
+    else
+#endif
+    {
+        wxString val = GetStringValue() ;
+        long start , end ;
+        GetSelection( &start , &end ) ;
+        val.Remove( start , end - start ) ;
+        val.insert( start , str ) ;
+        SetStringValue( val ) ;
+        SetSelection( start + str.length() , start + str.length() ) ;
+    }
+}

 
 

+#endif

 
 

-/* mUPGetContents returns the entire contents of the control including the text
-    and the formatting information. */
-OSStatus mUPGetContents(ControlHandle theControl, Handle *theContents) {
-    STPTextPaneVars **tpvars;
-    OSStatus err;
-    short vRefNum;
-    long dirID;
-    FSSpec tspec;
-    short trefnum;
-    Boolean texists;
-    long bytecount;
-    Handle localdata;
-        /* set up locals */
-    trefnum = 0;
-    texists = false;
-    localdata = NULL;
-    tpvars = (STPTextPaneVars **) GetControlReference(theControl);
-    if (theContents == NULL) return paramErr;
-        /* create a temporary file */
-    err = FindFolder(kOnSystemDisk, kTemporaryFolderType, true, &vRefNum, &dirID);
-    if (err != noErr) goto bail;
-    FSMakeFSSpec(vRefNum, dirID, "\pmUPGetContents", &tspec);
-    err = FSpCreate(&tspec, 'trsh', 'trsh', smSystemScript);
-    if (err != noErr) goto bail;
-    texists = true;
-        /* open the file */
-    err = FSpOpenDF(&tspec, fsRdWrPerm, &trefnum);
-    if (err != noErr) goto bail;
-        /* save the data */
-    err = TXNSave( (**tpvars).fTXNRec, kTXNTextensionFile, 0, kTXNSystemDefaultEncoding, &tspec, trefnum, 0);
-    if (err != noErr) goto bail;
-        /* get the file length and set the position */
-    err = GetEOF(trefnum, &bytecount);
-    if (err != noErr) goto bail;
-    err = SetFPos(trefnum, fsFromStart, 0);
-    if (err != noErr) goto bail;
-        /* copy the data fork to a handle */
-    localdata = NewHandle(bytecount);
-    if (localdata == NULL) { err = memFullErr; goto bail; }
-    HLock(localdata);
-    err = FSRead(trefnum, &bytecount, *localdata);
-    HUnlock(localdata);
-    if (err != noErr) goto bail;
-        /* store result */
-    *theContents = localdata;
-        /* clean up */
-    FSClose(trefnum);
-    FSpDelete(&tspec);
-        /* all done */
-    return noErr;
-bail:
-    if (trefnum != 0) FSClose(trefnum);
-    if (texists) FSpDelete(&tspec);
-    if (localdata != NULL) DisposeHandle(localdata);
-    return err;
-}
+// ----------------------------------------------------------------------------
+// MLTE control implementation (common part)
+// ----------------------------------------------------------------------------

 
 

+// if MTLE is read only, no changes at all are allowed, not even from
+// procedural API, in order to allow changes via API all the same we must undo
+// the readonly status while we are executing, this class helps to do so

 
 

+class wxMacEditHelper
+{
+public :
+    wxMacEditHelper( TXNObject txn )
+    {
+        TXNControlTag tag[] = { kTXNIOPrivilegesTag } ;
+        m_txn = txn ;
+        TXNGetTXNObjectControls( m_txn , 1 , tag , m_data ) ;
+        if ( m_data[0].uValue == kTXNReadOnly )
+        {
+            TXNControlData data[] = { { kTXNReadWrite } } ;
+            TXNSetTXNObjectControls( m_txn , false , 1 , tag , data ) ;
+        }
+    }

 
 

+    ~wxMacEditHelper()
+    {
+        TXNControlTag tag[] = { kTXNIOPrivilegesTag } ;
+        if ( m_data[0].uValue == kTXNReadOnly )
+            TXNSetTXNObjectControls( m_txn , false , 1 , tag , m_data ) ;
+    }

 
 

-/* mUPSetContents replaces the contents of the selection with the data stored in the handle. */
-OSStatus mUPSetContents(ControlHandle theControl, Handle theContents) {
-    STPTextPaneVars **tpvars;
-    OSStatus err;
-    short vRefNum;
-    long dirID;
-    FSSpec tspec;
-    short trefnum;
-    Boolean texists;
-    long bytecount;
-    char state;
-        /* set up locals */
-    trefnum = 0;
-    texists = false;
-    tpvars = (STPTextPaneVars **) GetControlReference(theControl);
-    if (theContents == NULL) return paramErr;
-        /* create a temporary file */
-    err = FindFolder(kOnSystemDisk,  kTemporaryFolderType, true, &vRefNum, &dirID);
-    if (err != noErr) goto bail;
-    FSMakeFSSpec(vRefNum, dirID, "\pmUPSetContents", &tspec);
-    err = FSpCreate(&tspec, 'trsh', 'trsh', smSystemScript);
-    if (err != noErr) goto bail;
-    texists = true;
-        /* open the file */
-    err = FSpOpenDF(&tspec, fsRdWrPerm, &trefnum);
-    if (err != noErr) goto bail;
-        /* save the data to the temporary file */
-    state = HGetState(theContents);
-    HLock(theContents);
-    bytecount = GetHandleSize(theContents);
-    err = FSWrite(trefnum, &bytecount, *theContents);
-    HSetState(theContents, state);
-    if (err != noErr) goto bail;
-        /* reset the file position */
-    err = SetFPos(trefnum, fsFromStart, 0);
-    if (err != noErr) goto bail;
-        /* load the data */
-    err = TXNSetDataFromFile((**tpvars).fTXNRec, trefnum, kTXNTextensionFile, bytecount, kTXNUseCurrentSelection, kTXNUseCurrentSelection);
-    if (err != noErr) goto bail;
-        /* clean up */
-    FSClose(trefnum);
-    FSpDelete(&tspec);
-        /* all done */
-    return noErr;
-bail:
-    if (trefnum != 0) FSClose(trefnum);
-    if (texists) FSpDelete(&tspec);
-    return err;
+protected :
+    TXNObject m_txn ;
+    TXNControlData m_data[1] ;
+} ;
+
+wxMacMLTEControl::wxMacMLTEControl( wxTextCtrl *peer )
+    : wxMacTextControl( peer )
+{
+    SetNeedsFocusRect( true ) ;

 }
 
 }
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
+wxString wxMacMLTEControl::GetStringValue() const
+{
+    wxString result ;
+    OSStatus err ;
+    Size actualSize = 0;

 
 

-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)
+    {
+#if wxUSE_UNICODE
+        Handle theText ;
+        err = TXNGetDataEncoded( m_txn, kTXNStartOffset, kTXNEndOffset, &theText, kTXNUnicodeTextData );

 
 

-    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()
+        // all done
+        if ( err != noErr )
+        {
+            actualSize = 0 ;
+        }
+        else
+        {
+            actualSize = GetHandleSize( theText ) / sizeof(UniChar) ;
+            if ( actualSize > 0 )
+            {
+                wxChar *ptr = NULL ;
+
+#if SIZEOF_WCHAR_T == 2
+                ptr = new wxChar[actualSize + 1] ;
+                wxStrncpy( ptr , (wxChar*)(*theText) , actualSize ) ;
+#else
+                SetHandleSize( theText, (actualSize + 1) * sizeof(UniChar) ) ;
+                HLock( theText ) ;
+                (((UniChar*)*theText)[actualSize]) = 0 ;
+                wxMBConvUTF16 converter ;
+                size_t noChars = converter.MB2WC( NULL , (const char*)*theText , 0 ) ;
+                wxASSERT_MSG( noChars != wxCONV_FAILED, _T("Unable to count the number of characters in this string!") );
+                ptr = new wxChar[noChars + 1] ;
+
+                noChars = converter.MB2WC( ptr , (const char*)*theText , noChars + 1 ) ;
+                wxASSERT_MSG( noChars != wxCONV_FAILED, _T("Conversion of string failed!") );
+                ptr[noChars] = 0 ;
+                HUnlock( theText ) ;

 #endif
 
 #endif
 

-// Text item
-wxTextCtrl::wxTextCtrl()
-{
+                ptr[actualSize] = 0 ;
+                result = wxString( ptr ) ;
+                delete [] ptr ;
+            }
+
+            DisposeHandle( theText ) ;
+        }
+#else
+        Handle theText ;
+        err = TXNGetDataEncoded( m_txn , kTXNStartOffset, kTXNEndOffset, &theText, kTXNTextData );
+
+        // all done
+        if ( err != noErr )
+        {
+            actualSize = 0 ;
+        }
+        else
+        {
+            actualSize = GetHandleSize( theText ) ;
+            if ( actualSize > 0 )
+            {
+                HLock( theText ) ;
+                result = wxString( *theText , wxConvLocal , actualSize ) ;
+                HUnlock( theText ) ;
+            }
+
+            DisposeHandle( theText ) ;
+        }
+#endif
+    }
+
+#if '\n' == 10
+    wxMacConvertNewlines13To10( &result ) ;
+#else
+    wxMacConvertNewlines10To13( &result ) ;
+#endif
+
+    return result ;

 }
 
 }
 

-const short kVerticalMargin = 2 ;
-const short kHorizontalMargin = 2 ;
+void wxMacMLTEControl::SetStringValue( const wxString &str )
+{
+    wxString st = str;
+    wxMacConvertNewlines10To13( &st );

 
 

-bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
-           const wxString& st,
-           const wxPoint& pos,
-           const wxSize& size, long style,
-           const wxValidator& validator,
-           const wxString& name)
+    {
+#ifndef __LP64__
+        wxMacWindowClipper c( m_peer ) ;
+#endif
+
+        {
+            wxMacEditHelper help( m_txn );
+            SetTXNData( st, kTXNStartOffset, kTXNEndOffset );
+        }
+
+        TXNSetSelection( m_txn, 0, 0 );
+        TXNShowSelection( m_txn, kTXNShowStart );
+    }
+}
+
+TXNFrameOptions wxMacMLTEControl::FrameOptionsFromWXStyle( long wxStyle )

 {
 {

-    // base initialization
-    if ( !CreateBase(parent, id, pos, size, style, validator, name) )
-        return FALSE;
+    TXNFrameOptions frameOptions = kTXNDontDrawCaretWhenInactiveMask;
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
+    frameOptions |= kTXNDoFontSubstitutionMask;
+#endif
+
+    if ( ! (wxStyle & wxTE_NOHIDESEL) )
+        frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ;

 
 

-    wxSize mySize = size ;
-    if ( UMAHasAppearance() )
+    if ( wxStyle & (wxHSCROLL | wxTE_DONTWRAP) )
+        frameOptions |= kTXNWantHScrollBarMask ;
+
+    if ( wxStyle & wxTE_MULTILINE )

     {
     {

-        m_macHorizontalBorder = 5 ; // additional pixels around the real control
-        m_macVerticalBorder = 5 ;
+        frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
+
+        if ( !(wxStyle & wxTE_NO_VSCROLL) )
+        {
+            frameOptions |= kTXNWantVScrollBarMask ;
+
+            // The following code causes drawing problems on 10.4. Perhaps it can be restored for
+            // older versions of the OS, but I'm not sure it's appropriate to put a grow icon here
+            // anyways, as AFAIK users can't actually use it to resize the text ctrl.
+//            if ( frameOptions & kTXNWantHScrollBarMask )
+//                frameOptions |= kTXNDrawGrowIconMask ;
+        }

     }
     else
     {
     }
     else
     {

-        m_macHorizontalBorder = 0 ; // additional pixels around the real control
-        m_macVerticalBorder = 0 ;
+        frameOptions |= kTXNSingleLineOnlyMask ;

     }
 
     }
 

+    return frameOptions ;
+}

 
 

-    Rect bounds ;
-    Str255 title ;
+void wxMacMLTEControl::AdjustCreationAttributes(const wxColour &background,
+                                                bool WXUNUSED(visible))
+{
+    TXNControlTag iControlTags[] =
+        {
+            kTXNDoFontSubstitution,
+            kTXNWordWrapStateTag ,
+        };
+    TXNControlData iControlData[] =
+        {
+            { true },
+            { kTXNNoAutoWrap },
+        };
+
+    int toptag = WXSIZEOF( iControlTags ) ;

 
 

-    if ( mySize.y == -1 )
+    if ( m_windowStyle & wxTE_MULTILINE )

     {
     {

-        if ( UMAHasAppearance() )
-            mySize.y = 13 ;
-        else
-            mySize.y = 24 ;
-        
-        mySize.y += 2 * m_macVerticalBorder ;
+        iControlData[1].uValue =
+            (m_windowStyle & wxTE_DONTWRAP)
+            ? kTXNNoAutoWrap
+            : kTXNAutoWrap;

     }
 
     }
 

-    MacPreControlCreate( parent , id ,  "" , pos , mySize ,style, validator , name , &bounds , title ) ;
+    OSStatus err = TXNSetTXNObjectControls( m_txn, false, toptag, iControlTags, iControlData ) ;
+    verify_noerr( err );

 
 

-    if ( m_windowStyle & wxTE_MULTILINE )
+    // setting the default font:
+    // under 10.2 this causes a visible caret, therefore we avoid it
+
+    if ( UMAGetSystemVersion() >= 0x1030 )

     {
     {

-        wxASSERT_MSG( !(m_windowStyle & wxTE_PROCESS_ENTER),
-                      wxT("wxTE_PROCESS_ENTER style is ignored for multiline text controls (they always process it)") );
+        Str255 fontName ;
+        SInt16 fontSize ;
+        Style fontStyle ;

 
 

-        m_windowStyle |= wxTE_PROCESS_ENTER;
+        GetThemeFont( kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+
+        TXNTypeAttributes typeAttr[] =
+        {
+            { kTXNQDFontNameAttribute , kTXNQDFontNameAttributeSize , { (void*) fontName } } ,
+            { kTXNQDFontSizeAttribute , kTXNFontSizeAttributeSize , { (void*) (fontSize << 16) } } ,
+            { kTXNQDFontStyleAttribute , kTXNQDFontStyleAttributeSize , { (void*) normal } } ,
+        } ;
+
+        err = TXNSetTypeAttributes(
+            m_txn, sizeof(typeAttr) / sizeof(TXNTypeAttributes),
+            typeAttr, kTXNStartOffset, kTXNEndOffset );
+        verify_noerr( err );
+    }
+
+    if ( m_windowStyle & wxTE_PASSWORD )
+    {
+        UniChar c = 0x00A5 ;
+        err = TXNEchoMode( m_txn , c , 0 , true );
+        verify_noerr( err );

     }
 
     }
 

+    TXNBackground tback;
+    tback.bgType = kTXNBackgroundTypeRGB;
+    tback.bg.color = MAC_WXCOLORREF( background.GetPixel() );
+    TXNSetBackground( m_txn , &tback );

 
 

-    if ( style & wxTE_PASSWORD )
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+    if ( UMAGetSystemVersion() >= 0x1040 )

     {
     {

-      m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , "\p" , true , 0 , 0 , 1, 
-        kControlEditTextPasswordProc , (long) this ) ;
+        TXNCommandEventSupportOptions options ;
+        if ( TXNGetCommandEventSupport( m_txn, &options ) == noErr )
+        {
+            options |=
+                kTXNSupportEditCommandProcessing
+                | kTXNSupportEditCommandUpdating
+                | kTXNSupportFontCommandProcessing
+                | kTXNSupportFontCommandUpdating;
+
+            // only spell check when not read-only 
+            // use system options for the default
+            bool checkSpelling = false ; 
+            if ( !(m_windowStyle & wxTE_READONLY) )
+            {   
+#if wxUSE_SYSTEM_OPTIONS
+                if ( wxSystemOptions::HasOption( wxMAC_TEXTCONTROL_USE_SPELL_CHECKER ) && (wxSystemOptions::GetOptionInt( wxMAC_TEXTCONTROL_USE_SPELL_CHECKER ) == 1) )
+                {
+                    checkSpelling = true ;
+                }
+#endif
+            }
+            
+            if ( checkSpelling )
+                options |=
+                    kTXNSupportSpellCheckCommandProcessing
+                    | kTXNSupportSpellCheckCommandUpdating;              
+
+            TXNSetCommandEventSupport( m_txn , options ) ;
+        }

     }
     }

-    else
+#endif
+}
+
+void wxMacMLTEControl::SetBackground( const wxBrush &brush )
+{
+    // currently only solid background are supported
+    TXNBackground tback;
+
+    tback.bgType = kTXNBackgroundTypeRGB;
+    tback.bg.color = MAC_WXCOLORREF( brush.GetColour().GetPixel() );
+    TXNSetBackground( m_txn , &tback );
+}
+
+void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , long to )
+{
+    TXNTypeAttributes typeAttr[4] ;
+    RGBColor color ;
+    size_t typeAttrCount = 0 ;
+
+    TXNMargins margins;
+    TXNControlTag    controlTags[4];
+    TXNControlData   controlData[4];
+    size_t controlAttrCount = 0;
+    
+    TXNTab* tabs = NULL;
+    
+    bool relayout = false;
+
+    if ( style.HasFont() )

     {
     {

-    if ( mUPCreateControl(parent->GetMacRootWindow(), &bounds, &m_macControl) != noErr ) 
-      return FALSE ;
+        wxASSERT( typeAttrCount < WXSIZEOF(typeAttr) );
+        const wxFont &font = style.GetFont() ;
+        typeAttr[typeAttrCount].tag = kTXNATSUIStyle ;
+        typeAttr[typeAttrCount].size = kTXNATSUIStyleSize ;
+        typeAttr[typeAttrCount].data.dataPtr = font.MacGetATSUStyle() ;
+        typeAttrCount++ ;

     }
     }

-    MacPostControlCreate() ;

 
 

-    wxString value ;
+    if ( style.HasTextColour() )
+    {
+        wxASSERT( typeAttrCount < WXSIZEOF(typeAttr) );
+        color = MAC_WXCOLORREF(style.GetTextColour().GetPixel()) ;
+
+        typeAttr[typeAttrCount].tag = kTXNQDFontColorAttribute ;
+        typeAttr[typeAttrCount].size = kTXNQDFontColorAttributeSize ;
+        typeAttr[typeAttrCount].data.dataPtr = (void*) &color ;
+        typeAttrCount++ ;
+    }
+    
+    if ( style.HasAlignment() )
+    {
+        wxASSERT( controlAttrCount < WXSIZEOF(controlTags) );
+        SInt32 align;

         
         

-    if( wxApp::s_macDefaultEncodingIsPC )
-        value = wxMacMakeMacStringFromPC( st ) ;
-    else
-        value = st ;
+        switch ( style.GetAlignment() )
+        {
+            case wxTEXT_ALIGNMENT_LEFT:
+                align = kTXNFlushLeft;
+                break;
+            case wxTEXT_ALIGNMENT_CENTRE:
+                align = kTXNCenter;
+                break;
+            case wxTEXT_ALIGNMENT_RIGHT:
+                align = kTXNFlushRight;
+                break;
+            case wxTEXT_ALIGNMENT_JUSTIFIED:
+                align = kTXNFullJust;
+                break;  
+            default :
+            case wxTEXT_ALIGNMENT_DEFAULT:
+                align = kTXNFlushDefault;
+                break;
+        }

         
         

-    if ( style & wxTE_PASSWORD )
-    {
-      ::SetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , value.Length() , (char*) ((const char*)value) ) ;
-  }
-  else
-  {
-    STPTextPaneVars **tpvars;
-        /* set up locals */
-    tpvars = (STPTextPaneVars **) GetControlReference(m_macControl);
-        /* set the text in the record */
-    TXNSetData( (**tpvars).fTXNRec, kTXNTextData,  (const char*)value, value.Length(),
-      kTXNStartOffset, kTXNEndOffset);
-  }
-  
-  return TRUE;
+        controlTags[controlAttrCount] = kTXNJustificationTag ;
+        controlData[controlAttrCount].sValue = align ;
+        controlAttrCount++ ;
+    }
+
+    if ( style.HasLeftIndent() || style.HasRightIndent() )
+    {
+        wxASSERT( controlAttrCount < WXSIZEOF(controlTags) );
+        controlTags[controlAttrCount] = kTXNMarginsTag;
+        controlData[controlAttrCount].marginsPtr = &margins;
+        verify_noerr( TXNGetTXNObjectControls (m_txn, 1 ,
+                                &controlTags[controlAttrCount], &controlData[controlAttrCount]) );
+        if ( style.HasLeftIndent() )
+        {
+            margins.leftMargin = style.GetLeftIndent() / 254.0 * 72 + 0.5;
+        }
+        if ( style.HasRightIndent() )
+        {
+            margins.rightMargin = style.GetRightIndent() / 254.0 * 72 + 0.5;
+        }
+        controlAttrCount++ ;
+    }
+    
+    if ( style.HasTabs() )
+    {
+        const wxArrayInt& tabarray = style.GetTabs();
+        // unfortunately Mac only applies a tab distance, not individually different tabs
+        controlTags[controlAttrCount] = kTXNTabSettingsTag;
+        if ( tabarray.size() > 0 )
+            controlData[controlAttrCount].tabValue.value = tabarray[0] / 254.0 * 72 + 0.5;
+        else
+            controlData[controlAttrCount].tabValue.value = 72 ; 
+
+        controlData[controlAttrCount].tabValue.tabType = kTXNLeftTab;
+        controlAttrCount++ ;
+    }
+    
+    // unfortunately the relayout is not automatic
+    if ( controlAttrCount > 0 )
+    {
+        verify_noerr( TXNSetTXNObjectControls (m_txn, false /* don't clear all */, controlAttrCount,
+                                controlTags, controlData) );
+        relayout = true;
+    }
+    
+    if ( typeAttrCount > 0 )
+    {
+        verify_noerr( TXNSetTypeAttributes( m_txn , typeAttrCount, typeAttr, from , to ) );
+        relayout = true;
+    }
+    
+    if ( tabs != NULL )
+    {
+        delete[] tabs;
+    }
+    
+    if ( relayout )
+    {
+        TXNRecalcTextLayout( m_txn );
+    }

 }
 
 }
 

-wxString wxTextCtrl::GetValue() const
+void wxMacMLTEControl::SetFont(const wxFont & font,
+                               const wxColour& foreground,
+                               long WXUNUSED(windowStyle))
+{
+    wxMacEditHelper help( m_txn ) ;
+    TXNSetAttribute( wxTextAttr( foreground, wxNullColour, font ), kTXNStartOffset, kTXNEndOffset ) ;
+}
+
+void wxMacMLTEControl::SetStyle( long start, long end, const wxTextAttr& style )

 {
 {

-    Size actualsize;
-  if ( m_windowStyle & wxTE_PASSWORD )
-  {
-      ::GetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ;
-  }
-  else
-  {
-    STPTextPaneVars **tpvars;
-    OSStatus err;
-        /* set up locals */
-    tpvars = (STPTextPaneVars **) GetControlReference(m_macControl);
-        /* extract the text from the record */
+    wxMacEditHelper help( m_txn ) ;
+    TXNSetAttribute( style, start, end ) ;
+}
+
+void wxMacMLTEControl::Copy()
+{
+    TXNCopy( m_txn );
+}
+
+void wxMacMLTEControl::Cut()
+{
+    TXNCut( m_txn );
+}
+
+void wxMacMLTEControl::Paste()
+{
+    TXNPaste( m_txn );
+}
+
+bool wxMacMLTEControl::CanPaste() const
+{
+    return TXNIsScrapPastable() ;
+}
+
+void wxMacMLTEControl::SetEditable(bool editable)
+{
+    TXNControlTag tag[] = { kTXNIOPrivilegesTag } ;
+    TXNControlData data[] = { { editable ? kTXNReadWrite : kTXNReadOnly } } ;
+    TXNSetTXNObjectControls( m_txn, false, WXSIZEOF(tag), tag, data ) ;
+}
+
+wxTextPos wxMacMLTEControl::GetLastPosition() const
+{
+    wxTextPos actualsize = 0 ;
+

     Handle theText ;
     Handle theText ;

-    err = TXNGetDataEncoded( (**tpvars).fTXNRec, kTXNStartOffset, kTXNEndOffset, &theText , kTXNTextData );
-        /* all done */
-    if ( err )
+    OSErr err = TXNGetDataEncoded( m_txn, kTXNStartOffset, kTXNEndOffset, &theText, kTXNTextData );
+
+    // all done
+    if ( err == noErr )

     {
     {

-      actualsize = 0 ;
+        actualsize = GetHandleSize( theText ) ;
+        DisposeHandle( theText ) ;

     }
     else
     {
     }
     else
     {

-      actualsize = GetHandleSize( theText ) ;
-      strncpy( wxBuffer , *theText , actualsize ) ;
-      DisposeHandle( theText ) ;
+        actualsize = 0 ;

     }
     }

-  }
-    wxBuffer[actualsize] = 0 ;
-    if( wxApp::s_macDefaultEncodingIsPC )
-        return wxMacMakePCStringFromMac( wxBuffer ) ;
-    else
-        return wxString(wxBuffer);
+
+    return actualsize ;

 }
 
 }
 

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

 {
 {

-  if ( m_windowStyle & wxTE_PASSWORD )
-  {
-   ControlEditTextSelectionRec selection ;
-   TEHandle teH ;
-   long size ;
-   
-   ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
+    wxString value = str ;
+    wxMacConvertNewlines10To13( &value ) ;

 
 

-    *from = (**teH).selStart;
-    *to = (**teH).selEnd;
-   }
-   else
-   {
-        STPTextPaneVars **tpvars;
+    wxMacEditHelper help( m_txn ) ;
+#ifndef __LP64__
+    wxMacWindowClipper c( m_peer ) ;
+#endif

 
 

-            /* set up locals */
-        tpvars = (STPTextPaneVars **) GetControlReference(m_macControl);
+    TXNSetSelection( m_txn, from, to ) ;
+    TXNClear( m_txn ) ;
+    SetTXNData( value, kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ;
+}

 
 

-        TXNGetSelection(  (**tpvars).fTXNRec , (TXNOffset*) from , (TXNOffset*) to ) ;
+void wxMacMLTEControl::Remove( long from , long to )
+{
+#ifndef __LP64__
+    wxMacWindowClipper c( m_peer ) ;
+#endif
+    wxMacEditHelper help( m_txn ) ;
+    TXNSetSelection( m_txn , from , to ) ;
+    TXNClear( m_txn ) ;
+}

 
 

-   }
+void wxMacMLTEControl::GetSelection( long* from, long* to) const
+{
+    TXNOffset f,t ;
+    TXNGetSelection( m_txn , &f , &t ) ;
+    *from = f;
+    *to = t;

 }
 
 }
 

-void wxTextCtrl::SetValue(const wxString& st)
+void wxMacMLTEControl::SetSelection( long from , long to )

 {
 {

-    wxString value ;
-    
-    if( wxApp::s_macDefaultEncodingIsPC )
-        value = wxMacMakeMacStringFromPC( st ) ;
+#ifndef __LP64__
+    wxMacWindowClipper c( m_peer ) ;
+#endif
+
+    // change the selection
+    if ((from == -1) && (to == -1))
+        TXNSelectAll( m_txn );

     else
     else

-        value = st ;
-  if ( m_windowStyle & wxTE_PASSWORD )
-  {
-      ::SetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , value.Length() , (char*) ((const char*)value) ) ;
-  }
-  else
-  {
-    STPTextPaneVars **tpvars;
-        /* set up locals */
-    tpvars = (STPTextPaneVars **) GetControlReference(m_macControl);
-        /* set the text in the record */
-    TXNSetData( (**tpvars).fTXNRec, kTXNTextData,  (const char*)value, value.Length(),
-      kTXNStartOffset, kTXNEndOffset);
-  }
-    WindowRef window = GetMacRootWindow() ;
-    if ( window )
-    {
-        wxWindow* win = wxFindWinFromMacWindow( window ) ;
-        if ( win )
+        TXNSetSelection( m_txn, from, to );
+
+    TXNShowSelection( m_txn, kTXNShowStart );
+}
+
+void wxMacMLTEControl::WriteText( const wxString& str )
+{
+    wxString st = str ;
+    wxMacConvertNewlines10To13( &st ) ;
+
+    long start , end , dummy ;
+
+    GetSelection( &start , &dummy ) ;
+#ifndef __LP64__
+    wxMacWindowClipper c( m_peer ) ;
+#endif
+
+    {
+        wxMacEditHelper helper( m_txn ) ;
+        SetTXNData( st, kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ;
+    }
+
+    GetSelection( &dummy, &end ) ;
+
+    // TODO: SetStyle( start , end , GetDefaultStyle() ) ;
+}
+
+void wxMacMLTEControl::Clear()
+{
+#ifndef __LP64__
+    wxMacWindowClipper c( m_peer ) ;
+#endif
+    wxMacEditHelper st( m_txn ) ;
+    TXNSetSelection( m_txn , kTXNStartOffset , kTXNEndOffset ) ;
+    TXNClear( m_txn ) ;
+}
+
+bool wxMacMLTEControl::CanUndo() const
+{
+    return TXNCanUndo( m_txn , NULL ) ;
+}
+
+void wxMacMLTEControl::Undo()
+{
+    TXNUndo( m_txn ) ;
+}
+
+bool wxMacMLTEControl::CanRedo() const
+{
+    return TXNCanRedo( m_txn , NULL ) ;
+}
+
+void wxMacMLTEControl::Redo()
+{
+    TXNRedo( m_txn ) ;
+}
+
+int wxMacMLTEControl::GetNumberOfLines() const
+{
+    ItemCount lines = 0 ;
+    TXNGetLineCount( m_txn, &lines ) ;
+
+    return lines ;
+}
+
+long wxMacMLTEControl::XYToPosition(long x, long y) const
+{
+    Point curpt ;
+    wxTextPos 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, ypos = 0 ;
+    int lastHeight = 0 ;
+    ItemCount n ;
+
+    lastpos = GetLastPosition() ;
+    for ( n = 0 ; n <= (ItemCount) lastpos ; ++n )
+    {
+        if ( y == ypos && x == xpos )
+            return n ;
+
+        TXNOffsetToPoint( m_txn, n, &curpt ) ;
+
+        if ( curpt.v > lastHeight )

         {
         {

-            wxMacDrawingHelper help( win ) ;
-            // the mac control manager always assumes to have the origin at 0,0
-            SetOrigin( 0 , 0 ) ;
-            
-            bool            hasTabBehind = false ;
-            wxWindow* parent = GetParent() ;
-            while ( parent )
+            xpos = 0 ;
+            if ( n > 0 )
+                ++ypos ;
+
+            lastHeight = curpt.v ;
+        }
+        else
+            ++xpos ;
+    }
+
+    return 0 ;
+}
+
+bool wxMacMLTEControl::PositionToXY( long pos, long *x, long *y ) const
+{
+    Point curpt ;
+    wxTextPos lastpos ;
+
+    if ( y )
+        *y = 0 ;
+    if ( x )
+        *x = 0 ;
+
+    lastpos = GetLastPosition() ;
+    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, ypos = 0 ;
+        int lastHeight = 0 ;
+        ItemCount n ;
+
+        for ( n = 0 ; n <= (ItemCount) pos ; ++n )
+        {
+            TXNOffsetToPoint( m_txn, n, &curpt ) ;
+
+            if ( curpt.v > lastHeight )

             {
             {

-                if( parent->MacGetWindowData() )
-                {
-                    UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
-                    break ;
-                }
-                
-                if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ||  parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
-                {
-                    if ( ((wxControl*)parent)->GetMacControl() )
-                        SetUpControlBackground( ((wxControl*)parent)->GetMacControl() , -1 , true ) ;
-                    break ;
-                }
-                
-                parent = parent->GetParent() ;
-            } 
-            
-            UMADrawControl( m_macControl ) ;
-            UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
+                xpos = 0 ;
+                if ( n > 0 )
+                    ++ypos ;
+
+                lastHeight = curpt.v ;
+            }
+            else
+                ++xpos ;

         }
         }

+
+        if ( y )
+            *y = ypos ;
+        if ( x )
+            *x = xpos ;

     }
     }

+
+    return false ;

 }
 
 }
 

-// Clipboard operations
-void wxTextCtrl::Copy()
+void wxMacMLTEControl::ShowPosition( long pos )

 {
 {

-    if (CanCopy())
+    Point current, desired ;
+    TXNOffset selstart, selend;
+
+    TXNGetSelection( m_txn, &selstart, &selend );
+    TXNOffsetToPoint( m_txn, selstart, &current );
+    TXNOffsetToPoint( m_txn, pos, &desired );
+
+    // TODO: use HIPoints for 10.3 and above
+
+    OSErr theErr = noErr;
+    long dv = desired.v - current.v;
+    long dh = desired.h - current.h;
+    TXNShowSelection( m_txn, kTXNShowStart ) ; // NB: should this be kTXNShowStart or kTXNShowEnd ??
+    theErr = TXNScroll( m_txn, kTXNScrollUnitsInPixels, kTXNScrollUnitsInPixels, &dv, &dh );
+
+    // there will be an error returned for classic MLTE implementation when the control is
+    // invisible, but HITextView works correctly, so we don't assert that one
+    // wxASSERT_MSG( theErr == noErr, _T("TXNScroll returned an error!") );
+}
+
+void wxMacMLTEControl::SetTXNData( const wxString& st, TXNOffset start, TXNOffset end )
+{
+#if wxUSE_UNICODE
+#if SIZEOF_WCHAR_T == 2
+    size_t len = st.length() ;
+    TXNSetData( m_txn, kTXNUnicodeTextData, (void*)st.wc_str(), len * 2, start, end );
+#else
+    wxMBConvUTF16 converter ;
+    ByteCount byteBufferLen = converter.WC2MB( NULL, st.wc_str(), 0 ) ;
+    UniChar *unibuf = (UniChar*)malloc( byteBufferLen ) ;
+    converter.WC2MB( (char*)unibuf, st.wc_str(), byteBufferLen ) ;
+    TXNSetData( m_txn, kTXNUnicodeTextData, (void*)unibuf, byteBufferLen, start, end ) ;
+    free( unibuf ) ;
+#endif
+#else
+    wxCharBuffer text = st.mb_str( wxConvLocal ) ;
+    TXNSetData( m_txn, kTXNTextData, (void*)text.data(), strlen( text ), start, end ) ;
+#endif
+}
+
+wxString wxMacMLTEControl::GetLineText(long lineNo) const
+{
+    wxString line ;
+
+    if ( lineNo < GetNumberOfLines() )

     {
     {

-      if ( m_windowStyle & wxTE_PASSWORD )
-      {
-            TEHandle teH ;
-            long size ;
-       
-                ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
-               TECopy( teH ) ;
-               ClearCurrentScrap();
-               TEToScrap() ;
-       }
-       else
-       {
-         mUPDoEditCommand( m_macControl , kmUPCopy ) ;
-       }
-       }
+        Point firstPoint;
+        Fixed lineWidth, lineHeight, currentHeight;
+        long ypos ;
+
+        // get the first possible position in the control
+        TXNOffsetToPoint(m_txn, 0, &firstPoint);
+
+        // Iterate through the lines until we reach the one we want,
+        // adding to our current y pixel point position
+        ypos = 0 ;
+        currentHeight = 0;
+        while (ypos < lineNo)
+        {
+            TXNGetLineMetrics(m_txn, ypos++, &lineWidth, &lineHeight);
+            currentHeight += lineHeight;
+        }
+
+        Point thePoint = { firstPoint.v + (currentHeight >> 16), firstPoint.h + (0) };
+        TXNOffset theOffset;
+        TXNPointToOffset(m_txn, thePoint, &theOffset);
+
+        wxString content = GetStringValue() ;
+        Point currentPoint = thePoint;
+        while (thePoint.v == currentPoint.v && theOffset < content.length())
+        {
+            line += content[theOffset];
+            TXNOffsetToPoint(m_txn, ++theOffset, &currentPoint);
+        }
+    }
+
+    return line ;

 }
 
 }
 

-void wxTextCtrl::Cut()
+int wxMacMLTEControl::GetLineLength(long lineNo) const

 {
 {

-    if (CanCut())
+    int theLength = 0;
+
+    if ( lineNo < GetNumberOfLines() )

     {
     {

-      if ( m_windowStyle & wxTE_PASSWORD )
-      {
-            TEHandle teH ;
-            long size ;
-       
-                       ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
-               TECut( teH ) ;
-               ClearCurrentScrap();
-               TEToScrap() ;
-               //      MacInvalidateControl() ;
+        Point firstPoint;
+        Fixed lineWidth, lineHeight, currentHeight;
+        long ypos;
+
+        // get the first possible position in the control
+        TXNOffsetToPoint(m_txn, 0, &firstPoint);
+
+        // Iterate through the lines until we reach the one we want,
+        // adding to our current y pixel point position
+        ypos = 0;
+        currentHeight = 0;
+        while (ypos < lineNo)
+        {
+            TXNGetLineMetrics(m_txn, ypos++, &lineWidth, &lineHeight);
+            currentHeight += lineHeight;
+        }
+
+        Point thePoint = { firstPoint.v + (currentHeight >> 16), firstPoint.h + (0) };
+        TXNOffset theOffset;
+        TXNPointToOffset(m_txn, thePoint, &theOffset);
+
+        wxString content = GetStringValue() ;
+        Point currentPoint = thePoint;
+        while (thePoint.v == currentPoint.v && theOffset < content.length())
+        {
+            ++theLength;
+            TXNOffsetToPoint(m_txn, ++theOffset, &currentPoint);
+        }

     }
     }

-       else
-       {
-         mUPDoEditCommand( m_macControl , kmUPCut ) ;
-       }
-       }
+
+    return theLength ;

 }
 
 }
 

-void wxTextCtrl::Paste()
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
+
+// ----------------------------------------------------------------------------
+// MLTE control implementation (classic part)
+// ----------------------------------------------------------------------------
+
+// OS X Notes : We still don't have a full replacement for MLTE, so this implementation
+// has to live on. We have different problems coming from outdated implementations on the
+// various OS X versions. Most deal with the scrollbars: they are not correctly embedded
+// while this can be solved on 10.3 by reassigning them the correct place, on 10.2 there is
+// no way out, therefore we are using our own implementation and our own scrollbars ....
+
+#ifdef __WXMAC_OSX__
+
+TXNScrollInfoUPP gTXNScrollInfoProc = NULL ;
+ControlActionUPP gTXNScrollActionProc = NULL ;
+
+pascal void wxMacMLTEClassicControl::TXNScrollInfoProc(
+    SInt32 iValue, SInt32 iMaximumValue,
+    TXNScrollBarOrientation iScrollBarOrientation, SInt32 iRefCon )

 {
 {

-    if (CanPaste())
+    wxMacMLTEClassicControl* mlte = (wxMacMLTEClassicControl*) iRefCon ;
+    SInt32 value =  wxMax( iValue , 0 ) ;
+    SInt32 maximum = wxMax( iMaximumValue , 0 ) ;
+
+    if ( iScrollBarOrientation == kTXNHorizontal )

     {
     {

-    if ( m_windowStyle & wxTE_PASSWORD )
+        if ( mlte->m_sbHorizontal )
+        {
+            SetControl32BitValue( mlte->m_sbHorizontal , value ) ;
+            SetControl32BitMaximum( mlte->m_sbHorizontal , maximum ) ;
+            mlte->m_lastHorizontalValue = value ;
+        }
+    }
+    else if ( iScrollBarOrientation == kTXNVertical )

     {
     {

-            TEHandle teH ;
-            long size ;
-     
-               ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
-               TEFromScrap() ;
-               TEPaste( teH ) ;
-               WindowRef window = GetMacRootWindow() ;
-               if ( window )
-               {
-                       wxWindow* win = wxFindWinFromMacWindow( window ) ;
-                       if ( win )
-                       {
-                               wxMacDrawingHelper help( win ) ;
-                               // the mac control manager always assumes to have the origin at 0,0
-                               SetOrigin( 0 , 0 ) ;
-                               
-                               bool                    hasTabBehind = false ;
-                               wxWindow* parent = GetParent() ;
-                               while ( parent )
-                               {
-                                       if( parent->MacGetWindowData() )
-                                       {
-                                               ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
-                                               break ;
-                                       }
-                                       
-                                       if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ||  parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
-                                       {
-                                               if ( ((wxControl*)parent)->GetMacControl() )
-                                                       SetUpControlBackground( ((wxControl*)parent)->GetMacControl() , -1 , true ) ;
-                                               break ;
-                                       }
-                                       
-                                       parent = parent->GetParent() ;
-                               } 
-                               
-                               UMADrawControl( m_macControl ) ;
-                               ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
-                       }
-               }
-       }
-       else
-       {
-         mUPDoEditCommand( m_macControl , kmUPPaste ) ;
-       }
-       }
+        if ( mlte->m_sbVertical )
+        {
+            SetControl32BitValue( mlte->m_sbVertical , value ) ;
+            SetControl32BitMaximum( mlte->m_sbVertical , maximum ) ;
+            mlte->m_lastVerticalValue = value ;
+        }
+    }

 }
 
 }
 

-bool wxTextCtrl::CanCopy() const
+pascal void wxMacMLTEClassicControl::TXNScrollActionProc( ControlRef controlRef , ControlPartCode partCode )

 {
 {

-    // Can copy if there's a selection
-    long from, to;
-    GetSelection(& from, & to);
-    return (from != to);
+    wxMacMLTEClassicControl* mlte = (wxMacMLTEClassicControl*) GetControlReference( controlRef ) ;
+    if ( mlte == NULL )
+        return ;
+
+    if ( controlRef != mlte->m_sbVertical && controlRef != mlte->m_sbHorizontal )
+        return ;
+
+    OSStatus err ;
+    bool isHorizontal = ( controlRef == mlte->m_sbHorizontal ) ;
+
+    SInt32 minimum = 0 ;
+    SInt32 maximum = GetControl32BitMaximum( controlRef ) ;
+    SInt32 value = GetControl32BitValue( controlRef ) ;
+    SInt32 delta = 0;
+
+    switch ( partCode )
+    {
+        case kControlDownButtonPart :
+            delta = 10 ;
+            break ;
+
+        case kControlUpButtonPart :
+            delta = -10 ;
+            break ;
+
+        case kControlPageDownPart :
+            delta = GetControlViewSize( controlRef ) ;
+            break ;
+
+        case kControlPageUpPart :
+            delta = -GetControlViewSize( controlRef ) ;
+            break ;
+
+        case kControlIndicatorPart :
+            delta = value - (isHorizontal ? mlte->m_lastHorizontalValue : mlte->m_lastVerticalValue) ;
+            break ;
+
+        default :
+            break ;
+    }
+
+    if ( delta != 0 )
+    {
+        SInt32 newValue = value ;
+
+        if ( partCode != kControlIndicatorPart )
+        {
+            if ( value + delta < minimum )
+                delta = minimum - value ;
+            if ( value + delta > maximum )
+                delta = maximum - value ;
+
+            SetControl32BitValue( controlRef , value + delta ) ;
+            newValue = value + delta ;
+        }
+
+        SInt32 verticalDelta = isHorizontal ? 0 : delta ;
+        SInt32 horizontalDelta = isHorizontal ? delta : 0 ;
+
+        err = TXNScroll(
+            mlte->m_txn, kTXNScrollUnitsInPixels, kTXNScrollUnitsInPixels,
+            &verticalDelta, &horizontalDelta );
+        verify_noerr( err );
+
+        if ( isHorizontal )
+            mlte->m_lastHorizontalValue = newValue ;
+        else
+            mlte->m_lastVerticalValue = newValue ;
+    }

 }
 }

+#endif

 
 

-bool wxTextCtrl::CanCut() const
+// make correct activations
+void wxMacMLTEClassicControl::MacActivatePaneText(bool setActive)

 {
 {

-    // Can cut if there's a selection
-    long from, to;
-    GetSelection(& from, & to);
-    return (from != to);
+    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
+
+    wxMacWindowClipper clipper( textctrl ) ;
+    TXNActivate( m_txn, m_txnFrameID, setActive );
+
+    ControlRef controlFocus = 0 ;
+    GetKeyboardFocus( m_txnWindow , &controlFocus ) ;
+    if ( controlFocus == m_controlRef )
+        TXNFocus( m_txn, setActive );

 }
 
 }
 

-bool wxTextCtrl::CanPaste() const
+void wxMacMLTEClassicControl::MacFocusPaneText(bool setFocus)

 {
 {

-    if (!IsEditable())
-        return FALSE;
+    TXNFocus( m_txn, setFocus );
+}

 
 

-    long offset ;
-#if TARGET_CARBON
-    OSStatus err = noErr;
-    ScrapRef scrapRef;
-    
-    err = GetCurrentScrap( &scrapRef );
-    if ( err != noTypeErr && err != memFullErr )    
+// guards against inappropriate redraw (hidden objects drawing onto window)
+
+void wxMacMLTEClassicControl::MacSetObjectVisibility(bool vis)
+{
+    ControlRef controlFocus = 0 ;
+    GetKeyboardFocus( m_txnWindow , &controlFocus ) ;
+
+    if ( !vis && (controlFocus == m_controlRef ) )
+        SetKeyboardFocus( m_txnWindow , m_controlRef , kControlFocusNoPart ) ;
+
+    TXNControlTag iControlTags[1] = { kTXNVisibilityTag };
+    TXNControlData iControlData[1] = { { (UInt32)false } };
+
+    verify_noerr( TXNGetTXNObjectControls( m_txn , 1, iControlTags, iControlData ) ) ;
+
+    if ( iControlData[0].uValue != vis )

     {
     {

-        ScrapFlavorFlags    flavorFlags;
-        Size                byteCount;
-        
-        if (( err = GetScrapFlavorFlags( scrapRef, 'TEXT', &flavorFlags )) == noErr)
+        iControlData[0].uValue = vis ;
+        verify_noerr( TXNSetTXNObjectControls( m_txn, false , 1, iControlTags, iControlData ) ) ;
+    }
+
+    // currently, we always clip as partial visibility (overlapped) visibility is also a problem,
+    // if we run into further problems we might set the FrameBounds to an empty rect here
+}
+
+// make sure that the TXNObject is at the right position
+
+void wxMacMLTEClassicControl::MacUpdatePosition()
+{
+    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );
+    if ( textctrl == NULL )
+        return ;
+
+    Rect bounds ;
+    UMAGetControlBoundsInWindowCoords( m_controlRef, &bounds );
+
+    wxRect visRect = textctrl->MacGetClippedClientRect() ;
+    Rect visBounds = { visRect.y , visRect.x , visRect.y + visRect.height , visRect.x + visRect.width } ;
+    int x , y ;
+    x = y = 0 ;
+    textctrl->MacWindowToRootWindow( &x , &y ) ;
+    OffsetRect( &visBounds , x , y ) ;
+
+    if ( !EqualRect( &bounds, &m_txnControlBounds ) || !EqualRect( &visBounds, &m_txnVisBounds ) )
+    {
+        m_txnControlBounds = bounds ;
+        m_txnVisBounds = visBounds ;
+        wxMacWindowClipper cl( textctrl ) ;
+
+#ifdef __WXMAC_OSX__
+        if ( m_sbHorizontal || m_sbVertical )

         {
         {

-            if (( err = GetScrapFlavorSize( scrapRef, 'TEXT', &byteCount )) == noErr)
+            int w = bounds.right - bounds.left ;
+            int h = bounds.bottom - bounds.top ;
+
+            if ( m_sbHorizontal )
+            {
+                Rect sbBounds ;
+
+                sbBounds.left = -1 ;
+                sbBounds.top = h - 14 ;
+                sbBounds.right = w + 1 ;
+                sbBounds.bottom = h + 1 ;
+
+                SetControlBounds( m_sbHorizontal , &sbBounds ) ;
+                SetControlViewSize( m_sbHorizontal , w ) ;
+            }
+
+            if ( m_sbVertical )

             {
             {

-                return TRUE ;
+                Rect sbBounds ;
+
+                sbBounds.left = w - 14 ;
+                sbBounds.top = -1 ;
+                sbBounds.right = w + 1 ;
+                sbBounds.bottom = m_sbHorizontal ? h - 14 : h + 1 ;
+
+                SetControlBounds( m_sbVertical , &sbBounds ) ;
+                SetControlViewSize( m_sbVertical , h ) ;

             }
         }
             }
         }

-    }
-    return FALSE;
-    
+
+        Rect oldviewRect ;
+        TXNLongRect olddestRect ;
+        TXNGetRectBounds( m_txn , &oldviewRect , &olddestRect , NULL ) ;
+
+        Rect viewRect = { m_txnControlBounds.top, m_txnControlBounds.left,
+            m_txnControlBounds.bottom - ( m_sbHorizontal ? 14 : 0 ) ,
+            m_txnControlBounds.right - ( m_sbVertical ? 14 : 0 ) } ;
+        TXNLongRect destRect = { m_txnControlBounds.top, m_txnControlBounds.left,
+            m_txnControlBounds.bottom - ( m_sbHorizontal ? 14 : 0 ) ,
+            m_txnControlBounds.right - ( m_sbVertical ? 14 : 0 ) } ;
+
+        if ( olddestRect.right >= 10000 )
+            destRect.right = destRect.left + 32000 ;
+
+        if ( olddestRect.bottom >= 0x20000000 )
+            destRect.bottom = destRect.top + 0x40000000 ;
+
+        SectRect( &viewRect , &visBounds , &viewRect ) ;
+        TXNSetRectBounds( m_txn , &viewRect , &destRect , true ) ;
+
+#if 0
+        TXNSetFrameBounds(
+            m_txn,
+            m_txnControlBounds.top,
+            m_txnControlBounds.left,
+            m_txnControlBounds.bottom - (m_sbHorizontal ? 14 : 0),
+            m_txnControlBounds.right - (m_sbVertical ? 14 : 0),
+            m_txnFrameID );
+#endif

 #else
 #else

-    if ( GetScrap( NULL , 'TEXT' , &offset ) > 0 )
-    {
-        return TRUE ;
-    }
+
+        TXNSetFrameBounds(
+            m_txn, m_txnControlBounds.top, m_txnControlBounds.left,
+            wxMax( m_txnControlBounds.bottom, m_txnControlBounds.top ),
+            wxMax( m_txnControlBounds.right, m_txnControlBounds.left ), m_txnFrameID );

 #endif
 #endif

-    return FALSE ;
-}

 
 

-void wxTextCtrl::SetEditable(bool editable)
-{
-    if ( editable )
-        UMAActivateControl( m_macControl ) ;
-    else
-        UMADeactivateControl( m_macControl ) ;
-}
+        // the SetFrameBounds method under Classic sometimes does not correctly scroll a selection into sight after a
+        // movement, therefore we have to force it

 
 

-void wxTextCtrl::SetInsertionPoint(long pos)
-{
-    SetSelection( pos , pos ) ;
-}
+        // this problem has been reported in OSX as well, so we use this here once again

 
 

-void wxTextCtrl::SetInsertionPointEnd()
-{
-    long pos = GetLastPosition();
-    SetInsertionPoint(pos);
+        TXNLongRect textRect ;
+        TXNGetRectBounds( m_txn , NULL , NULL , &textRect ) ;
+        if ( textRect.left < m_txnControlBounds.left )
+            TXNShowSelection( m_txn , kTXNShowStart ) ;
+    }

 }
 
 }
 

-long wxTextCtrl::GetInsertionPoint() const
+void wxMacMLTEClassicControl::SetRect( Rect *r )

 {
 {

-  long begin,end ;
-  GetSelection( &begin , &end ) ;
-  return begin ;
+    wxMacControl::SetRect( r ) ;
+    MacUpdatePosition() ;

 }
 
 }
 

-long wxTextCtrl::GetLastPosition() const
+void wxMacMLTEClassicControl::MacControlUserPaneDrawProc(wxInt16 WXUNUSED(thePart))

 {
 {

-    if ( m_windowStyle & wxTE_PASSWORD )
-  {
-
-   ControlEditTextSelectionRec selection ;
-   TEHandle teH ;
-   long size ;
-   
-   ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
-   
-//   ::GetControlData( m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection , &size ) ;
-    return (**teH).teLength ;
-  }
-  else
-  {
-     STPTextPaneVars** tpvars = (STPTextPaneVars **) GetControlReference(m_macControl);
-
-    int actualsize = 0 ;
-       Handle theText ;
-       OSErr err = TXNGetDataEncoded( (**tpvars).fTXNRec, kTXNStartOffset, kTXNEndOffset, &theText , kTXNTextData );
-               /* all done */
-       if ( err )
-       {
-         actualsize = 0 ;
-       }
-       else
-       {
-         actualsize = GetHandleSize( theText ) ;
-         DisposeHandle( theText ) ;
-       }
-       return actualsize ;
-  }
-}
-
-void wxTextCtrl::Replace(long from, long to, const wxString& value)
-{
-  if ( m_windowStyle & wxTE_PASSWORD )
-  {
-    TEHandle teH ;
-    long size ;
-   
-    ControlEditTextSelectionRec selection ;
-   
-       selection.selStart = from ;
-       selection.selEnd = to ;
-       ::SetControlData( m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ;
-               ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
-       TESetSelect( from , to  , teH ) ;
-       TEDelete( teH ) ;
-               TEInsert( value , value.Length() , teH ) ;
-       }
-       else
-       {
-         // TODO
-       }
-       Refresh() ;
-}
+    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );
+    if ( textctrl == NULL )
+        return ;

 
 

-void wxTextCtrl::Remove(long from, long to)
-{
-  if ( m_windowStyle & wxTE_PASSWORD )
-  {
-    TEHandle teH ;
-    long size ;
-   
-    ControlEditTextSelectionRec selection ;
-   
-       selection.selStart = from ;
-       selection.selEnd = to ;
-       ::SetControlData( m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ;
-       ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
-       TEDelete( teH ) ;
-  }
-  else
-  {
-    //TODO
-  }
-    Refresh() ;
+    if ( textctrl->MacIsReallyShown() )
+    {
+        wxMacWindowClipper clipper( textctrl ) ;
+        TXNDraw( m_txn , NULL ) ;
+    }

 }
 
 }
 

-void wxTextCtrl::SetSelection(long from, long to)
+wxInt16 wxMacMLTEClassicControl::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y)

 {
 {

-  if ( m_windowStyle & wxTE_PASSWORD )
-  {
-   ControlEditTextSelectionRec selection ;
-   TEHandle teH ;
-   long size ;
-   
-   ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
-   
-   selection.selStart = from ;
-   selection.selEnd = to ;
-   
-   ::SetControlData( m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ;
-   TESetSelect( selection.selStart , selection.selEnd , teH ) ;
-  }
-  else
-  {
-    STPTextPaneVars **tpvars;
-        /* set up our locals */
-    tpvars = (STPTextPaneVars **) GetControlReference(m_macControl);
-        /* and our drawing environment as the operation
-        may force a redraw in the text area. */
-    SetPort((**tpvars).fDrawingEnvironment);
-        /* change the selection */
-    TXNSetSelection( (**tpvars).fTXNRec, from, to);
-  }
-}
+    Point where = { y , x } ;
+    ControlPartCode result = kControlNoPart;

 
 

-bool wxTextCtrl::LoadFile(const wxString& file)
-{
-    if ( wxTextCtrlBase::LoadFile(file) )
+    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference( m_controlRef );
+    if ( (textctrl != NULL) && textctrl->MacIsReallyShown() )

     {
     {

-        return TRUE;
+        if (PtInRect( where, &m_txnControlBounds ))
+        {
+            result = kControlEditTextPart ;
+        }
+        else
+        {
+            // sometimes we get the coords also in control local coordinates, therefore test again
+            int x = 0 , y = 0 ;
+            textctrl->MacClientToRootWindow( &x , &y ) ;
+            where.h += x ;
+            where.v += y ;
+
+            if (PtInRect( where, &m_txnControlBounds ))
+                result = kControlEditTextPart ;
+        }

     }
 
     }
 

-    return FALSE;
+    return result;

 }
 
 }
 

-void wxTextCtrl::WriteText(const wxString& text)
+wxInt16 wxMacMLTEClassicControl::MacControlUserPaneTrackingProc( wxInt16 x, wxInt16 y, void* WXUNUSED(actionProc) )

 {
 {

-    wxString value ;
-    if( wxApp::s_macDefaultEncodingIsPC )
-        value = wxMacMakeMacStringFromPC( text ) ;
-    else
-        value = text ;
-    if ( m_windowStyle & wxTE_PASSWORD )
+    ControlPartCode result = kControlNoPart;
+
+    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference( m_controlRef );
+    if ( (textctrl != NULL) && textctrl->MacIsReallyShown() )

     {
     {

-      TEHandle teH ;
-      long size ;
-          
-      ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
-        TEInsert( value , value.Length() , teH ) ;
-        }
-        else
+        Point startPt = { y , x } ;
+
+        // for compositing, we must convert these into toplevel window coordinates, because hittesting expects them
+        int x = 0 , y = 0 ;
+        textctrl->MacClientToRootWindow( &x , &y ) ;
+        startPt.h += x ;
+        startPt.v += y ;
+
+        switch (MacControlUserPaneHitTestProc( startPt.h , startPt.v ))

         {
         {

-        STPTextPaneVars **tpvars;
-            /* set up locals */
-        tpvars = (STPTextPaneVars **) GetControlReference(m_macControl);
-            /* set the text in the record */
-        TXNSetData( (**tpvars).fTXNRec, kTXNTextData,  (const char*)value, value.Length(),
-          kTXNUseCurrentSelection, kTXNUseCurrentSelection);
+            case kControlEditTextPart :
+            {
+                wxMacWindowClipper clipper( textctrl ) ;
+                EventRecord rec ;
+
+                ConvertEventRefToEventRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) ;
+                TXNClick( m_txn, &rec );
+            }
+                break;
+
+            default :
+                break;

         }
         }

-        Refresh() ;
-}
+    }

 
 

-void wxTextCtrl::AppendText(const wxString& text)
-{
-    SetInsertionPointEnd();
-    WriteText(text);
+    return result;

 }
 
 }
 

-void wxTextCtrl::Clear()
+void wxMacMLTEClassicControl::MacControlUserPaneIdleProc()

 {
 {

-  if ( m_windowStyle & wxTE_PASSWORD )
-  {
+    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );
+    if ( textctrl == NULL )
+        return ;

 
 

-    ::SetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 0 , (char*) ((const char*)NULL) ) ;
-  }
-  else
-  {
-    mUPDoEditCommand( m_macControl , kmUPClear) ;
-  }
-       Refresh() ;
-}
+    if (textctrl->MacIsReallyShown())
+    {
+        if (IsControlActive(m_controlRef))
+        {
+            Point mousep;

 
 

-bool wxTextCtrl::IsModified() const
-{
-    return TRUE;
+            wxMacWindowClipper clipper( textctrl ) ;
+            GetMouse(&mousep);
+
+            TXNIdle(m_txn);
+
+            if (PtInRect(mousep, &m_txnControlBounds))
+            {
+                RgnHandle theRgn = NewRgn();
+                RectRgn(theRgn, &m_txnControlBounds);
+                TXNAdjustCursor(m_txn, theRgn);
+                DisposeRgn(theRgn);
+            }
+        }
+    }

 }
 
 }
 

-bool wxTextCtrl::IsEditable() const
+wxInt16 wxMacMLTEClassicControl::MacControlUserPaneKeyDownProc (wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers)

 {
 {

-    return IsEnabled();
+    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );
+    if ( textctrl == NULL )
+        return kControlNoPart;
+
+    wxMacWindowClipper clipper( textctrl ) ;
+
+    EventRecord ev ;
+    memset( &ev , 0 , sizeof( ev ) ) ;
+    ev.what = keyDown ;
+    ev.modifiers = modifiers ;
+    ev.message = ((keyCode << 8) & keyCodeMask) | (charCode & charCodeMask);
+    TXNKeyDown( m_txn , &ev );
+
+    return kControlEntireControl;

 }
 
 }
 

-bool wxTextCtrl::AcceptsFocus() const
+void wxMacMLTEClassicControl::MacControlUserPaneActivateProc(bool activating)

 {
 {

-    // we don't want focus if we can't be edited
-    return IsEditable() && wxControl::AcceptsFocus();
+    MacActivatePaneText( activating );

 }
 
 }
 

-wxSize wxTextCtrl::DoGetBestSize() const
+wxInt16 wxMacMLTEClassicControl::MacControlUserPaneFocusProc(wxInt16 action)

 {
 {

-    int wText = 100 ;
-    
-    int hText ;
-        if ( UMAHasAppearance() )
-            hText = 13 ;
-        else
-            hText = 24 ;
-    hText += 2 * m_macHorizontalBorder ;
-/*
-    int cx, cy;
-    wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
+    ControlPartCode focusResult = kControlFocusNoPart;

 
 

-    int wText = DEFAULT_ITEM_WIDTH;
+    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );
+    if ( textctrl == NULL )
+        return focusResult;

 
 

-    int hText = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
+    wxMacWindowClipper clipper( textctrl ) ;

 
 

-    return wxSize(wText, hText);
-*/
-    if ( m_windowStyle & wxTE_MULTILINE )
+    ControlRef controlFocus = NULL ;
+    GetKeyboardFocus( m_txnWindow , &controlFocus ) ;
+    bool wasFocused = ( controlFocus == m_controlRef ) ;
+
+    switch (action)

     {
     {

-        hText *= wxMin(GetNumberOfLines(), 5);
+        case kControlFocusPrevPart:
+        case kControlFocusNextPart:
+            MacFocusPaneText( !wasFocused );
+            focusResult = (!wasFocused ? (ControlPartCode) kControlEditTextPart : (ControlPartCode) kControlFocusNoPart);
+            break;
+
+        case kControlFocusNoPart:
+        default:
+            MacFocusPaneText( false );
+            focusResult = kControlFocusNoPart;
+            break;

     }
     }

-    //else: for single line control everything is ok
-    return wxSize(wText, hText);
-}

 
 

-// ----------------------------------------------------------------------------
-// Undo/redo
-// ----------------------------------------------------------------------------
+    return focusResult;
+}

 
 

-void wxTextCtrl::Undo()
+void wxMacMLTEClassicControl::MacControlUserPaneBackgroundProc( void *WXUNUSED(info) )

 {
 {

-    if (CanUndo())
-    {
-    }

 }
 
 }
 

-void wxTextCtrl::Redo()
+wxMacMLTEClassicControl::wxMacMLTEClassicControl( wxTextCtrl *wxPeer,
+    const wxString& str,
+    const wxPoint& pos,
+    const wxSize& size, long style )
+    : wxMacMLTEControl( wxPeer )

 {
 {

-    if (CanRedo())
+    m_font = wxPeer->GetFont() ;
+    m_windowStyle = style ;
+    Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ;
+
+    short featureSet =
+        kControlSupportsEmbedding | kControlSupportsFocus | kControlWantsIdle
+        | kControlWantsActivate  | kControlHandlesTracking
+//    | kControlHasSpecialBackground
+        | kControlGetsFocusOnClick | kControlSupportsLiveFeedback;
+
+   OSStatus err = ::CreateUserPaneControl(
+        MAC_WXHWND(wxPeer->GetParent()->MacGetTopLevelWindowRef()),
+        &bounds, featureSet, &m_controlRef );
+    verify_noerr( err );
+
+    DoCreate();
+
+    AdjustCreationAttributes( *wxWHITE , true ) ;
+
+    MacSetObjectVisibility( wxPeer->MacIsReallyShown() ) ;
+

     {
     {

+        wxString st = str ;
+        wxMacConvertNewlines10To13( &st ) ;
+        wxMacWindowClipper clipper( m_peer ) ;
+        SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ;
+        TXNSetSelection( m_txn, 0, 0 ) ;

     }
 }
 
     }
 }
 

-bool wxTextCtrl::CanUndo() const
+wxMacMLTEClassicControl::~wxMacMLTEClassicControl()

 {
 {

-    return FALSE ;
+    TXNDeleteObject( m_txn );
+    m_txn = NULL ;

 }
 
 }
 

-bool wxTextCtrl::CanRedo() const
+void wxMacMLTEClassicControl::VisibilityChanged(bool shown)

 {
 {

-    return FALSE ;
+    MacSetObjectVisibility( shown ) ;
+    wxMacControl::VisibilityChanged( shown ) ;

 }
 
 }
 

-// Makes 'unmodified'
-void wxTextCtrl::DiscardEdits()
+void wxMacMLTEClassicControl::SuperChangedPosition()

 {
 {

-    // TODO
+    MacUpdatePosition() ;
+    wxMacControl::SuperChangedPosition() ;

 }
 
 }
 

-int wxTextCtrl::GetNumberOfLines() const
+#ifdef __WXMAC_OSX__
+
+ControlUserPaneDrawUPP gTPDrawProc = NULL;
+ControlUserPaneHitTestUPP gTPHitProc = NULL;
+ControlUserPaneTrackingUPP gTPTrackProc = NULL;
+ControlUserPaneIdleUPP gTPIdleProc = NULL;
+ControlUserPaneKeyDownUPP gTPKeyProc = NULL;
+ControlUserPaneActivateUPP gTPActivateProc = NULL;
+ControlUserPaneFocusUPP gTPFocusProc = NULL;
+
+static pascal void wxMacControlUserPaneDrawProc(ControlRef control, SInt16 part)

 {
 {

-  // TODO change this if possible to reflect real lines
-  wxString content = GetValue() ;
-       
-       int count = 1;
-       for (int i = 0; i < content.Length() ; i++)
-       {
-           if (content[i] == '\r') count++;
-       }
-       
-  return count;
+    wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
+    wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
+    if ( win )
+        win->MacControlUserPaneDrawProc( part ) ;

 }
 
 }
 

-long wxTextCtrl::XYToPosition(long x, long y) const
+static pascal ControlPartCode wxMacControlUserPaneHitTestProc(ControlRef control, Point where)

 {
 {

-    // TODO
-    return 0;
+    wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
+    wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
+    if ( win )
+        return win->MacControlUserPaneHitTestProc( where.h , where.v ) ;
+    else
+        return kControlNoPart ;

 }
 
 }
 

-bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
+static pascal ControlPartCode wxMacControlUserPaneTrackingProc(ControlRef control, Point startPt, ControlActionUPP actionProc)

 {
 {

-    return FALSE ;
+    wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
+    wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
+    if ( win )
+        return win->MacControlUserPaneTrackingProc( startPt.h , startPt.v , (void*) actionProc ) ;
+    else
+        return kControlNoPart ;

 }
 
 }
 

-void wxTextCtrl::ShowPosition(long pos)
+static pascal void wxMacControlUserPaneIdleProc(ControlRef control)

 {
 {

-    // TODO
+    wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
+    wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
+    if ( win )
+        win->MacControlUserPaneIdleProc() ;

 }
 
 }
 

-int wxTextCtrl::GetLineLength(long lineNo) const
+static pascal ControlPartCode wxMacControlUserPaneKeyDownProc(ControlRef control, SInt16 keyCode, SInt16 charCode, SInt16 modifiers)

 {
 {

-  // TODO change this if possible to reflect real lines
-  wxString content = GetValue() ;
-       
-       // Find line first
-       int count = 0;
-       for (int i = 0; i < content.Length() ; i++)
-       {
-           if (count == lineNo)
-           {
-               // Count chars in line then
-               count = 0;
-               for (int j = i; j < content.Length(); j++)
-               {
-                   count++;
-                   if (content[j] == '\r') return count;
-               }
-               
-               return count;
-           }
-           if (content[i] == '\r') count++;
-       }
-    return 0;
+    wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
+    wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
+    if ( win )
+        return win->MacControlUserPaneKeyDownProc( keyCode, charCode, modifiers ) ;
+    else
+        return kControlNoPart ;

 }
 
 }
 

-wxString wxTextCtrl::GetLineText(long lineNo) const
+static pascal void wxMacControlUserPaneActivateProc(ControlRef control, Boolean activating)

 {
 {

-  // TODO change this if possible to reflect real lines
-  wxString content = GetValue() ;
-
-       // Find line first
-       int count = 0;
-       for (int i = 0; i < content.Length() ; i++)
-       {
-           if (count == lineNo)
-           {
-               // Add chars in line then
-               wxString tmp("");
-               
-               for (int j = i; j < content.Length(); j++)
-               {
-                   if (content[j] == '\r')
-                       return tmp;
-                       
-                   tmp += content[j];
-               }
-               
-               return tmp;
-           }
-           if (content[i] == '\r') count++;
-       }
-    return wxString("");
-}
-
-/*
- * Text item
- */
- 
-void wxTextCtrl::Command(wxCommandEvent & event)
+    wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
+    wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
+    if ( win )
+        win->MacControlUserPaneActivateProc( activating ) ;
+}
+
+static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control, ControlFocusPart action)

 {
 {

-    SetValue (event.GetString());
-    ProcessCommand (event);
+    wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
+    wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
+    if ( win )
+        return win->MacControlUserPaneFocusProc( action ) ;
+    else
+        return kControlNoPart ;

 }
 
 }
 

-void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event)
+#if 0
+static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, ControlBackgroundPtr info)

 {
 {

-    // By default, load the first file into the text window.
-    if (event.GetNumberOfFiles() > 0)
-    {
-        LoadFile(event.GetFiles()[0]);
-    }
+    wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
+    wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
+    if ( win )
+        win->MacControlUserPaneBackgroundProc(info) ;

 }
 }

+#endif

 
 

-void wxTextCtrl::OnChar(wxKeyEvent& event)
+#endif // __WXMAC_OSX__
+
+// TXNRegisterScrollInfoProc
+
+OSStatus wxMacMLTEClassicControl::DoCreate()

 {
 {

-    switch ( event.KeyCode() )
-    {
-        case WXK_RETURN:
-            if (m_windowStyle & wxPROCESS_ENTER)
-            {
-                wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
-                event.SetEventObject( this );
-                if ( GetEventHandler()->ProcessEvent(event) )
-                    return;
-            } 
-            if ( !(m_windowStyle & wxTE_MULTILINE) )
-            {
-                wxWindow *parent = GetParent();
-                while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) {
-                  parent = parent->GetParent() ;
-                }
-                if ( parent && parent->GetDefaultItem() )
-                {
-                    wxButton *def = wxDynamicCast(parent->GetDefaultItem(),
-                                                          wxButton);
-                    if ( def && def->IsEnabled() )
-                    {
-                        wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
-                        event.SetEventObject(def);
-                        def->Command(event);
-                        return ;
-                   }
-                }
-            }
-            //else: multiline controls need Enter for themselves
+    Rect bounds;
+    OSStatus err = noErr ;
+
+    // set up our globals
+#ifdef __WXMAC_OSX__
+    if (gTPDrawProc == NULL) gTPDrawProc = NewControlUserPaneDrawUPP(wxMacControlUserPaneDrawProc);
+    if (gTPHitProc == NULL) gTPHitProc = NewControlUserPaneHitTestUPP(wxMacControlUserPaneHitTestProc);
+    if (gTPTrackProc == NULL) gTPTrackProc = NewControlUserPaneTrackingUPP(wxMacControlUserPaneTrackingProc);
+    if (gTPIdleProc == NULL) gTPIdleProc = NewControlUserPaneIdleUPP(wxMacControlUserPaneIdleProc);
+    if (gTPKeyProc == NULL) gTPKeyProc = NewControlUserPaneKeyDownUPP(wxMacControlUserPaneKeyDownProc);
+    if (gTPActivateProc == NULL) gTPActivateProc = NewControlUserPaneActivateUPP(wxMacControlUserPaneActivateProc);
+    if (gTPFocusProc == NULL) gTPFocusProc = NewControlUserPaneFocusUPP(wxMacControlUserPaneFocusProc);
+
+    if (gTXNScrollInfoProc == NULL ) gTXNScrollInfoProc = NewTXNScrollInfoUPP(TXNScrollInfoProc) ;
+    if (gTXNScrollActionProc == NULL ) gTXNScrollActionProc = NewControlActionUPP(TXNScrollActionProc) ;
+#endif

 
 

-            break;
+    // set the initial settings for our private data

 
 

-        case WXK_TAB:
-            // always produce navigation event - even if we process TAB
-            // ourselves the fact that we got here means that the user code
-            // decided to skip processing of this TAB - probably to let it
-            // do its default job.
-            {
-                wxNavigationKeyEvent eventNav;
-                eventNav.SetDirection(!event.ShiftDown());
-                eventNav.SetWindowChange(event.ControlDown());
-                eventNav.SetEventObject(this);
+    m_txnWindow = GetControlOwner(m_controlRef);
+    m_txnPort = (GrafPtr) GetWindowPort(m_txnWindow);

 
 

-                if ( GetParent()->GetEventHandler()->ProcessEvent(eventNav) )
-                    return;
-                event.Skip() ;
-                return ;
-            }
-            break;
+#ifdef __WXMAC_OSX__
+    // set up the user pane procedures
+    SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneDrawProcTag, sizeof(gTPDrawProc), &gTPDrawProc);
+    SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneHitTestProcTag, sizeof(gTPHitProc), &gTPHitProc);
+    SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneTrackingProcTag, sizeof(gTPTrackProc), &gTPTrackProc);
+    SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneIdleProcTag, sizeof(gTPIdleProc), &gTPIdleProc);
+    SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneKeyDownProcTag, sizeof(gTPKeyProc), &gTPKeyProc);
+    SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneActivateProcTag, sizeof(gTPActivateProc), &gTPActivateProc);
+    SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneFocusProcTag, sizeof(gTPFocusProc), &gTPFocusProc);
+#endif
+
+    // calculate the rectangles used by the control
+    UMAGetControlBoundsInWindowCoords( m_controlRef, &bounds );
+
+    m_txnControlBounds = bounds ;
+    m_txnVisBounds = bounds ;
+
+    CGrafPtr origPort ;
+    GDHandle origDev ;
+
+    GetGWorld( &origPort, &origDev ) ;
+    SetPort( m_txnPort );
+
+    // create the new edit field
+    TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( m_windowStyle );
+
+#ifdef __WXMAC_OSX__
+    // the scrollbars are not correctly embedded but are inserted at the root:
+    // this gives us problems as we have erratic redraws even over the structure area
+
+    m_sbHorizontal = 0 ;
+    m_sbVertical = 0 ;
+    m_lastHorizontalValue = 0 ;
+    m_lastVerticalValue = 0 ;
+
+    Rect sb = { 0 , 0 , 0 , 0 } ;
+    if ( frameOptions & kTXNWantVScrollBarMask )
+    {
+        CreateScrollBarControl( m_txnWindow, &sb, 0, 0, 100, 1, true, gTXNScrollActionProc, &m_sbVertical );
+        SetControlReference( m_sbVertical, (SInt32)this );
+        SetControlAction( m_sbVertical, gTXNScrollActionProc );
+        ShowControl( m_sbVertical );
+        EmbedControl( m_sbVertical , m_controlRef );
+        frameOptions &= ~kTXNWantVScrollBarMask;

     }
 
     }
 

-    EventRecord *ev = wxTheApp->MacGetCurrentEvent() ;
-    short keycode ;
-    short keychar ;
-    keychar = short(ev->message & charCodeMask);
-    keycode = short(ev->message & keyCodeMask) >> 8 ;
-    UMAHandleControlKey( m_macControl , keycode , keychar , ev->modifiers ) ;
-    if ( keychar >= 0x20 || event.KeyCode() == WXK_RETURN || event.KeyCode() == WXK_DELETE || event.KeyCode() == WXK_BACK)
+    if ( frameOptions & kTXNWantHScrollBarMask )

     {
     {

-        wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
-        event.SetString( GetValue() ) ;
-        event.SetEventObject( this );
-        GetEventHandler()->ProcessEvent(event);
+        CreateScrollBarControl( m_txnWindow, &sb, 0, 0, 100, 1, true, gTXNScrollActionProc, &m_sbHorizontal );
+        SetControlReference( m_sbHorizontal, (SInt32)this );
+        SetControlAction( m_sbHorizontal, gTXNScrollActionProc );
+        ShowControl( m_sbHorizontal );
+        EmbedControl( m_sbHorizontal, m_controlRef );
+        frameOptions &= ~(kTXNWantHScrollBarMask | kTXNDrawGrowIconMask);

     }
 
     }
 

+#endif
+
+    err = TXNNewObject(
+        NULL, m_txnWindow, &bounds, frameOptions,
+        kTXNTextEditStyleFrameType, kTXNTextensionFile, kTXNSystemDefaultEncoding,
+        &m_txn, &m_txnFrameID, NULL );
+    verify_noerr( err );
+
+#if 0
+    TXNControlTag iControlTags[] = { kTXNUseCarbonEvents };
+    TXNControlData iControlData[] = { { (UInt32)&cInfo } };
+    int toptag = WXSIZEOF( iControlTags ) ;
+    TXNCarbonEventInfo cInfo ;
+    cInfo.useCarbonEvents = false ;
+    cInfo.filler = 0 ;
+    cInfo.flags = 0 ;
+    cInfo.fDictionary = NULL ;
+
+    verify_noerr( TXNSetTXNObjectControls( m_txn, false, toptag, iControlTags, iControlData ) );
+#endif
+
+#ifdef __WXMAC_OSX__
+    TXNRegisterScrollInfoProc( m_txn, gTXNScrollInfoProc, (SInt32)this );
+#endif
+
+    SetGWorld( origPort , origDev ) ;
+
+    return err;

 }
 }

+#endif

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// standard handlers for standard edit menu events
+// MLTE control implementation (OSX part)

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void wxTextCtrl::OnCut(wxCommandEvent& event)
-{
-    Cut();
-}
+#if TARGET_API_MAC_OSX

 
 

-void wxTextCtrl::OnCopy(wxCommandEvent& event)
-{
-    Copy();
-}
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+
+// tiger multi-line textcontrols with no CR in the entire content
+// don't scroll automatically, so we need a hack.
+// This attempt only works 'before' the key (ie before CallNextEventHandler)
+// is processed, thus the scrolling always occurs one character too late, but
+// better than nothing ...

 
 

-void wxTextCtrl::OnPaste(wxCommandEvent& event)
+static const EventTypeSpec eventList[] =

 {
 {

-    Paste();
-}
+    { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } ,
+} ;

 
 

-void wxTextCtrl::OnUndo(wxCommandEvent& event)
+static pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , EventRef event , void *data )

 {
 {

-    Undo();
+    OSStatus result = eventNotHandledErr ;
+    wxMacMLTEHIViewControl* focus = (wxMacMLTEHIViewControl*) data ;
+
+    switch ( GetEventKind( event ) )
+    {
+        case kEventTextInputUnicodeForKeyEvent :
+        {
+            if ( UMAGetSystemVersion() >= 0x1040 )
+            {
+                TXNOffset from , to ;
+                TXNGetSelection( focus->GetTXNObject() , &from , &to ) ;
+                if ( from == to )
+                    TXNShowSelection( focus->GetTXNObject() , kTXNShowStart );
+            }
+            result = CallNextEventHandler(handler,event);
+            break;
+        }
+        default:
+            break ;
+    }
+
+    return result ;

 }
 
 }
 

-void wxTextCtrl::OnRedo(wxCommandEvent& event)
+static pascal OSStatus wxMacTextControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )

 {
 {

-    Redo();
+    OSStatus result = eventNotHandledErr ;
+
+    switch ( GetEventClass( event ) )
+    {
+        case kEventClassTextInput :
+            result = wxMacUnicodeTextEventHandler( handler , event , data ) ;
+            break ;
+
+        default :
+            break ;
+    }
+    return result ;

 }
 
 }
 

-void wxTextCtrl::OnUpdateCut(wxUpdateUIEvent& event)
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacTextControlEventHandler )
+
+wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer,
+    const wxString& str,
+    const wxPoint& pos,
+    const wxSize& size, long style ) : wxMacMLTEControl( wxPeer )

 {
 {

-    event.Enable( CanCut() );
+    m_font = wxPeer->GetFont() ;
+    m_windowStyle = style ;
+    Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ;
+    wxString st = str ;
+    wxMacConvertNewlines10To13( &st ) ;
+
+    HIRect hr = {
+        { bounds.left , bounds.top },
+        { bounds.right - bounds.left, bounds.bottom - bounds.top } } ;
+
+    m_scrollView = NULL ;
+    TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( style ) ;
+    if (( frameOptions & (kTXNWantVScrollBarMask | kTXNWantHScrollBarMask)) || !(frameOptions &kTXNSingleLineOnlyMask))
+    {
+        if ( frameOptions & (kTXNWantVScrollBarMask | kTXNWantHScrollBarMask) )
+        {
+            HIScrollViewCreate(
+                (frameOptions & kTXNWantHScrollBarMask ? kHIScrollViewOptionsHorizScroll : 0)
+                | (frameOptions & kTXNWantVScrollBarMask ? kHIScrollViewOptionsVertScroll : 0) ,
+                &m_scrollView ) ;
+        }
+        else
+        {
+            HIScrollViewCreate(kHIScrollViewOptionsVertScroll,&m_scrollView);
+            HIScrollViewSetScrollBarAutoHide(m_scrollView,true);
+        }
+
+        HIViewSetFrame( m_scrollView, &hr );
+        HIViewSetVisible( m_scrollView, true );
+    }
+
+    m_textView = NULL ;
+    HITextViewCreate( NULL , 0, frameOptions , &m_textView ) ;
+    m_txn = HITextViewGetTXNObject( m_textView ) ;
+    HIViewSetVisible( m_textView , true ) ;
+    if ( m_scrollView )
+    {
+        HIViewAddSubview( m_scrollView , m_textView ) ;
+        m_controlRef = m_scrollView ;
+        wxPeer->MacInstallEventHandler( (WXWidget) m_textView ) ;
+    }
+    else
+    {
+        HIViewSetFrame( m_textView, &hr );
+        m_controlRef = m_textView ;
+    }
+
+    AdjustCreationAttributes( *wxWHITE , true ) ;
+#ifndef __LP64__
+    wxMacWindowClipper c( m_peer ) ;
+#endif
+    SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ;
+
+    TXNSetSelection( m_txn, 0, 0 );
+    TXNShowSelection( m_txn, kTXNShowStart );
+
+    InstallControlEventHandler( m_textView , GetwxMacTextControlEventHandlerUPP(),
+                                GetEventTypeCount(eventList), eventList, this,
+                                NULL);

 }
 
 }
 

-void wxTextCtrl::OnUpdateCopy(wxUpdateUIEvent& event)
+wxMacMLTEHIViewControl::~wxMacMLTEHIViewControl()

 {
 {

-    event.Enable( CanCopy() );

 }
 
 }
 

-void wxTextCtrl::OnUpdatePaste(wxUpdateUIEvent& event)
+OSStatus wxMacMLTEHIViewControl::SetFocus( ControlFocusPart focusPart )

 {
 {

-    event.Enable( CanPaste() );
+    return SetKeyboardFocus( GetControlOwner( m_textView ), m_textView, focusPart ) ;

 }
 
 }
 

-void wxTextCtrl::OnUpdateUndo(wxUpdateUIEvent& event)
+bool wxMacMLTEHIViewControl::HasFocus() const

 {
 {

-    event.Enable( CanUndo() );
+    ControlRef control ;
+    if ( GetUserFocusWindow() == NULL )
+        return false;
+        
+    GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
+    return control == m_textView ;

 }
 
 }
 

-void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
+void wxMacMLTEHIViewControl::SetBackground( const wxBrush &brush )

 {
 {

-    event.Enable( CanRedo() );
-}
+    wxMacMLTEControl::SetBackground( brush ) ;
+
+#if 0
+    CGColorSpaceRef rgbSpace = CGColorSpaceCreateDeviceRGB();
+    RGBColor col = MAC_WXCOLORREF(brush.GetColour().GetPixel()) ;
+
+    float component[4] ;
+    component[0] = col.red / 65536.0 ;
+    component[1] = col.green / 65536.0 ;
+    component[2] = col.blue / 65536.0 ;
+    component[3] = 1.0 ; // alpha

 
 

+    CGColorRef color = CGColorCreate( rgbSpace , component );
+    HITextViewSetBackgroundColor( m_textView , color );
+    CGColorSpaceRelease( rgbSpace );

 #endif
 #endif

+}
+
+#endif // MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+

 
 #endif
 
 #endif

-    // wxUSE_TEXTCTRL
+
+#endif // wxUSE_TEXTCTRL