X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d2a8de2f81d3a3eca0f5c0ea1a04e2a9dd684642..4813bb8d72d4e6821e031f2b19baaa338b714d39:/src/mac/carbon/textctrl.cpp

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 58e7befd83..a8bcfbdef9 100644
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        textctrl.cpp
+// Name:        src/mac/carbon/textctrl.cpp
 // Purpose:     wxTextCtrl
 // Author:      Stefan Csomor
 // Modified by: Ryan Norton (MLTE GetLineLength and GetLineText)
@@ -9,24 +9,31 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "textctrl.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #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__
-  #include <sys/types.h>
-  #include <sys/stat.h>
+    #include <sys/types.h>
+    #include <sys/stat.h>
 #else
-  #include <stat.h>
+    #include <stat.h>
 #endif
 
-#include "wx/msgdlg.h"
-
 #if wxUSE_STD_IOSTREAM
     #if wxUSE_IOSTREAMH
         #include <fstream.h>
@@ -35,56 +42,22 @@
     #endif
 #endif
 
-#include "wx/app.h"
-#include "wx/dc.h"
-#include "wx/button.h"
-#include "wx/toplevel.h"
-#include "wx/textctrl.h"
-#include "wx/settings.h"
 #include "wx/filefn.h"
-#include "wx/utils.h"
 #include "wx/sysopt.h"
-#include "wx/menu.h"
-#include "wx/intl.h"
-
-#if defined(__BORLANDC__) && !defined(__WIN32__)
-  #include <alloc.h>
-#elif !defined(__MWERKS__) && !defined(__GNUWIN32) && !defined(__DARWIN__)
-  #include <malloc.h>
-#endif
-
-#ifndef __DARWIN__
-#include <Scrap.h>
-#endif
-
-// if this is set to 1 then under OSX 10.2 the 'classic' MLTE implementation will be used
-// if set to 0 then the unicode textctrl will be used
-#ifndef wxMAC_AWAYS_USE_MLTE
-#define wxMAC_AWAYS_USE_MLTE 1
-#endif
-
-#ifndef __WXMAC_OSX__
-enum
-{
-    kTXNVisibilityTag             = 'visb' /*set the visibility state of the object  */
-};
-#endif
+#include "wx/thread.h"
 
-#ifndef __DARWIN__
-#include <MacTextEditor.h>
-#include <ATSUnicode.h>
-#include <TextCommon.h>
-#include <TextEncodingConverter.h>
-#endif
 #include "wx/mac/uma.h"
+#include "wx/mac/carbon/private/mactext.h"
 
 class wxMacFunctor
 {
 public :
-    wxMacFunctor(){}
+    wxMacFunctor() {}
     virtual ~wxMacFunctor() {}
+
     virtual void* operator()() = 0 ;
-    static void* CallBackProc(void *param)
+
+    static void* CallBackProc( void *param )
     {
         wxMacFunctor* f = (wxMacFunctor*) param ;
         void *result = (*f)() ;
@@ -92,14 +65,15 @@ public :
     }
 } ;
 
-template<typename classtype,typename param1type>
+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(  )
+        wxMacFunctor()
     {
         m_object = obj ;
         m_function = f ;
@@ -107,45 +81,46 @@ public :
     }
 
     wxMacObjectFunctor1( classtype *obj , ref_function f , param1type p1 ) :
-        wxMacFunctor(  )
+        wxMacFunctor()
     {
         m_object = obj ;
         m_refFunction = f ;
         m_param1 = p1 ;
     }
 
-    ~wxMacObjectFunctor1() {}
+    virtual ~wxMacObjectFunctor1() {}
 
     virtual void* operator()()
     {
-        (m_object->*m_function)(m_param1) ;
+        (m_object->*m_function)( m_param1 ) ;
         return NULL ;
     }
+
 private :
     classtype* m_object ;
     param1type m_param1 ;
     union
     {
-    function m_function ;
-    ref_function m_refFunction ;
+        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) ;
+    wxMacObjectFunctor1<classtype, param1type> params(object, function, p1) ;
     void *result =
-        MPRemoteCall( wxMacFunctor::CallBackProc , &params  , kMPOwningProcessRemoteContext ) ;
+        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) ;
+    wxMacObjectFunctor1<classtype,param1type> params(object, function, p1) ;
     void *result =
-        MPRemoteCall( wxMacFunctor::CallBackProc , &params  , kMPOwningProcessRemoteContext ) ;
+        MPRemoteCall( wxMacFunctor::CallBackProc , &params , kMPOwningProcessRemoteContext ) ;
     return result ;
 }
 
@@ -166,52 +141,80 @@ void* wxMacMPRemoteGUICall( classtype *object , void (classtype::*function)( con
     wxMutexGuiEnter() ;
     return result ;
 }
-// common interface for all implementations
-class wxMacTextControl : public wxMacControl
+
+class WXDLLEXPORT wxMacPortSaver
 {
-public :
-    wxMacTextControl( wxTextCtrl *peer ) ;
-    ~wxMacTextControl() ;
+    DECLARE_NO_COPY_CLASS(wxMacPortSaver)
 
-    virtual wxString GetStringValue() const = 0 ;
-    virtual void SetStringValue( const wxString &val ) = 0 ;
-    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 ) = 0 ;
-    virtual void SetSelection( long from , long to ) = 0 ;
-    virtual void GetSelection( long* from, long* to) const = 0 ;
-    virtual void WriteText(const wxString& str) = 0 ;
+public:
+    wxMacPortSaver( GrafPtr port );
+    ~wxMacPortSaver();
+private :
+    GrafPtr m_port;
+};
 
-    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 WXUNUSED(pos) ) ;
-    virtual int GetLineLength(long lineNo) const ;
-    virtual wxString GetLineText(long lineNo) const ;
-    virtual bool SetupCursor( const wxPoint& pt ) { return false ; }
-
-#ifndef __WXMAC_OSX__
-    virtual void            MacControlUserPaneDrawProc(wxInt16 part) = 0 ;
-    virtual wxInt16         MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) = 0 ;
-    virtual wxInt16         MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) = 0 ;
-    virtual void            MacControlUserPaneIdleProc() = 0 ;
-    virtual wxInt16         MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) = 0 ;
-    virtual void            MacControlUserPaneActivateProc(bool activating) = 0 ;
-    virtual wxInt16         MacControlUserPaneFocusProc(wxInt16 action) = 0 ;
-    virtual void            MacControlUserPaneBackgroundProc(void* info) = 0 ;
-#endif
-} ;
+
+/*
+ Clips to the visible region of a control within the current port
+ */
+
+class WXDLLEXPORT wxMacWindowClipper : public wxMacPortSaver
+{
+    DECLARE_NO_COPY_CLASS(wxMacWindowClipper)
+
+public:
+    wxMacWindowClipper( const wxWindow* win );
+    ~wxMacWindowClipper();
+private:
+    GrafPtr   m_newPort;
+    RgnHandle m_formerClip;
+    RgnHandle m_newClip;
+};
+
+wxMacPortSaver::wxMacPortSaver( GrafPtr port )
+{
+    ::GetPort( &m_port );
+    ::SetPort( port );
+}
+
+wxMacPortSaver::~wxMacPortSaver()
+{
+    ::SetPort( m_port );
+}
+
+wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) :
+wxMacPortSaver( (GrafPtr) GetWindowPort( (WindowRef) win->MacGetTopLevelWindowRef() ) )
+{
+    m_newPort = (GrafPtr) GetWindowPort( (WindowRef) win->MacGetTopLevelWindowRef() ) ;
+    m_formerClip = NewRgn() ;
+    m_newClip = NewRgn() ;
+    GetClip( m_formerClip ) ;
+    
+    if ( win )
+    {
+        // guard against half constructed objects, this just leads to a empty clip
+        if ( win->GetPeer() )
+        {
+            int x = 0 , y = 0;
+            win->MacWindowToRootWindow( &x, &y ) ;
+            
+            // get area including focus rect
+            HIShapeGetAsQDRgn( ((wxWindow*)win)->MacGetVisibleRegion(true).GetWXHRGN() , m_newClip );
+            if ( !EmptyRgn( m_newClip ) )
+                OffsetRgn( m_newClip , x , y ) ;
+        }
+        
+        SetClip( m_newClip ) ;
+    }
+}
+
+wxMacWindowClipper::~wxMacWindowClipper()
+{
+    SetPort( m_newPort ) ;
+    SetClip( m_formerClip ) ;
+    DisposeRgn( m_newClip ) ;
+    DisposeRgn( m_formerClip ) ;
+}
 
 // common parts for implementations based on MLTE
 
@@ -219,27 +222,41 @@ class wxMacMLTEControl : public wxMacTextControl
 {
 public :
     wxMacMLTEControl( wxTextCtrl *peer ) ;
+
     virtual wxString GetStringValue() const ;
-    virtual void SetStringValue( const wxString &str) ;
+    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) ;
+    void AdjustCreationAttributes( const wxColour& background, bool visible ) ;
+
+    virtual void SetFont( const wxFont & font, const wxColour& foreground, long windowStyle ) ;
+    virtual void SetBackgroundColour(const wxColour& col );
+    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 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 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 void WriteText( const wxString& str ) ;
+
+    virtual bool HasOwnContextMenu() const
+    {
+        TXNCommandEventSupportOptions options ;
+        TXNGetCommandEventSupport( m_txn , & options ) ;
+        return options & kTXNSupportEditCommandProcessing ;
+    }
+
+    virtual void CheckSpelling(bool check)
+    {
+        TXNSetSpellCheckAsYouType( m_txn, (Boolean) check );
+    }
     virtual void Clear() ;
 
     virtual bool CanUndo() const ;
@@ -254,18 +271,16 @@ public :
     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 :
@@ -273,41 +288,16 @@ public :
                              const wxString& str,
                              const wxPoint& pos,
                              const wxSize& size, long style ) ;
+    virtual ~wxMacMLTEHIViewControl() ;
+
     virtual OSStatus SetFocus( ControlFocusPart focusPart ) ;
     virtual bool HasFocus() const ;
+    virtual void SetBackgroundColour(const wxColour& col ) ;
+
 protected :
     HIViewRef m_scrollView ;
     HIViewRef m_textView ;
-} ;
-
-#endif
-
-class wxMacUnicodeTextControl : public wxMacTextControl
-{
-public :
-    wxMacUnicodeTextControl( wxTextCtrl *wxPeer,
-                             const wxString& str,
-                             const wxPoint& pos,
-                             const wxSize& size, long style ) ;
-    ~wxMacUnicodeTextControl();
-    virtual void VisibilityChanged(bool shown);
-    virtual wxString GetStringValue() const ;
-    virtual void SetStringValue( const wxString &str) ;
-    virtual void Copy();
-    virtual void Cut();
-    virtual void Paste();
-    virtual bool CanPaste() const;
-    virtual void SetEditable(bool editable) ;
-    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) ;
-protected :
-    // contains the tag for the content (is different for password and non-password controls)
-    OSType m_valueTag ;
-} ;
-
-#endif
+};
 
 // 'classic' MLTE implementation
 
@@ -318,7 +308,8 @@ public :
                              const wxString& str,
                              const wxPoint& pos,
                              const wxSize& size, long style ) ;
-    ~wxMacMLTEClassicControl() ;
+    virtual ~wxMacMLTEClassicControl() ;
+
     virtual void VisibilityChanged(bool shown) ;
     virtual void SuperChangedPosition() ;
 
@@ -331,7 +322,11 @@ public :
     virtual wxInt16         MacControlUserPaneFocusProc(wxInt16 action) ;
     virtual void            MacControlUserPaneBackgroundProc(void* info) ;
 
-    virtual bool            SetupCursor( const wxPoint& WXUNUSED(pt) ) { MacControlUserPaneIdleProc() ; return true ;}
+    virtual bool SetupCursor( const wxPoint& WXUNUSED(pt) )
+    {
+        MacControlUserPaneIdleProc();
+        return true;
+    }
 
     virtual void            SetRect( Rect *r ) ;
 
@@ -339,10 +334,10 @@ protected :
     OSStatus                 DoCreate();
 
     void                    MacUpdatePosition() ;
-    void                    MacActivatePaneText(Boolean setActive) ;
-    void                    MacFocusPaneText(Boolean setFocus) ;
+    void                    MacActivatePaneText(bool setActive) ;
+    void                    MacFocusPaneText(bool setFocus) ;
+    void                    MacSetObjectVisibility(bool vis) ;
 
-    void                    MacSetObjectVisibility(Boolean vis) ;
 private :
     TXNFrameID              m_txnFrameID ;
     GrafPtr                 m_txnPort ;
@@ -350,23 +345,22 @@ private :
     // bounds of the control as we last did set the txn frames
     Rect                    m_txnControlBounds ;
     Rect                    m_txnVisBounds ;
-#ifdef __WXMAC_OSX__
-    static pascal void      TXNScrollInfoProc (SInt32 iValue, SInt32 iMaximumValue,
-                                TXNScrollBarOrientation iScrollBarOrientation, SInt32 iRefCon) ;
-    static pascal void      TXNScrollActionProc( ControlRef controlRef , ControlPartCode partCode ) ;
+
+    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
-} ;
+};
 
-#define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL
 
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
 
-BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
-    EVT_ERASE_BACKGROUND( wxTextCtrl::OnEraseBackground )
+BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
     EVT_CHAR(wxTextCtrl::OnChar)
     EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
@@ -388,15 +382,15 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
     EVT_UPDATE_UI(wxID_SELECTALL, wxTextCtrl::OnUpdateSelectAll)
 END_EVENT_TABLE()
 
-// Text item
+
 void wxTextCtrl::Init()
 {
     m_editable = true ;
     m_dirty = false;
 
+    m_maxLength = 0;
     m_privateContextMenu = NULL;
-
-    m_maxLength = TE_UNLIMITED_LENGTH ;
+    m_triggerOnSetValue = true ;
 }
 
 wxTextCtrl::~wxTextCtrl()
@@ -404,73 +398,84 @@ wxTextCtrl::~wxTextCtrl()
     delete m_privateContextMenu;
 }
 
-
-bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
-           const wxString& str,
-           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 )
 {
     m_macIsUserPane = false ;
     m_editable = true ;
 
-    if ( ! ( style & wxNO_BORDER) )
-        style = ( style & ~wxBORDER_MASK) | wxSUNKEN_BORDER ;
+    if ( ! (style & wxNO_BORDER) )
+        style = (style & ~wxBORDER_MASK) | wxSUNKEN_BORDER ;
 
-    if ( !wxTextCtrlBase::Create(parent, id, pos, size, style & ~(wxHSCROLL|wxVSCROLL), validator, name) )
+    if ( !wxTextCtrlBase::Create( parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), validator, name ) )
         return false;
 
     if ( m_windowStyle & wxTE_MULTILINE )
     {
-        wxASSERT_MSG( !(m_windowStyle & wxTE_PROCESS_ENTER),
-                      wxT("wxTE_PROCESS_ENTER style is ignored for multiline text controls (they always process it)") );
-
+        // always turn on this style for multi-line controls
         m_windowStyle |= wxTE_PROCESS_ENTER;
         style |= wxTE_PROCESS_ENTER ;
     }
 
+    CreatePeer( str, pos, size, style );
+
+    MacPostControlCreate(pos, size) ;
+
+    // only now the embedding is correct and we can do a positioning update
+
+    MacSuperChangedPosition() ;
+
+    if ( m_windowStyle & wxTE_READONLY)
+        SetEditable( false ) ;
+
+    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 (wxSystemOptions::HasOption( wxMAC_TEXTCONTROL_USE_MLTE ) && (wxSystemOptions::GetOptionInt( wxMAC_TEXTCONTROL_USE_MLTE ) == 1))
     {
         forceMLTE = true ;
     }
 #endif
 
-#ifdef __WXMAC_OSX__
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
-    if ( UMAGetSystemVersion() >= 0x1030 && forceMLTE == false )
+    if ( UMAGetSystemVersion() >= 0x1050 )
+        forceMLTE = false;
+
+    if ( !forceMLTE )
     {
-        if ( m_windowStyle & wxTE_MULTILINE )
+        if ( m_windowStyle & wxTE_MULTILINE || ( UMAGetSystemVersion() >= 0x1050 ) )
             m_peer = new wxMacMLTEHIViewControl( this , str , pos , size , style ) ;
     }
-#endif
+
     if ( !m_peer )
     {
-        if ( !(m_windowStyle & wxTE_MULTILINE) && forceMLTE == false )
+        if ( !(m_windowStyle & wxTE_MULTILINE) && !forceMLTE )
+        {
             m_peer = new wxMacUnicodeTextControl( this , str , pos , size , style ) ;
+        }
     }
-#endif
+
+    // 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 ) ;
-    }
-
-    MacPostControlCreate(pos,size) ;
-
-    // only now the embedding is correct and we can do a positioning update
-
-    MacSuperChangedPosition() ;
-
-    if ( m_windowStyle & wxTE_READONLY)
-    {
-        SetEditable( false ) ;
-    }
-
-    SetCursor( wxCursor( wxCURSOR_IBEAM ) ) ;
-
-    return true;
+#endif
 }
 
 void wxTextCtrl::MacSuperChangedPosition()
@@ -484,8 +489,9 @@ void wxTextCtrl::MacVisibilityChanged()
     GetPeer()->VisibilityChanged( MacIsReallyShown() ) ;
 }
 
-void wxTextCtrl::MacEnabledStateChanged()
+void wxTextCtrl::MacCheckSpelling(bool check)
 {
+    GetPeer()->CheckSpelling(check);
 }
 
 wxString wxTextCtrl::GetValue() const
@@ -498,18 +504,18 @@ void wxTextCtrl::GetSelection(long* from, long* to) const
     GetPeer()->GetSelection( from , to ) ;
 }
 
-void wxTextCtrl::SetValue(const wxString& str)
+void wxTextCtrl::DoSetValue(const wxString& str, int flags)
 {
     // optimize redraws
     if ( GetValue() == str )
-        return ;
+        return;
 
-    GetPeer()->SetStringValue(str) ;
+    GetPeer()->SetStringValue( str ) ;
 
-    wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
-    event.SetString( GetValue() ) ;
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent(event);
+    if ( (flags & SetValue_SendEvent) && m_triggerOnSetValue )
+    {
+        SendTextUpdatedEvent();
+    }
 }
 
 void wxTextCtrl::SetMaxLength(unsigned long len)
@@ -523,12 +529,14 @@ bool wxTextCtrl::SetFont( const wxFont& 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 ;
 }
 
@@ -536,16 +544,16 @@ bool wxTextCtrl::SetDefaultStyle(const wxTextAttr& style)
 {
     wxTextCtrlBase::SetDefaultStyle( style ) ;
     SetStyle( kTXNUseCurrentSelection , kTXNUseCurrentSelection , GetDefaultStyle() ) ;
+
     return true ;
 }
 
 // Clipboard operations
+
 void wxTextCtrl::Copy()
 {
     if (CanCopy())
-    {
         GetPeer()->Copy() ;
-    }
 }
 
 void wxTextCtrl::Cut()
@@ -554,9 +562,9 @@ void wxTextCtrl::Cut()
     {
         GetPeer()->Cut() ;
 
-        wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
+        wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );
         event.SetEventObject( this );
-        GetEventHandler()->ProcessEvent(event);
+        HandleWindowEvent( event );
       }
 }
 
@@ -565,11 +573,12 @@ void wxTextCtrl::Paste()
     if (CanPaste())
     {
         GetPeer()->Paste() ;
-        // eventually we should add setting the default style again
 
-        wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
+        // TODO: eventually we should add setting the default style again
+
+        wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );
         event.SetEventObject( this );
-        GetEventHandler()->ProcessEvent(event);
+        HandleWindowEvent( event );
     }
 }
 
@@ -577,19 +586,20 @@ bool wxTextCtrl::CanCopy() const
 {
     // Can copy if there's a selection
     long from, to;
-    GetSelection(& from, & to);
+    GetSelection( &from, &to );
+
     return (from != to);
 }
 
 bool wxTextCtrl::CanCut() const
 {
     if ( !IsEditable() )
-    {
-        return false ;
-    }
+        return false;
+
     // Can cut if there's a selection
     long from, to;
-    GetSelection(& from, & to);
+    GetSelection( &from, &to );
+
     return (from != to);
 }
 
@@ -618,24 +628,25 @@ void wxTextCtrl::SetInsertionPoint(long pos)
 void wxTextCtrl::SetInsertionPointEnd()
 {
     wxTextPos pos = GetLastPosition();
-    SetInsertionPoint(pos);
+    SetInsertionPoint( pos );
 }
 
 long wxTextCtrl::GetInsertionPoint() const
 {
-    long begin,end ;
+    long begin, end ;
     GetSelection( &begin , &end ) ;
+
     return begin ;
 }
 
 wxTextPos wxTextCtrl::GetLastPosition() const
 {
-    return GetPeer()->GetLastPosition( ) ;
+    return GetPeer()->GetLastPosition() ;
 }
 
 void wxTextCtrl::Replace(long from, long to, const wxString& str)
 {
-    GetPeer()->Replace( from , to , str) ;
+    GetPeer()->Replace( from , to , str ) ;
 }
 
 void wxTextCtrl::Remove(long from, long to)
@@ -648,36 +659,25 @@ void wxTextCtrl::SetSelection(long from, long to)
     GetPeer()->SetSelection( from , to ) ;
 }
 
-bool wxTextCtrl::LoadFile(const wxString& file)
-{
-    if ( wxTextCtrlBase::LoadFile(file) )
-    {
-        return true;
-    }
-
-    return false;
-}
-
 void wxTextCtrl::WriteText(const wxString& str)
 {
-    // TODO this MPRemoting will be moved into a remoting peer proxy for any command
+    // TODO: this MPRemoting will be moved into a remoting peer proxy for any command
     if ( !wxIsMainThread() )
     {
-        // unfortunately CW 8 is not able to correctly deduce the template types, so we have
-        // to instantiate explicitly
+        // 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 ;
     }
-    else
-    {
-        GetPeer()->WriteText( str ) ;
-    }
+
+    GetPeer()->WriteText( str ) ;
 }
 
 void wxTextCtrl::AppendText(const wxString& text)
 {
     SetInsertionPointEnd();
-    WriteText(text);
+    WriteText( text );
 }
 
 void wxTextCtrl::Clear()
@@ -703,24 +703,26 @@ bool wxTextCtrl::AcceptsFocus() const
 
 wxSize wxTextCtrl::DoGetBestSize() const
 {
-    int wText = 100 ;
+    int wText, hText;
 
-    int hText;
+    // these are the numbers from the HIG:
+    // we reduce them by the borders first
+    wText = 100 ;
 
-    // these are the numbers from the HIG, we reduce them by the borders
-    // first
-
-    switch( m_windowVariant )
+    switch ( m_windowVariant )
     {
         case wxWINDOW_VARIANT_NORMAL :
             hText = 22 - 6 ;
             break ;
+
         case wxWINDOW_VARIANT_SMALL :
             hText = 19 - 6 ;
             break ;
+
         case wxWINDOW_VARIANT_MINI :
-            hText= 15 - 6 ;
+            hText = 15 - 6 ;
             break ;
+
         default :
             hText = 22 - 6;
             break ;
@@ -729,9 +731,7 @@ wxSize wxTextCtrl::DoGetBestSize() const
     // 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 ;
@@ -746,34 +746,28 @@ wxSize wxTextCtrl::DoGetBestSize() const
 void wxTextCtrl::Undo()
 {
     if (CanUndo())
-    {
         GetPeer()->Undo() ;
-    }
 }
 
 void wxTextCtrl::Redo()
 {
     if (CanRedo())
-    {
         GetPeer()->Redo() ;
-    }
 }
 
 bool wxTextCtrl::CanUndo() const
 {
     if ( !IsEditable() )
-    {
         return false ;
-    }
+
     return GetPeer()->CanUndo() ;
 }
 
 bool wxTextCtrl::CanRedo() const
 {
     if ( !IsEditable() )
-    {
         return false ;
-    }
+
     return GetPeer()->CanRedo() ;
 }
 
@@ -799,7 +793,7 @@ long wxTextCtrl::XYToPosition(long x, long y) const
 
 bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
 {
-    return GetPeer()->PositionToXY(pos , x , y ) ;
+    return GetPeer()->PositionToXY( pos , x , y ) ;
 }
 
 void wxTextCtrl::ShowPosition(long pos)
@@ -817,32 +811,17 @@ wxString wxTextCtrl::GetLineText(long lineNo) const
     return GetPeer()->GetLineText(lineNo) ;
 }
 
-/*
- * Text item
- */
-
 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)
-    {
-        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() ;
+        LoadFile( event.GetFiles()[0] );
 }
 
 void wxTextCtrl::OnChar(wxKeyEvent& event)
@@ -850,29 +829,40 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
     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 & wxPROCESS_ENTER) || (m_windowStyle & wxTE_MULTILINE) ) )
-/*        && key != WXK_PRIOR && key != WXK_NEXT && key != WXK_HOME && key != WXK_END */
+        !( 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, but still allow navigation and deletion
-    if ( !IsMultiLine() && GetValue().Length() >= m_maxLength &&
+    // 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 & wxPROCESS_ENTER) )
+        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;
     }
 
@@ -883,50 +873,50 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
     {
         if ( CanPaste() )
             Paste() ;
+
         return ;
     }
+
     if ( key == 'x' && event.MetaDown() )
     {
         if ( CanCut() )
             Cut() ;
+
         return ;
     }
+
     switch ( key )
     {
         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) )
+                if ( HandleWindowEvent(event) )
                     return;
             }
+
             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);
+
                         return ;
                     }
                 }
 
                 // this will make wxWidgets eat the ENTER key so that
-                // we actually prevent line wrapping in a single line
-                // text control
+                // we actually prevent line wrapping in a single line text control
                 eat_key = true;
             }
-
             break;
 
         case WXK_TAB:
@@ -938,46 +928,37 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
                 if (event.ControlDown())
                     flags |= wxNavigationKeyEvent::WinChange ;
                 Navigate(flags);
+
                 return;
             }
             else
             {
-                // This is necessary (don't know why) or the tab will not
-                // be inserted.
+                // This is necessary (don't know why);
+                // otherwise the tab will not be inserted.
                 WriteText(wxT("\t"));
+                eat_key = true;
             }
+            break;
 
+        default:
             break;
     }
 
     if (!eat_key)
     {
         // perform keystroke handling
-        if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL )
-            CallNextEventHandler((EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() , (EventRef) wxTheApp->MacGetCurrentEvent() ) ;
-        else
-        {
-            EventRecord rec ;
-            if ( wxMacConvertEventToRecord(  (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) )
-            {
-                EventRecord *ev = &rec ;
-                short keycode ;
-                short keychar ;
-                keychar = short(ev->message & charCodeMask);
-                keycode = short(ev->message & keyCodeMask) >> 8 ;
-
-                m_peer->HandleKey( keycode , keychar , ev->modifiers ) ;
-            }
-        }
+        event.Skip(true) ;
     }
+
     if ( ( key >= 0x20 && key < WXK_START ) ||
+         ( key >= WXK_NUMPAD0 && key <= WXK_DIVIDE ) ||
          key == WXK_RETURN ||
          key == WXK_DELETE ||
          key == WXK_BACK)
     {
         wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
         event1.SetEventObject( this );
-        wxPostEvent(GetEventHandler(),event1);
+        wxPostEvent( GetEventHandler(), event1 );
     }
 }
 
@@ -1013,9 +994,10 @@ void wxTextCtrl::OnRedo(wxCommandEvent& WXUNUSED(event))
 void wxTextCtrl::OnDelete(wxCommandEvent& WXUNUSED(event))
 {
     long from, to;
-    GetSelection(& from, & to);
+
+    GetSelection( &from, &to );
     if (from != -1 && to != -1)
-        Remove(from, to);
+        Remove( from, to );
 }
 
 void wxTextCtrl::OnSelectAll(wxCommandEvent& WXUNUSED(event))
@@ -1051,8 +1033,9 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
 void wxTextCtrl::OnUpdateDelete(wxUpdateUIEvent& event)
 {
     long from, to;
-    GetSelection(& from, & to);
-    event.Enable(from != -1 && to != -1 && from != to && IsEditable()) ;
+
+    GetSelection( &from, &to );
+    event.Enable( from != -1 && to != -1 && from != to && IsEditable() ) ;
 }
 
 void wxTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event)
@@ -1060,10 +1043,16 @@ void wxTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event)
     event.Enable(GetLastPosition() > 0);
 }
 
-// CS: Context Menus only work with mlte implementations or non-multiline HIViews at the moment
+// 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 ;
+    }
+
     if (m_privateContextMenu == NULL)
     {
         m_privateContextMenu = new wxMenu;
@@ -1084,56 +1073,12 @@ void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event)
 
 bool wxTextCtrl::MacSetupCursor( const wxPoint& pt )
 {
-    if ( !GetPeer()->SetupCursor(pt) )
+    if ( !GetPeer()->SetupCursor( pt ) )
         return wxWindow::MacSetupCursor( pt ) ;
     else
         return true ;
 }
-#if !TARGET_API_MAC_OSX
-
-// user pane implementation
-
-void wxTextCtrl::MacControlUserPaneDrawProc(wxInt16 part)
-{
-    GetPeer()->MacControlUserPaneDrawProc( part ) ;
-}
-
-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 ) ;
-}
-
-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 ) ;
-}
 
-wxInt16 wxTextCtrl::MacControlUserPaneFocusProc(wxInt16 action)
-{
-    return GetPeer()->MacControlUserPaneFocusProc( action ) ;
-}
-
-void wxTextCtrl::MacControlUserPaneBackgroundProc(void* info)
-{
-    GetPeer()->MacControlUserPaneBackgroundProc( info ) ;
-}
-
-#endif
 // ----------------------------------------------------------------------------
 // implementation base class
 // ----------------------------------------------------------------------------
@@ -1147,7 +1092,9 @@ wxMacTextControl::~wxMacTextControl()
 {
 }
 
-void wxMacTextControl::SetStyle(long start, long end, const wxTextAttr& style)
+void wxMacTextControl::SetStyle(long WXUNUSED(start),
+                                long WXUNUSED(end),
+                                const wxTextAttr& WXUNUSED(style))
 {
 }
 
@@ -1168,17 +1115,25 @@ bool wxMacTextControl::CanPaste() const
     return false ;
 }
 
-void wxMacTextControl::SetEditable(bool editable)
+void wxMacTextControl::SetEditable(bool WXUNUSED(editable))
 {
 }
 
 wxTextPos wxMacTextControl::GetLastPosition() const
 {
-    return GetStringValue().Length() ;
+    return GetStringValue().length() ;
 }
 
-void wxMacTextControl::Replace( long from , long to , const wxString str )
+void wxMacTextControl::Replace( long from , long to , const wxString &val )
 {
+    SetSelection( from , to ) ;
+    WriteText( val ) ;
+}
+
+void wxMacTextControl::Remove( long from , long to )
+{
+    SetSelection( from , to ) ;
+    WriteText( wxEmptyString) ;
 }
 
 void wxMacTextControl::Clear()
@@ -1191,7 +1146,9 @@ bool wxMacTextControl::CanUndo() const
     return false ;
 }
 
-void wxMacTextControl::Undo() { }
+void wxMacTextControl::Undo()
+{
+}
 
 bool wxMacTextControl::CanRedo()  const
 {
@@ -1202,12 +1159,14 @@ void wxMacTextControl::Redo()
 {
 }
 
-long wxMacTextControl::XYToPosition(long x, long y) const
+long wxMacTextControl::XYToPosition(long WXUNUSED(x), long WXUNUSED(y)) const
 {
     return 0 ;
 }
 
-bool wxMacTextControl::PositionToXY(long pos, long *x, long *y) const
+bool wxMacTextControl::PositionToXY(long WXUNUSED(pos),
+                                    long *WXUNUSED(x),
+                                    long *WXUNUSED(y)) const
 {
     return false ;
 }
@@ -1221,28 +1180,31 @@ int wxMacTextControl::GetNumberOfLines() const
     ItemCount lines = 0 ;
     wxString content = GetStringValue() ;
     lines = 1;
-    for (size_t i = 0; i < content.Length() ; i++)
+
+    for (size_t i = 0; i < content.length() ; i++)
     {
-        if (content[i] == '\r') lines++;
+        if (content[i] == '\r')
+            lines++;
     }
+
     return lines ;
 }
 
 wxString wxMacTextControl::GetLineText(long lineNo) const
 {
-    // TODO change this if possible to reflect real lines
+    // TODO: change this if possible to reflect real lines
     wxString content = GetStringValue() ;
 
     // Find line first
     int count = 0;
-    for (size_t i = 0; i < content.Length() ; i++)
+    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++)
+            for (size_t j = i; j < content.length(); j++)
             {
                 if (content[j] == '\n')
                     return tmp;
@@ -1252,34 +1214,41 @@ wxString wxMacTextControl::GetLineText(long lineNo) const
 
             return tmp;
         }
-        if (content[i] == '\n') count++;
+
+        if (content[i] == '\n')
+            count++;
     }
+
     return wxEmptyString ;
 }
 
-int  wxMacTextControl::GetLineLength(long lineNo) const
+int wxMacTextControl::GetLineLength(long lineNo) const
 {
-    // TODO change this if possible to reflect real lines
+    // TODO: change this if possible to reflect real lines
     wxString content = GetStringValue() ;
 
     // Find line first
     int count = 0;
-    for (size_t i = 0; i < content.Length() ; i++)
+    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++)
+            for (size_t j = i; j < content.length(); j++)
             {
                 count++;
-                if (content[j] == '\n') return count;
+                if (content[j] == '\n')
+                    return count;
             }
 
             return count;
         }
-        if (content[i] == '\n') count++;
+
+        if (content[i] == '\n')
+            count++;
     }
+
     return 0 ;
 }
 
@@ -1287,28 +1256,103 @@ int  wxMacTextControl::GetLineLength(long lineNo) const
 // 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 ;
+
+        default :
+            break ;
+    }
+    return result ;
+}
+
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacUnicodeTextControlEventHandler )
+
+wxMacUnicodeTextControl::wxMacUnicodeTextControl( wxTextCtrl *wxPeer ) : wxMacTextControl( wxPeer )
+{
+}
 
 wxMacUnicodeTextControl::wxMacUnicodeTextControl( wxTextCtrl *wxPeer,
-                         const wxString& str,
-                         const wxPoint& pos,
-                         const wxSize& size, long style ) : wxMacTextControl( 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()) ;
+    wxCFStringRef cf(st , m_font.GetEncoding()) ;
     CFStringRef cfr = cf ;
-    Boolean isPassword = ( m_windowStyle & wxTE_PASSWORD ) != 0 ;
-    m_valueTag = isPassword ? kControlEditTextPasswordCFStringTag : kControlEditTextCFStringTag ;
-    CreateEditUnicodeTextControl( MAC_WXHWND(wxPeer->MacGetTopLevelWindowRef()), &bounds , cfr , isPassword , NULL , &m_controlRef ) ;
+
+    m_valueTag = kControlEditTextCFStringTag ;
+    CreateControl( wxPeer, &bounds, cfr );
 
     if ( !(m_windowStyle & wxTE_MULTILINE) )
-    {
         SetData<Boolean>( kControlEditTextPart , kControlEditTextSingleLineTag , true ) ;
-    }
+
+    InstallControlEventHandler( m_controlRef , GetwxMacUnicodeTextControlEventHandlerUPP(),
+                                GetEventTypeCount(unicodeTextControlEventList), unicodeTextControlEventList, this,
+                                NULL);
+
+    return true;
 }
 
 wxMacUnicodeTextControl::~wxMacUnicodeTextControl()
@@ -1319,112 +1363,163 @@ 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
+        // 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( GetData<CFStringRef>( 0, m_valueTag, &value ) );
         verify_noerr( SetData<CFStringRef>( 0, m_valueTag, &value ) );
         verify_noerr( SetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &sel ) );
 
         CFRelease( value ) ;
     }
 }
+
 wxString wxMacUnicodeTextControl::GetStringValue() const
 {
     wxString result ;
-    CFStringRef value = GetData<CFStringRef>(0,m_valueTag) ;
+    CFStringRef value = GetData<CFStringRef>(0, m_valueTag) ;
     if ( value )
     {
-        wxMacCFStringHolder cf(value) ;
+        wxCFStringRef cf(value) ;
         result = cf.AsString() ;
     }
+
 #if '\n' == 10
     wxMacConvertNewlines13To10( &result ) ;
 #else
     wxMacConvertNewlines10To13( &result ) ;
 #endif
+
     return result ;
 }
-void wxMacUnicodeTextControl::SetStringValue( const wxString &str)
+
+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 ) ) ;
+    wxCFStringRef 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 );
+}
+
 void wxMacUnicodeTextControl::Copy()
 {
     SendHICommand( kHICommandCopy ) ;
 }
+
 void wxMacUnicodeTextControl::Cut()
 {
     SendHICommand( kHICommandCut ) ;
 }
+
 void wxMacUnicodeTextControl::Paste()
 {
     SendHICommand( kHICommandPaste ) ;
 }
+
 bool wxMacUnicodeTextControl::CanPaste() const
 {
     return true ;
 }
-void wxMacUnicodeTextControl::SetEditable(bool editable)
-{
-    SetData<Boolean>( 0 , kControlEditTextLockedTag , (Boolean) !editable ) ;
-}
-void wxMacUnicodeTextControl::Remove( long from , long to )
+
+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
+void wxMacUnicodeTextControl::GetSelection( long* from, long* to ) const
 {
     ControlEditTextSelectionRec sel ;
-    verify_noerr(GetData<ControlEditTextSelectionRec>(  0, kControlEditTextSelectionTag, &sel ) ) ;
-    if ( from ) *from = sel.selStart ;
-    if ( to ) *to = sel.selEnd ;
+    if (HasFocus())
+        verify_noerr( GetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &sel ) ) ;
+    else
+        sel = m_selection ;
+
+    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 )
+    {
+        wxCFStringRef cf(value) ;
+        textLength = cf.AsString().length() ;
+    }
+
     if ((from == -1) && (to == -1))
     {
         from = 0 ;
-        to = 32767 ; // sel has 16 bit signed values, max is 32767
+        to = textLength ;
     }
+    else
+    {
+        from = wxMin(textLength,wxMax(from,0)) ;
+        if ( to == -1 )
+            to = textLength;
+        else
+            to = wxMax(0,wxMin(textLength,to)) ;
+    }
+
     sel.selStart = from ;
     sel.selEnd = to ;
-    SetData<ControlEditTextSelectionRec>( 0 , kControlEditTextSelectionTag, &sel ) ;
+    if ( HasFocus() )
+        SetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &sel ) ;
+    else
+        m_selection = sel;
 }
 
-void wxMacUnicodeTextControl::WriteText(const wxString& str)
+void wxMacUnicodeTextControl::WriteText( const wxString& str )
 {
     wxString st = str ;
     wxMacConvertNewlines10To13( &st ) ;
-    #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
-        wxMacCFStringHolder cf(st , m_font.GetEncoding() ) ;
+
+    if ( HasFocus() )
+    {
+        wxCFStringRef cf(st , m_font.GetEncoding() ) ;
         CFStringRef value = cf ;
         SetData<CFStringRef>( 0, kControlEditTextInsertCFStringRefTag, &value );
-    #else
+    }
+    else
+    {
         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
+        SetSelection( start + str.length() , start + str.length() ) ;
+    }
 }
 
-#endif
-
 // ----------------------------------------------------------------------------
 // MLTE control implementation (common part)
 // ----------------------------------------------------------------------------
 
-// if mlte is on read only , no changes at all are allowed, not even from
+// 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
 
@@ -1442,20 +1537,21 @@ public :
             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 ) ;
-        }
     }
-    protected :
-        TXNObject m_txn ;
-        TXNControlData m_data[1] ;
+
+protected :
+    TXNObject m_txn ;
+    TXNControlData m_data[1] ;
 } ;
 
-wxMacMLTEControl::wxMacMLTEControl( wxTextCtrl *peer ) : wxMacTextControl( peer )
+wxMacMLTEControl::wxMacMLTEControl( wxTextCtrl *peer )
+    : wxMacTextControl( peer )
 {
     SetNeedsFocusRect( true ) ;
 }
@@ -1465,47 +1561,55 @@ wxString wxMacMLTEControl::GetStringValue() const
     wxString result ;
     OSStatus err ;
     Size actualSize = 0;
+
     {
 #if wxUSE_UNICODE
         Handle theText ;
-        err = TXNGetDataEncoded( m_txn , kTXNStartOffset, kTXNEndOffset, &theText , kTXNUnicodeTextData );
+        err = TXNGetDataEncoded( m_txn, kTXNStartOffset, kTXNEndOffset, &theText, kTXNUnicodeTextData );
+
         // all done
-        if ( err )
+        if ( err != noErr )
         {
             actualSize = 0 ;
         }
         else
         {
-            actualSize = GetHandleSize( theText ) / sizeof( UniChar) ;
+            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 ) ;
+                ptr = new wxChar[actualSize + 1] ;
+                wxStrncpy( ptr , (wxChar*)(*theText) , actualSize ) ;
 #else
-                SetHandleSize( theText , ( actualSize + 1 ) * sizeof( UniChar ) ) ;
+                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 ) ;
+                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
+
                 ptr[actualSize] = 0 ;
                 result = wxString( ptr ) ;
-                delete[] ptr ;
+                delete [] ptr ;
             }
+
             DisposeHandle( theText ) ;
         }
 #else
         Handle theText ;
-        err = TXNGetDataEncoded( m_txn , kTXNStartOffset, kTXNEndOffset, &theText , kTXNTextData );
+        err = TXNGetDataEncoded( m_txn , kTXNStartOffset, kTXNEndOffset, &theText, kTXNTextData );
+
         // all done
-        if ( err )
+        if ( err != noErr )
         {
             actualSize = 0 ;
         }
@@ -1518,73 +1622,79 @@ wxString wxMacMLTEControl::GetStringValue() const
                 result = wxString( *theText , wxConvLocal , actualSize ) ;
                 HUnlock( theText ) ;
             }
+
             DisposeHandle( theText ) ;
         }
 #endif
     }
+
 #if '\n' == 10
     wxMacConvertNewlines13To10( &result ) ;
 #else
     wxMacConvertNewlines10To13( &result ) ;
 #endif
+
     return result ;
 }
 
-void wxMacMLTEControl::SetStringValue( const wxString &str)
+void wxMacMLTEControl::SetStringValue( const wxString &str )
 {
-    wxString st = str ;
+    wxString st = str;
+    wxMacConvertNewlines10To13( &st );
 
-    wxMacConvertNewlines10To13( &st ) ;
     {
+#ifndef __LP64__
         wxMacWindowClipper c( m_peer ) ;
+#endif
+
         {
-            wxMacEditHelper help(m_txn) ;
-            SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ;
+            wxMacEditHelper help( m_txn );
+            SetTXNData( st, kTXNStartOffset, kTXNEndOffset );
         }
-        TXNSetSelection( m_txn, 0, 0);
-        TXNShowSelection( m_txn, kTXNShowStart);
+
+        TXNSetSelection( m_txn, 0, 0 );
+        TXNShowSelection( m_txn, kTXNShowStart );
     }
 }
 
 TXNFrameOptions wxMacMLTEControl::FrameOptionsFromWXStyle( long wxStyle )
 {
-    TXNFrameOptions frameOptions =
-        kTXNDontDrawCaretWhenInactiveMask
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
-        | kTXNDoFontSubstitutionMask
-#endif
-        ;
+    TXNFrameOptions frameOptions = kTXNDontDrawCaretWhenInactiveMask;
+
+    frameOptions |= kTXNDoFontSubstitutionMask;
 
-    if ( ! ( wxStyle & wxTE_NOHIDESEL ) )
+    if ( ! (wxStyle & wxTE_NOHIDESEL) )
         frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ;
 
+    if ( wxStyle & (wxHSCROLL | wxTE_DONTWRAP) )
+        frameOptions |= kTXNWantHScrollBarMask ;
+
     if ( wxStyle & wxTE_MULTILINE )
     {
-        if ( ! ( wxStyle & wxTE_DONTWRAP ) )
+        if ( ! (wxStyle & wxTE_DONTWRAP ) )
             frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
-        else
-        {
-            frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
-            frameOptions |= kTXNWantHScrollBarMask ;
-        }
 
-        if ( !(wxStyle & wxTE_NO_VSCROLL ) )
+        if ( !(wxStyle & wxTE_NO_VSCROLL) )
         {
             frameOptions |= kTXNWantVScrollBarMask ;
-            if ( frameOptions & kTXNWantHScrollBarMask )
-                frameOptions |= kTXNDrawGrowIconMask ;
+
+            // 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
+    {
         frameOptions |= kTXNSingleLineOnlyMask ;
-
-    if ( wxStyle & wxHSCROLL )
-        frameOptions |= kTXNWantHScrollBarMask ;
+    }
 
     return frameOptions ;
 }
 
-void wxMacMLTEControl::AdjustCreationAttributes( const wxColour &background, bool visible )
+void wxMacMLTEControl::AdjustCreationAttributes(const wxColour &background,
+                                                bool WXUNUSED(visible))
 {
     TXNControlTag iControlTags[] =
         {
@@ -1593,140 +1703,250 @@ void wxMacMLTEControl::AdjustCreationAttributes( const wxColour &background, boo
         };
     TXNControlData iControlData[] =
         {
-            {true},
-            {kTXNNoAutoWrap},
+            { true },
+            { kTXNNoAutoWrap },
         };
 
     int toptag = WXSIZEOF( iControlTags ) ;
 
     if ( m_windowStyle & wxTE_MULTILINE )
     {
-        if (m_windowStyle & wxTE_DONTWRAP)
-            iControlData[1].uValue = kTXNNoAutoWrap ;
-        else
-            iControlData[1].uValue = kTXNAutoWrap ;
+        iControlData[1].uValue =
+            (m_windowStyle & wxTE_DONTWRAP)
+            ? kTXNNoAutoWrap
+            : kTXNAutoWrap;
     }
-    verify_noerr( TXNSetTXNObjectControls( m_txn, false, toptag,
-                                        iControlTags, iControlData )) ;
 
-    // setting the default font
+    OSStatus err = TXNSetTXNObjectControls( m_txn, false, toptag, iControlTags, iControlData ) ;
+    verify_noerr( err );
+
+    // setting the default font:
     // under 10.2 this causes a visible caret, therefore we avoid it
 
-    if ( UMAGetSystemVersion() >= 0x1030 )
-    {
-        Str255 fontName ;
-        SInt16 fontSize ;
-        Style fontStyle ;
+    Str255 fontName ;
+    SInt16 fontSize ;
+    Style fontStyle ;
 
-        GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+    GetThemeFont( kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
 
-        TXNTypeAttributes typeAttr[] =
-        {
-            {   kTXNQDFontNameAttribute , kTXNQDFontNameAttributeSize , { (void*) fontName } } ,
-            {   kTXNQDFontSizeAttribute , kTXNFontSizeAttributeSize , { (void*) (fontSize << 16) } } ,
-            {   kTXNQDFontStyleAttribute , kTXNQDFontStyleAttributeSize , {  (void*) normal } } ,
-        } ;
+    TXNTypeAttributes typeAttr[] =
+    {
+        { kTXNQDFontNameAttribute , kTXNQDFontNameAttributeSize , { (void*) fontName } } ,
+        { kTXNQDFontSizeAttribute , kTXNFontSizeAttributeSize , { (void*) (fontSize << 16) } } ,
+        { kTXNQDFontStyleAttribute , kTXNQDFontStyleAttributeSize , { (void*) normal } } ,
+    } ;
 
-        verify_noerr( TXNSetTypeAttributes (m_txn, sizeof( typeAttr ) / sizeof(TXNTypeAttributes) , typeAttr,
-              kTXNStartOffset,
-              kTXNEndOffset) );
-    }
+    err = TXNSetTypeAttributes(
+        m_txn, sizeof(typeAttr) / sizeof(TXNTypeAttributes),
+        typeAttr, kTXNStartOffset, kTXNEndOffset );
+    verify_noerr( err );
 
     if ( m_windowStyle & wxTE_PASSWORD )
     {
-        UniChar c = 0xA5 ;
-        verify_noerr(TXNEchoMode( m_txn , c , 0 , true )) ;
+        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);
+    background.GetRGBColor( &tback.bg.color );
+    TXNSetBackground( m_txn , &tback );
+
+
+    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 ) ;
+    }
 }
 
-void wxMacMLTEControl::SetBackground( const wxBrush &brush )
+void wxMacMLTEControl::SetBackgroundColour(const wxColour& col )
 {
-    // currently only solid background are supported
     TXNBackground tback;
     tback.bgType = kTXNBackgroundTypeRGB;
-    tback.bg.color = MAC_WXCOLORREF( brush.GetColour().GetPixel() );
-    TXNSetBackground( m_txn , &tback);
+    col.GetRGBColor(&tback.bg.color);
+    TXNSetBackground( m_txn , &tback );
 }
 
-void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , long to)
+static inline int wxConvertToTXN(int x)
+{
+    return wx_static_cast(int, x / 254.0 * 72 + 0.5);
+}
+
+void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , long to )
 {
     TXNTypeAttributes typeAttr[4] ;
-    Str255 fontName = "\pMonaco" ;
-    SInt16 fontSize = 12 ;
-    Style fontStyle = normal ;
     RGBColor color ;
-    int attrCounter = 0 ;
+    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() )
     {
+        wxASSERT( typeAttrCount < WXSIZEOF(typeAttr) );
         const wxFont &font = style.GetFont() ;
-        wxMacStringToPascal( font.GetFaceName() , fontName ) ;
-        fontSize = font.GetPointSize() ;
-        if ( font.GetUnderlined() )
-            fontStyle |= underline ;
-        if ( font.GetWeight() == wxBOLD )
-            fontStyle |= bold ;
-        if ( font.GetStyle() == wxITALIC )
-            fontStyle |= italic ;
-
-        typeAttr[attrCounter].tag = kTXNQDFontNameAttribute ;
-        typeAttr[attrCounter].size = kTXNQDFontNameAttributeSize ;
-        typeAttr[attrCounter].data.dataPtr = (void*) fontName ;
-        typeAttr[attrCounter+1].tag = kTXNQDFontSizeAttribute ;
-        typeAttr[attrCounter+1].size = kTXNFontSizeAttributeSize ;
-        typeAttr[attrCounter+1].data.dataValue =  (fontSize << 16) ;
-        typeAttr[attrCounter+2].tag = kTXNQDFontStyleAttribute ;
-        typeAttr[attrCounter+2].size = kTXNQDFontStyleAttributeSize ;
-        typeAttr[attrCounter+2].data.dataValue = fontStyle ;
-        attrCounter += 3 ;
+        typeAttr[typeAttrCount].tag = kTXNATSUIStyle ;
+        typeAttr[typeAttrCount].size = kTXNATSUIStyleSize ;
+        typeAttr[typeAttrCount].data.dataPtr = font.MacGetATSUStyle() ;
+        typeAttrCount++ ;
     }
+
     if ( style.HasTextColour() )
     {
-        typeAttr[attrCounter].tag = kTXNQDFontColorAttribute ;
-        typeAttr[attrCounter].size = kTXNQDFontColorAttributeSize ;
-        typeAttr[attrCounter].data.dataPtr = (void*) &color ;
-        color = MAC_WXCOLORREF(style.GetTextColour().GetPixel()) ;
-        attrCounter += 1 ;
+        wxASSERT( typeAttrCount < WXSIZEOF(typeAttr) );
+        style.GetTextColour().GetRGBColor( &color );
+        typeAttr[typeAttrCount].tag = kTXNQDFontColorAttribute ;
+        typeAttr[typeAttrCount].size = kTXNQDFontColorAttributeSize ;
+        typeAttr[typeAttrCount].data.dataPtr = (void*) &color ;
+        typeAttrCount++ ;
+    }
+
+    if ( style.HasAlignment() )
+    {
+        wxASSERT( controlAttrCount < WXSIZEOF(controlTags) );
+        SInt32 align;
+
+        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;
+        }
+
+        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 = wxConvertToTXN(style.GetLeftIndent());
+        }
+        if ( style.HasRightIndent() )
+        {
+            margins.rightMargin = wxConvertToTXN(style.GetRightIndent());
+        }
+        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 = wxConvertToTXN(tabarray[0]);
+        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 ( attrCounter > 0 )
+
+    if ( relayout )
     {
-        verify_noerr( TXNSetTypeAttributes ( m_txn , attrCounter , typeAttr, from , to) );
+        TXNRecalcTextLayout( m_txn );
     }
 }
 
-void wxMacMLTEControl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle )
+void wxMacMLTEControl::SetFont(const wxFont & font,
+                               const wxColour& foreground,
+                               long WXUNUSED(windowStyle))
 {
-    wxMacEditHelper help(m_txn) ;
-    TXNSetAttribute( wxTextAttr(foreground,wxNullColour,font) , kTXNStartOffset,kTXNEndOffset ) ;
+    wxMacEditHelper help( m_txn ) ;
+    TXNSetAttribute( wxTextAttr( foreground, wxNullColour, font ), kTXNStartOffset, kTXNEndOffset ) ;
 }
-void wxMacMLTEControl::SetStyle(long start, long end, const wxTextAttr& style)
+
+void wxMacMLTEControl::SetStyle( long start, long end, const wxTextAttr& style )
 {
-    wxMacEditHelper help(m_txn) ;
-    TXNSetAttribute( style , start,end ) ;
+    wxMacEditHelper help( m_txn ) ;
+    TXNSetAttribute( style, start, end ) ;
 }
 
 void wxMacMLTEControl::Copy()
 {
-    ClearCurrentScrap();
-    TXNCopy(m_txn);
-    TXNConvertToPublicScrap();
+    TXNCopy( m_txn );
 }
 
 void wxMacMLTEControl::Cut()
 {
-    ClearCurrentScrap();
-    TXNCut(m_txn);
-    TXNConvertToPublicScrap();
+    TXNCut( m_txn );
 }
 
 void wxMacMLTEControl::Paste()
 {
-    TXNConvertFromPublicScrap();
-    TXNPaste(m_txn);
+    TXNPaste( m_txn );
 }
 
 bool wxMacMLTEControl::CanPaste() const
@@ -1738,7 +1958,7 @@ void wxMacMLTEControl::SetEditable(bool editable)
 {
     TXNControlTag tag[] = { kTXNIOPrivilegesTag } ;
     TXNControlData data[] = { { editable ? kTXNReadWrite : kTXNReadOnly } } ;
-    TXNSetTXNObjectControls( m_txn , false , WXSIZEOF(tag) , tag , data ) ;
+    TXNSetTXNObjectControls( m_txn, false, WXSIZEOF(tag), tag, data ) ;
 }
 
 wxTextPos wxMacMLTEControl::GetLastPosition() const
@@ -1746,80 +1966,100 @@ wxTextPos wxMacMLTEControl::GetLastPosition() const
     wxTextPos actualsize = 0 ;
 
     Handle theText ;
-    OSErr err = TXNGetDataEncoded( m_txn, 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
     {
-        actualsize = GetHandleSize( theText ) ;
-        DisposeHandle( theText ) ;
+        actualsize = 0 ;
     }
 
     return actualsize ;
 }
 
-void wxMacMLTEControl::Replace( long from , long to , const wxString str )
+void wxMacMLTEControl::Replace( long from , long to , const wxString &str )
 {
     wxString value = str ;
     wxMacConvertNewlines10To13( &value ) ;
 
     wxMacEditHelper help( m_txn ) ;
+#ifndef __LP64__
     wxMacWindowClipper c( m_peer ) ;
+#endif
 
-    TXNSetSelection(m_txn , from , to ) ;
+    TXNSetSelection( m_txn, from, to == -1 ? kTXNEndOffset : to ) ;
     TXNClear( m_txn ) ;
-    SetTXNData( value , kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ;
+    SetTXNData( value, kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ;
 }
 
 void wxMacMLTEControl::Remove( long from , long to )
 {
+#ifndef __LP64__
     wxMacWindowClipper c( m_peer ) ;
+#endif
     wxMacEditHelper help( m_txn ) ;
-    TXNSetSelection(m_txn , from , to ) ;
+    TXNSetSelection( m_txn , from , to ) ;
     TXNClear( m_txn ) ;
 }
 
 void wxMacMLTEControl::GetSelection( long* from, long* to) const
 {
-    TXNGetSelection( m_txn , (TXNOffset*) from , (TXNOffset*) to ) ;
+    TXNOffset f,t ;
+    TXNGetSelection( m_txn , &f , &t ) ;
+    *from = f;
+    *to = t;
 }
 
 void wxMacMLTEControl::SetSelection( long from , long to )
 {
+#ifndef __LP64__
     wxMacWindowClipper c( m_peer ) ;
-    /* change the selection */
+#endif
+
+    // change the selection
     if ((from == -1) && (to == -1))
-        TXNSelectAll(m_txn);
+        TXNSelectAll( m_txn );
     else
-        TXNSetSelection( m_txn, from, to);
-    TXNShowSelection( m_txn, kTXNShowStart);
+        TXNSetSelection( m_txn, from, to == -1 ? kTXNEndOffset : to );
+
+    TXNShowSelection( m_txn, kTXNShowStart );
 }
 
-void wxMacMLTEControl::WriteText(const wxString& str)
+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 ) ;
+        SetTXNData( st, kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ;
     }
-    GetSelection( &dummy , &end ) ;
-    // TODO SetStyle( start , end , GetDefaultStyle() ) ;
+
+    GetSelection( &dummy, &end ) ;
+
+    // TODO: SetStyle( start , end , GetDefaultStyle() ) ;
 }
 
 void wxMacMLTEControl::Clear()
 {
+#ifndef __LP64__
     wxMacWindowClipper c( m_peer ) ;
-    wxMacEditHelper st(m_txn) ;
+#endif
+    wxMacEditHelper st( m_txn ) ;
     TXNSetSelection( m_txn , kTXNStartOffset , kTXNEndOffset ) ;
-    TXNClear(m_txn);
+    TXNClear( m_txn ) ;
 }
 
 bool wxMacMLTEControl::CanUndo() const
@@ -1832,7 +2072,7 @@ void wxMacMLTEControl::Undo()
     TXNUndo( m_txn ) ;
 }
 
-bool wxMacMLTEControl::CanRedo()  const
+bool wxMacMLTEControl::CanRedo() const
 {
     return TXNCanRedo( m_txn , NULL ) ;
 }
@@ -1845,81 +2085,88 @@ void wxMacMLTEControl::Redo()
 int wxMacMLTEControl::GetNumberOfLines() const
 {
     ItemCount lines = 0 ;
-    TXNGetLineCount(m_txn, &lines ) ;
+    TXNGetLineCount( m_txn, &lines ) ;
+
     return lines ;
 }
 
 long wxMacMLTEControl::XYToPosition(long x, long y) const
 {
     Point curpt ;
+    wxTextPos lastpos ;
 
-    wxTextPos lastpos = GetLastPosition() ;
-
-    // TODO find a better implementation : while we can get the
+    // TODO: find a better implementation : while we can get the
     // line metrics of a certain line, we don't get its starting
     // position, so it would probably be rather a binary search
     // for the start position
-    long xpos = 0 ;
-    long ypos = 0 ;
+    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);
+        TXNOffsetToPoint( m_txn, n, &curpt ) ;
 
         if ( curpt.v > lastHeight )
         {
             xpos = 0 ;
             if ( n > 0 )
                 ++ypos ;
+
             lastHeight = curpt.v ;
         }
         else
             ++xpos ;
     }
+
     return 0 ;
 }
 
-bool wxMacMLTEControl::PositionToXY(long pos, long *x, long *y) const
+bool wxMacMLTEControl::PositionToXY( long pos, long *x, long *y ) const
 {
     Point curpt ;
+    wxTextPos lastpos ;
 
-    wxTextPos lastpos = GetLastPosition() ;
-
-    if ( y ) *y = 0 ;
-    if ( x ) *x = 0 ;
+    if ( y )
+        *y = 0 ;
+    if ( x )
+        *x = 0 ;
 
+    lastpos = GetLastPosition() ;
     if ( pos <= lastpos )
     {
-        // TODO find a better implementation : while we can get the
+        // TODO: find a better implementation - while we can get the
         // line metrics of a certain line, we don't get its starting
         // position, so it would probably be rather a binary search
         // for the start position
-        long xpos = 0 ;
-        long ypos = 0 ;
+        long xpos = 0, ypos = 0 ;
         int lastHeight = 0 ;
-
         ItemCount n ;
+
         for ( n = 0 ; n <= (ItemCount) pos ; ++n )
         {
-            TXNOffsetToPoint(m_txn ,  n , &curpt);
+            TXNOffsetToPoint( m_txn, n, &curpt ) ;
 
             if ( curpt.v > lastHeight )
             {
                 xpos = 0 ;
                 if ( n > 0 )
                     ++ypos ;
+
                 lastHeight = curpt.v ;
             }
             else
                 ++xpos ;
         }
-        if ( y ) *y = ypos ;
-        if ( x ) *x = xpos ;
+
+        if ( y )
+            *y = ypos ;
+        if ( x )
+            *x = xpos ;
     }
 
     return false ;
@@ -1927,72 +2174,63 @@ bool wxMacMLTEControl::PositionToXY(long pos, long *x, long *y) const
 
 void wxMacMLTEControl::ShowPosition( long pos )
 {
-#if TARGET_RT_MAC_MACHO && defined(AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER)
-    {
-        Point current ;
-        Point 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
-        if ( (UInt32) TXNScroll != (UInt32) kUnresolvedCFragSymbolAddress )
-        {
-            OSErr theErr = noErr;
-            SInt32 dv = desired.v - current.v ;
-            SInt32 dh = desired.h - current.h ;
-            TXNShowSelection( m_txn , true ) ;
-            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!") );
-        }
-    }
-#endif
+    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 )
+void wxMacMLTEControl::SetTXNData( const wxString& st, TXNOffset start, TXNOffset end )
 {
 #if wxUSE_UNICODE
 #if SIZEOF_WCHAR_T == 2
-    size_t len = st.Len() ;
-    TXNSetData( m_txn , kTXNUnicodeTextData,  (void*)st.wc_str(), len * 2,
-      start, end);
+    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);
+    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);
+    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() )
     {
-        long ypos = 0 ;
-
-        Fixed   lineWidth,
-                lineHeight,
-                currentHeight = 0;
+        Point firstPoint;
+        Fixed lineWidth, lineHeight, currentHeight;
+        long ypos ;
 
         // get the first possible position in the control
-        Point firstPoint;
         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);
@@ -2005,33 +2243,33 @@ wxString wxMacMLTEControl::GetLineText(long lineNo) const
 
         wxString content = GetStringValue() ;
         Point currentPoint = thePoint;
-        while(thePoint.v == currentPoint.v && theOffset < content.length())
+        while (thePoint.v == currentPoint.v && theOffset < content.length())
         {
             line += content[theOffset];
             TXNOffsetToPoint(m_txn, ++theOffset, &currentPoint);
         }
     }
+
     return line ;
 }
 
-int  wxMacMLTEControl::GetLineLength(long lineNo) const
+int wxMacMLTEControl::GetLineLength(long lineNo) const
 {
     int theLength = 0;
 
     if ( lineNo < GetNumberOfLines() )
     {
-        long ypos = 0 ;
-
-        Fixed   lineWidth,
-                lineHeight,
-                currentHeight = 0;
+        Point firstPoint;
+        Fixed lineWidth, lineHeight, currentHeight;
+        long ypos;
 
         // get the first possible position in the control
-        Point firstPoint;
         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);
@@ -2044,15 +2282,17 @@ int  wxMacMLTEControl::GetLineLength(long lineNo) const
 
         wxString content = GetStringValue() ;
         Point currentPoint = thePoint;
-        while(thePoint.v == currentPoint.v && theOffset < content.length())
+        while (thePoint.v == currentPoint.v && theOffset < content.length())
         {
             ++theLength;
             TXNOffsetToPoint(m_txn, ++theOffset, &currentPoint);
         }
     }
+
     return theLength ;
 }
 
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
 
 // ----------------------------------------------------------------------------
 // MLTE control implementation (classic part)
@@ -2064,13 +2304,12 @@ int  wxMacMLTEControl::GetLineLength(long lineNo) const
 // 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)
+pascal void wxMacMLTEClassicControl::TXNScrollInfoProc(
+    SInt32 iValue, SInt32 iMaximumValue,
+    TXNScrollBarOrientation iScrollBarOrientation, SInt32 iRefCon )
 {
     wxMacMLTEClassicControl* mlte = (wxMacMLTEClassicControl*) iRefCon ;
     SInt32 value =  wxMax( iValue , 0 ) ;
@@ -2098,7 +2337,6 @@ pascal void wxMacMLTEClassicControl::TXNScrollInfoProc (SInt32 iValue, SInt32 iM
 
 pascal void wxMacMLTEClassicControl::TXNScrollActionProc( ControlRef controlRef , ControlPartCode partCode )
 {
-    OSStatus err ;
     wxMacMLTEClassicControl* mlte = (wxMacMLTEClassicControl*) GetControlReference( controlRef ) ;
     if ( mlte == NULL )
         return ;
@@ -2106,40 +2344,47 @@ pascal void wxMacMLTEClassicControl::TXNScrollActionProc( ControlRef controlRef
     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 )  ;
+            delta = -GetControlViewSize( controlRef ) ;
             break ;
+
         case kControlIndicatorPart :
-            delta = value -
-                ( isHorizontal ? mlte->m_lastHorizontalValue : mlte->m_lastVerticalValue ) ;
+            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 )
+            if ( value + delta < minimum )
                 delta = minimum - value ;
             if ( value + delta > maximum )
                 delta = maximum - value ;
@@ -2151,8 +2396,10 @@ pascal void wxMacMLTEClassicControl::TXNScrollActionProc( ControlRef controlRef
         SInt32 verticalDelta = isHorizontal ? 0 : delta ;
         SInt32 horizontalDelta = isHorizontal ? delta : 0 ;
 
-        err = TXNScroll( mlte->m_txn , kTXNScrollUnitsInPixels, kTXNScrollUnitsInPixels,
-                                    &verticalDelta , &horizontalDelta  );
+        err = TXNScroll(
+            mlte->m_txn, kTXNScrollUnitsInPixels, kTXNScrollUnitsInPixels,
+            &verticalDelta, &horizontalDelta );
+        verify_noerr( err );
 
         if ( isHorizontal )
             mlte->m_lastHorizontalValue = newValue ;
@@ -2160,66 +2407,61 @@ pascal void wxMacMLTEClassicControl::TXNScrollActionProc( ControlRef controlRef
             mlte->m_lastVerticalValue = newValue ;
     }
 }
-#endif
 
 // make correct activations
-void wxMacMLTEClassicControl::MacActivatePaneText(Boolean setActive)
+void wxMacMLTEClassicControl::MacActivatePaneText(bool setActive)
 {
     wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
 
     wxMacWindowClipper clipper( textctrl ) ;
-    TXNActivate(m_txn, m_txnFrameID, setActive);
+    TXNActivate( m_txn, m_txnFrameID, setActive );
 
     ControlRef controlFocus = 0 ;
     GetKeyboardFocus( m_txnWindow , &controlFocus ) ;
     if ( controlFocus == m_controlRef )
-        TXNFocus( m_txn, setActive);
+        TXNFocus( m_txn, setActive );
 }
 
-void wxMacMLTEClassicControl::MacFocusPaneText(Boolean setFocus)
+void wxMacMLTEClassicControl::MacFocusPaneText(bool setFocus)
 {
-    TXNFocus( m_txn, setFocus);
+    TXNFocus( m_txn, setFocus );
 }
 
 // guards against inappropriate redraw (hidden objects drawing onto window)
 
-void wxMacMLTEClassicControl::MacSetObjectVisibility(Boolean vis)
+void wxMacMLTEClassicControl::MacSetObjectVisibility(bool vis)
 {
     ControlRef controlFocus = 0 ;
     GetKeyboardFocus( m_txnWindow , &controlFocus ) ;
 
-    if ( controlFocus == m_controlRef && vis == false )
-    {
+    if ( !vis && (controlFocus == m_controlRef ) )
         SetKeyboardFocus( m_txnWindow , m_controlRef , kControlFocusNoPart ) ;
-    }
 
     TXNControlTag iControlTags[1] = { kTXNVisibilityTag };
-    TXNControlData iControlData[1] = { {(UInt32) false } };
+    TXNControlData iControlData[1] = { { (UInt32)false } };
 
-    verify_noerr( TXNGetTXNObjectControls( m_txn , 1,
-                                        iControlTags, iControlData ) ) ;
+    verify_noerr( TXNGetTXNObjectControls( m_txn , 1, iControlTags, iControlData ) ) ;
 
     if ( iControlData[0].uValue != vis )
     {
         iControlData[0].uValue = vis ;
-        verify_noerr( TXNSetTXNObjectControls( m_txn, false , 1,
-                                        iControlTags, iControlData )) ;
+        verify_noerr( TXNSetTXNObjectControls( m_txn, false , 1, iControlTags, iControlData ) ) ;
     }
-    // we right now are always clipping 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
+
+    // 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);
+    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );
     if ( textctrl == NULL )
         return ;
 
     Rect bounds ;
-    UMAGetControlBoundsInWindowCoords(m_controlRef, &bounds);
+    GetRectInWindowCoords( &bounds );
 
     wxRect visRect = textctrl->MacGetClippedClientRect() ;
     Rect visBounds = { visRect.y , visRect.x , visRect.y + visRect.height , visRect.x + visRect.width } ;
@@ -2228,14 +2470,12 @@ void wxMacMLTEClassicControl::MacUpdatePosition()
     textctrl->MacWindowToRootWindow( &x , &y ) ;
     OffsetRect( &visBounds , x , y ) ;
 
-    if ( !EqualRect( &bounds , &m_txnControlBounds ) || !EqualRect( &visBounds , &m_txnVisBounds) )
+    if ( !EqualRect( &bounds, &m_txnControlBounds ) || !EqualRect( &visBounds, &m_txnVisBounds ) )
     {
         m_txnControlBounds = bounds ;
         m_txnVisBounds = visBounds ;
-        wxMacWindowClipper cl(textctrl) ;
+        wxMacWindowClipper cl( textctrl ) ;
 
-#ifdef __WXMAC_OSX__
-        bool isCompositing = textctrl->MacGetTopLevelWindow()->MacUsesCompositing() ;
         if ( m_sbHorizontal || m_sbVertical )
         {
             int w = bounds.right - bounds.left ;
@@ -2250,12 +2490,10 @@ void wxMacMLTEClassicControl::MacUpdatePosition()
                 sbBounds.right = w + 1 ;
                 sbBounds.bottom = h + 1 ;
 
-                if ( !isCompositing )
-                    OffsetRect( &sbBounds , m_txnControlBounds.left , m_txnControlBounds.top ) ;
-
                 SetControlBounds( m_sbHorizontal , &sbBounds ) ;
                 SetControlViewSize( m_sbHorizontal , w ) ;
             }
+
             if ( m_sbVertical )
             {
                 Rect sbBounds ;
@@ -2263,10 +2501,7 @@ void wxMacMLTEClassicControl::MacUpdatePosition()
                 sbBounds.left = w - 14 ;
                 sbBounds.top = -1 ;
                 sbBounds.right = w + 1 ;
-                sbBounds.bottom = m_sbHorizontal ? h - 14 : h + 1  ;
-
-                if ( !isCompositing )
-                    OffsetRect( &sbBounds , m_txnControlBounds.left , m_txnControlBounds.top ) ;
+                sbBounds.bottom = m_sbHorizontal ? h - 14 : h + 1 ;
 
                 SetControlBounds( m_sbVertical , &sbBounds ) ;
                 SetControlViewSize( m_sbVertical , h ) ;
@@ -2278,9 +2513,11 @@ void wxMacMLTEClassicControl::MacUpdatePosition()
         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 ) } ;
+            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 ) } ;
+            m_txnControlBounds.bottom - ( m_sbHorizontal ? 14 : 0 ) ,
+            m_txnControlBounds.right - ( m_sbVertical ? 14 : 0 ) } ;
 
         if ( olddestRect.right >= 10000 )
             destRect.right = destRect.left + 32000 ;
@@ -2290,27 +2527,26 @@ void wxMacMLTEClassicControl::MacUpdatePosition()
 
         SectRect( &viewRect , &visBounds , &viewRect ) ;
         TXNSetRectBounds( m_txn , &viewRect , &destRect , true ) ;
-/*
-        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);
-*/
-#else
 
-        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);
+#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
-        // the SetFrameBounds method unter classic sometimes does not correctly scroll a selection into sight after a
+
+        // the SetFrameBounds method under Classic sometimes does not correctly scroll a selection into sight after a
         // movement, therefore we have to force it
 
-        // according to David Surovell this problem also sometimes occurs under OSX, so we use this as well
-        
+        // this problem has been reported in OSX as well, so we use this here once again
+
         TXNLongRect textRect ;
         TXNGetRectBounds( m_txn , NULL , NULL , &textRect ) ;
         if ( textRect.left < m_txnControlBounds.left )
-        {
-            TXNShowSelection( m_txn , false ) ;
-        }
+            TXNShowSelection( m_txn , kTXNShowStart ) ;
     }
 }
 
@@ -2320,9 +2556,9 @@ void wxMacMLTEClassicControl::SetRect( Rect *r )
     MacUpdatePosition() ;
 }
 
-void wxMacMLTEClassicControl::MacControlUserPaneDrawProc(wxInt16 thePart)
+void wxMacMLTEClassicControl::MacControlUserPaneDrawProc(wxInt16 WXUNUSED(thePart))
 {
-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
+    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );
     if ( textctrl == NULL )
         return ;
 
@@ -2336,76 +2572,69 @@ void wxMacMLTEClassicControl::MacControlUserPaneDrawProc(wxInt16 thePart)
 wxInt16 wxMacMLTEClassicControl::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y)
 {
     Point where = { y , x } ;
-    ControlPartCode result;
-
-    result = 0;
-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
-    if ( textctrl == NULL )
-        return 0 ;
+    ControlPartCode result = kControlNoPart;
 
-    if (textctrl->MacIsReallyShown() )
+    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference( m_controlRef );
+    if ( (textctrl != NULL) && textctrl->MacIsReallyShown() )
     {
-        if (PtInRect(where, &m_txnControlBounds))
+        if (PtInRect( where, &m_txnControlBounds ))
+        {
             result = kControlEditTextPart ;
+        }
         else
         {
             // sometimes we get the coords also in control local coordinates, therefore test again
-            if ( textctrl->MacGetTopLevelWindow()->MacUsesCompositing() )
-            {
-                int x = 0 , y = 0 ;
-                textctrl->MacClientToRootWindow( &x , &y ) ;
-                where.h += x ;
-                where.v += y ;
-            }
-            if (PtInRect(where, &m_txnControlBounds))
+            int x = 0 , y = 0 ;
+            textctrl->MacClientToRootWindow( &x , &y ) ;
+            where.h += x ;
+            where.v += y ;
+
+            if (PtInRect( where, &m_txnControlBounds ))
                 result = kControlEditTextPart ;
-            else
-                result = 0;
         }
     }
+
     return result;
 }
 
-wxInt16 wxMacMLTEClassicControl::MacControlUserPaneTrackingProc( wxInt16 x, wxInt16 y, void* actionProc )
+wxInt16 wxMacMLTEClassicControl::MacControlUserPaneTrackingProc( wxInt16 x, wxInt16 y, void* WXUNUSED(actionProc) )
 {
-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
-    if ( textctrl == NULL )
-        return 0;
+    ControlPartCode result = kControlNoPart;
 
-    ControlPartCode partCodeResult = 0;
-
-    if (textctrl->MacIsReallyShown() )
+    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference( m_controlRef );
+    if ( (textctrl != NULL) && textctrl->MacIsReallyShown() )
     {
-        Point startPt = { y ,x } ;
+        Point startPt = { y , x } ;
+
         // for compositing, we must convert these into toplevel window coordinates, because hittesting expects them
-        if ( textctrl->MacGetTopLevelWindow()->MacUsesCompositing() )
-        {
-            int x = 0 , y = 0 ;
-            textctrl->MacClientToRootWindow( &x , &y ) ;
-            startPt.h += x ;
-            startPt.v += y ;
-        }
+        int x = 0 , y = 0 ;
+        textctrl->MacClientToRootWindow( &x , &y ) ;
+        startPt.h += x ;
+        startPt.v += y ;
 
         switch (MacControlUserPaneHitTestProc( startPt.h , startPt.v ))
         {
             case kControlEditTextPart :
             {
                 wxMacWindowClipper clipper( textctrl ) ;
-
                 EventRecord rec ;
+
                 ConvertEventRefToEventRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) ;
                 TXNClick( m_txn, &rec );
-
             }
-            break;
+                break;
+
+            default :
+                break;
         }
     }
-    return partCodeResult;
+
+    return result;
 }
 
 void wxMacMLTEClassicControl::MacControlUserPaneIdleProc()
 {
-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
+    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );
     if ( textctrl == NULL )
         return ;
 
@@ -2422,8 +2651,8 @@ void wxMacMLTEClassicControl::MacControlUserPaneIdleProc()
 
             if (PtInRect(mousep, &m_txnControlBounds))
             {
-                RgnHandle theRgn;
-                RectRgn((theRgn = NewRgn()), &m_txnControlBounds);
+                RgnHandle theRgn = NewRgn();
+                RectRgn(theRgn, &m_txnControlBounds);
                 TXNAdjustCursor(m_txn, theRgn);
                 DisposeRgn(theRgn);
             }
@@ -2433,9 +2662,9 @@ void wxMacMLTEClassicControl::MacControlUserPaneIdleProc()
 
 wxInt16 wxMacMLTEClassicControl::MacControlUserPaneKeyDownProc (wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers)
 {
-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
+    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );
     if ( textctrl == NULL )
-        return 0;
+        return kControlNoPart;
 
     wxMacWindowClipper clipper( textctrl ) ;
 
@@ -2443,29 +2672,28 @@ wxInt16 wxMacMLTEClassicControl::MacControlUserPaneKeyDownProc (wxInt16 keyCode,
     memset( &ev , 0 , sizeof( ev ) ) ;
     ev.what = keyDown ;
     ev.modifiers = modifiers ;
-    ev.message = (( keyCode << 8 ) & keyCodeMask ) + ( charCode & charCodeMask ) ;
-    TXNKeyDown( m_txn , &ev);
+    ev.message = ((keyCode << 8) & keyCodeMask) | (charCode & charCodeMask);
+    TXNKeyDown( m_txn , &ev );
 
     return kControlEntireControl;
 }
 
-void wxMacMLTEClassicControl::MacControlUserPaneActivateProc( bool activating)
+void wxMacMLTEClassicControl::MacControlUserPaneActivateProc(bool activating)
 {
     MacActivatePaneText( activating );
 }
 
 wxInt16 wxMacMLTEClassicControl::MacControlUserPaneFocusProc(wxInt16 action)
 {
-    ControlPartCode focusResult;
+    ControlPartCode focusResult = kControlFocusNoPart;
 
-    focusResult = kControlFocusNoPart;
-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
+    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );
     if ( textctrl == NULL )
-        return 0;
+        return focusResult;
 
     wxMacWindowClipper clipper( textctrl ) ;
 
-    ControlRef controlFocus = 0 ;
+    ControlRef controlFocus = NULL ;
     GetKeyboardFocus( m_txnWindow , &controlFocus ) ;
     bool wasFocused = ( controlFocus == m_controlRef ) ;
 
@@ -2473,13 +2701,13 @@ wxInt16 wxMacMLTEClassicControl::MacControlUserPaneFocusProc(wxInt16 action)
     {
         case kControlFocusPrevPart:
         case kControlFocusNextPart:
-            MacFocusPaneText( ( !wasFocused));
-            focusResult = (!wasFocused) ? (ControlPartCode) kControlEditTextPart : (ControlPartCode) kControlFocusNoPart;
+            MacFocusPaneText( !wasFocused );
+            focusResult = (!wasFocused ? (ControlPartCode) kControlEditTextPart : (ControlPartCode) kControlFocusNoPart);
             break;
 
         case kControlFocusNoPart:
         default:
-            MacFocusPaneText( false);
+            MacFocusPaneText( false );
             focusResult = kControlFocusNoPart;
             break;
     }
@@ -2487,30 +2715,34 @@ wxInt16 wxMacMLTEClassicControl::MacControlUserPaneFocusProc(wxInt16 action)
     return focusResult;
 }
 
-void wxMacMLTEClassicControl::MacControlUserPaneBackgroundProc( void *info )
+void wxMacMLTEClassicControl::MacControlUserPaneBackgroundProc( void *WXUNUSED(info) )
 {
 }
 
 wxMacMLTEClassicControl::wxMacMLTEClassicControl( wxTextCtrl *wxPeer,
-                         const wxString& str,
-                         const wxPoint& pos,
-                         const wxSize& size, long style ) : wxMacMLTEControl( wxPeer )
+    const wxString& str,
+    const wxPoint& pos,
+    const wxSize& size, long style )
+    : wxMacMLTEControl( wxPeer )
 {
     m_font = wxPeer->GetFont() ;
     m_windowStyle = style ;
     Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ;
 
-    short featurSet;
-
-    featurSet = kControlSupportsEmbedding | kControlSupportsFocus  | kControlWantsIdle
-            | kControlWantsActivate  | kControlHandlesTracking // | kControlHasSpecialBackground
-            | kControlGetsFocusOnClick | kControlSupportsLiveFeedback;
+    short featureSet =
+        kControlSupportsEmbedding | kControlSupportsFocus | kControlWantsIdle
+        | kControlWantsActivate  | kControlHandlesTracking
+//    | kControlHasSpecialBackground
+        | kControlGetsFocusOnClick | kControlSupportsLiveFeedback;
 
-    verify_noerr( ::CreateUserPaneControl( MAC_WXHWND(wxPeer->GetParent()->MacGetTopLevelWindowRef()), &bounds, featurSet, &m_controlRef ) );
+   OSStatus err = ::CreateUserPaneControl(
+        MAC_WXHWND(wxPeer->GetParent()->MacGetTopLevelWindowRef()),
+        &bounds, featureSet, &m_controlRef );
+    verify_noerr( err );
 
     DoCreate();
 
-    AdjustCreationAttributes( *wxWHITE , true) ;
+    AdjustCreationAttributes( *wxWHITE , true ) ;
 
     MacSetObjectVisibility( wxPeer->MacIsReallyShown() ) ;
 
@@ -2519,13 +2751,13 @@ wxMacMLTEClassicControl::wxMacMLTEClassicControl( wxTextCtrl *wxPeer,
         wxMacConvertNewlines10To13( &st ) ;
         wxMacWindowClipper clipper( m_peer ) ;
         SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ;
-        TXNSetSelection( m_txn, 0, 0);
+        TXNSetSelection( m_txn, 0, 0 ) ;
     }
 }
 
 wxMacMLTEClassicControl::~wxMacMLTEClassicControl()
 {
-    TXNDeleteObject(m_txn);
+    TXNDeleteObject( m_txn );
     m_txn = NULL ;
 }
 
@@ -2541,8 +2773,6 @@ void wxMacMLTEClassicControl::SuperChangedPosition()
     wxMacControl::SuperChangedPosition() ;
 }
 
-#ifdef __WXMAC_OSX__
-
 ControlUserPaneDrawUPP gTPDrawProc = NULL;
 ControlUserPaneHitTestUPP gTPHitProc = NULL;
 ControlUserPaneTrackingUPP gTPTrackProc = NULL;
@@ -2556,7 +2786,7 @@ static pascal void wxMacControlUserPaneDrawProc(ControlRef control, SInt16 part)
     wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
     wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
     if ( win )
-        win->MacControlUserPaneDrawProc(part) ;
+        win->MacControlUserPaneDrawProc( part ) ;
 }
 
 static pascal ControlPartCode wxMacControlUserPaneHitTestProc(ControlRef control, Point where)
@@ -2564,7 +2794,7 @@ static pascal ControlPartCode wxMacControlUserPaneHitTestProc(ControlRef control
     wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
     wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
     if ( win )
-        return win->MacControlUserPaneHitTestProc(where.h , where.v) ;
+        return win->MacControlUserPaneHitTestProc( where.h , where.v ) ;
     else
         return kControlNoPart ;
 }
@@ -2574,7 +2804,7 @@ static pascal ControlPartCode wxMacControlUserPaneTrackingProc(ControlRef contro
     wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
     wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
     if ( win )
-        return win->MacControlUserPaneTrackingProc( startPt.h , startPt.v , (void*) actionProc) ;
+        return win->MacControlUserPaneTrackingProc( startPt.h , startPt.v , (void*) actionProc ) ;
     else
         return kControlNoPart ;
 }
@@ -2592,7 +2822,7 @@ static pascal ControlPartCode wxMacControlUserPaneKeyDownProc(ControlRef control
     wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
     wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
     if ( win )
-        return win->MacControlUserPaneKeyDownProc(keyCode,charCode,modifiers) ;
+        return win->MacControlUserPaneKeyDownProc( keyCode, charCode, modifiers ) ;
     else
         return kControlNoPart ;
 }
@@ -2602,7 +2832,7 @@ static pascal void wxMacControlUserPaneActivateProc(ControlRef control, Boolean
     wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
     wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
     if ( win )
-        win->MacControlUserPaneActivateProc(activating) ;
+        win->MacControlUserPaneActivateProc( activating ) ;
 }
 
 static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control, ControlFocusPart action)
@@ -2610,12 +2840,12 @@ static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control,
     wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
     wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
     if ( win )
-        return win->MacControlUserPaneFocusProc(action) ;
+        return win->MacControlUserPaneFocusProc( action ) ;
     else
         return kControlNoPart ;
 }
 
-/*
+#if 0
 static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, ControlBackgroundPtr info)
 {
     wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
@@ -2623,7 +2853,6 @@ static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, Contro
     if ( win )
         win->MacControlUserPaneBackgroundProc(info) ;
 }
-*/
 #endif
 
 // TXNRegisterScrollInfoProc
@@ -2631,11 +2860,9 @@ static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, Contro
 OSStatus wxMacMLTEClassicControl::DoCreate()
 {
     Rect bounds;
-
     OSStatus err = noErr ;
 
-    /* set up our globals */
-#ifdef __WXMAC_OSX__
+    // set up our globals
     if (gTPDrawProc == NULL) gTPDrawProc = NewControlUserPaneDrawUPP(wxMacControlUserPaneDrawProc);
     if (gTPHitProc == NULL) gTPHitProc = NewControlUserPaneHitTestUPP(wxMacControlUserPaneHitTestProc);
     if (gTPTrackProc == NULL) gTPTrackProc = NewControlUserPaneTrackingUPP(wxMacControlUserPaneTrackingProc);
@@ -2646,15 +2873,13 @@ OSStatus wxMacMLTEClassicControl::DoCreate()
 
     if (gTXNScrollInfoProc == NULL ) gTXNScrollInfoProc = NewTXNScrollInfoUPP(TXNScrollInfoProc) ;
     if (gTXNScrollActionProc == NULL ) gTXNScrollActionProc = NewControlActionUPP(TXNScrollActionProc) ;
-#endif
 
-    /* set the initial settings for our private data */
+    // set the initial settings for our private data
 
-    m_txnWindow =GetControlOwner(m_controlRef);
+    m_txnWindow = GetControlOwner(m_controlRef);
     m_txnPort = (GrafPtr) GetWindowPort(m_txnWindow);
 
-#ifdef __WXMAC_OSX__
-    /* set up the user pane procedures */
+    // 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);
@@ -2662,27 +2887,24 @@ OSStatus wxMacMLTEClassicControl::DoCreate()
     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);
+
+    // calculate the rectangles used by the control
+    GetRectInWindowCoords( &bounds );
 
     m_txnControlBounds = bounds ;
     m_txnVisBounds = bounds ;
 
-    CGrafPtr        origPort = NULL ;
-    GDHandle        origDev = NULL ;
-    GetGWorld( &origPort , &origDev ) ;
-    SetPort(m_txnPort);
-
-    /* create the new edit field */
+    CGrafPtr origPort ;
+    GDHandle origDev ;
 
-    TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( m_windowStyle ) ;
+    GetGWorld( &origPort, &origDev ) ;
+    SetPort( m_txnPort );
 
-#ifdef __WXMAC_OSX__
+    // create the new edit field
+    TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( m_windowStyle );
 
-    // 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
+    // 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 ;
@@ -2692,74 +2914,111 @@ OSStatus wxMacMLTEClassicControl::DoCreate()
     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 ) ;
+        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 ;
+        ShowControl( m_sbVertical );
+        EmbedControl( m_sbVertical , m_controlRef );
+        frameOptions &= ~kTXNWantVScrollBarMask;
     }
+
     if ( frameOptions & kTXNWantHScrollBarMask )
     {
-        CreateScrollBarControl( m_txnWindow , &sb , 0 , 0 , 100 , 1 , true , gTXNScrollActionProc , &m_sbHorizontal ) ;
-        SetControlReference( m_sbHorizontal , (SInt32) this ) ;
+        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 ) ;
+        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 );
 
-    verify_noerr(TXNNewObject(NULL, m_txnWindow , &bounds,
-                              frameOptions ,
-                              kTXNTextEditStyleFrameType,
-                              kTXNTextensionFile,
-                              kTXNSystemDefaultEncoding,
-                              &m_txn, &m_txnFrameID, NULL ) );
-/*
+#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 ;
 
-    TXNControlTag iControlTags[] =
-        {
-            kTXNUseCarbonEvents ,
-        };
-    TXNControlData iControlData[] =
-        {
-            {(UInt32) &cInfo },
-        };
-
-    int toptag = WXSIZEOF( iControlTags ) ;
-
-    verify_noerr( TXNSetTXNObjectControls( m_txn, false , toptag,
-                                        iControlTags, iControlData )) ;
-
-*/
-#ifdef __WXMAC_OSX__
-    TXNRegisterScrollInfoProc( m_txn, gTXNScrollInfoProc, (SInt32) this);
+    verify_noerr( TXNSetTXNObjectControls( m_txn, false, toptag, iControlTags, iControlData ) );
 #endif
 
+    TXNRegisterScrollInfoProc( m_txn, gTXNScrollInfoProc, (SInt32)this );
+
     SetGWorld( origPort , origDev ) ;
+
     return err;
 }
+#endif
 
 // ----------------------------------------------------------------------------
 // MLTE control implementation (OSX part)
 // ----------------------------------------------------------------------------
 
-#if TARGET_API_MAC_OSX
+// 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 ...
+
+static const EventTypeSpec eventList[] =
+{
+    { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } ,
+} ;
+
+static pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    OSStatus result = eventNotHandledErr ;
+    wxMacMLTEHIViewControl* focus = (wxMacMLTEHIViewControl*) data ;
+
+    switch ( GetEventKind( event ) )
+    {
+        case kEventTextInputUnicodeForKeyEvent :
+        {
+            TXNOffset from , to ;
+            TXNGetSelection( focus->GetTXNObject() , &from , &to ) ;
+            if ( from == to )
+                TXNShowSelection( focus->GetTXNObject() , kTXNShowStart );
+            result = CallNextEventHandler(handler,event);
+            break;
+        }
+        default:
+            break ;
+    }
+
+    return result ;
+}
+
+static pascal OSStatus wxMacTextControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    OSStatus result = eventNotHandledErr ;
+
+    switch ( GetEventClass( event ) )
+    {
+        case kEventClassTextInput :
+            result = wxMacUnicodeTextEventHandler( handler , event , data ) ;
+            break ;
+
+        default :
+            break ;
+    }
+    return result ;
+}
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacTextControlEventHandler )
 
 wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer,
-                         const wxString& str,
-                         const wxPoint& pos,
-                         const wxSize& size, long style ) : wxMacMLTEControl( wxPeer )
+    const wxString& str,
+    const wxPoint& pos,
+    const wxSize& size, long style ) : wxMacMLTEControl( wxPeer )
 {
     m_font = wxPeer->GetFont() ;
     m_windowStyle = style ;
@@ -2767,15 +3026,26 @@ wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer,
     wxString st = str ;
     wxMacConvertNewlines10To13( &st ) ;
 
-    HIRect hr = { { bounds.left , bounds.top} ,
-                  { bounds.right - bounds.left , bounds.bottom - bounds.top} } ;
+    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) )
+    if (( frameOptions & (kTXNWantVScrollBarMask | kTXNWantHScrollBarMask)) || (frameOptions &kTXNSingleLineOnlyMask))
     {
-        HIScrollViewCreate(( frameOptions & kTXNWantHScrollBarMask ? kHIScrollViewOptionsHorizScroll : 0) |
-            ( frameOptions & kTXNWantVScrollBarMask ? kHIScrollViewOptionsVertScroll: 0 ) , &m_scrollView ) ;
+        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 );
@@ -2783,13 +3053,13 @@ wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer,
 
     m_textView = NULL ;
     HITextViewCreate( NULL , 0, frameOptions , &m_textView ) ;
-    m_txn = HITextViewGetTXNObject( 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  ) ;
+        wxPeer->MacInstallEventHandler( (WXWidget) m_textView ) ;
     }
     else
     {
@@ -2798,31 +3068,41 @@ wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer,
     }
 
     AdjustCreationAttributes( *wxWHITE , true ) ;
-
+#ifndef __LP64__
     wxMacWindowClipper c( m_peer ) ;
+#endif
     SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ;
 
-    TXNSetSelection( m_txn, 0, 0);
-    TXNShowSelection( m_txn, kTXNShowStart);
+    TXNSetSelection( m_txn, 0, 0 );
+    TXNShowSelection( m_txn, kTXNShowStart );
+
+    InstallControlEventHandler( m_textView , GetwxMacTextControlEventHandlerUPP(),
+                                GetEventTypeCount(eventList), eventList, this,
+                                NULL);
+}
 
+wxMacMLTEHIViewControl::~wxMacMLTEHIViewControl()
+{
 }
 
 OSStatus wxMacMLTEHIViewControl::SetFocus( ControlFocusPart focusPart )
 {
-    return SetKeyboardFocus(  GetControlOwner( m_textView )  ,
-        m_textView , focusPart ) ;
+    return SetKeyboardFocus( GetControlOwner( m_textView ), m_textView, focusPart ) ;
 }
 
 bool wxMacMLTEHIViewControl::HasFocus() const
 {
     ControlRef control ;
+    if ( GetUserFocusWindow() == NULL )
+        return false;
+
     GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
     return control == m_textView ;
 }
 
-#endif // MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
-
-
-#endif
+void wxMacMLTEHIViewControl::SetBackgroundColour(const wxColour& col )
+{
+    HITextViewSetBackgroundColor( m_textView, col.GetPixel() );
+}
 
 #endif // wxUSE_TEXTCTRL