use wx-style header and commets; fix indentation to be 4 spaces; move Doxygen comment...

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

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 42a7d30c28ebc136063f27150e2374020a3b4f1f..79c591439cd03e4706877389fe88e572a0682f2c 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -24,6 +24,7 @@
     #include "wx/menu.h"
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
     #include "wx/menu.h"
     #include "wx/settings.h"
     #include "wx/msgdlg.h"

+    #include "wx/toplevel.h"

 #endif
 
 #ifdef __DARWIN__
 #endif
 
 #ifdef __DARWIN__


@@ -41,43 +42,12 @@
     #endif
 #endif
 
     #endif
 #endif
 

-#include "wx/toplevel.h"

 #include "wx/filefn.h"
 #include "wx/sysopt.h"
 #include "wx/filefn.h"
 #include "wx/sysopt.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
-
-#ifndef __DARWIN__
-#include <MacTextEditor.h>
-#include <ATSUnicode.h>
-#include <TextCommon.h>
-#include <TextEncodingConverter.h>
-#endif
+#include "wx/thread.h"

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

-
-
-// 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/mac/carbon/private/mactext.h"

 
 class wxMacFunctor
 {
 
 class wxMacFunctor
 {


@@ -118,7 +88,7 @@ public :
         m_param1 = p1 ;
     }
 
         m_param1 = p1 ;
     }
 

-    ~wxMacObjectFunctor1() {}
+    virtual ~wxMacObjectFunctor1() {}

 
     virtual void* operator()()
     {
 
     virtual void* operator()()
     {


@@ -172,59 +142,79 @@ void* wxMacMPRemoteGUICall( classtype *object , void (classtype::*function)( con
     return result ;
 }
 
     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 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 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 ) ;

 
 

+/*
+ Clips to the visible region of a control within the current port
+ */

 
 

-    virtual bool HasOwnContextMenu() const
-    { return false ; }
+class WXDLLEXPORT wxMacWindowClipper : public wxMacPortSaver
+{
+    DECLARE_NO_COPY_CLASS(wxMacWindowClipper)

 
 

-    virtual bool SetupCursor( const wxPoint& pt )
-    { return false ; }
+public:
+    wxMacWindowClipper( const wxWindow* win );
+    ~wxMacWindowClipper();
+private:
+    GrafPtr   m_newPort;
+    RgnHandle m_formerClip;
+    RgnHandle m_newClip;
+};

 
 

-    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 ;
+wxMacPortSaver::wxMacPortSaver( GrafPtr port )
+{
+    ::GetPort( &m_port );
+    ::SetPort( port );
+}

 
 

-#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
-} ;
+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
 
 
 // common parts for implementations based on MLTE
 


@@ -241,7 +231,7 @@ public :
     void AdjustCreationAttributes( const wxColour& background, bool visible ) ;
 
     virtual void SetFont( const wxFont & font, const wxColour& foreground, long windowStyle ) ;
     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 SetBackgroundColour(const wxColour& col );

     virtual void SetStyle( long start, long end, const wxTextAttr& style ) ;
     virtual void Copy() ;
     virtual void Cut() ;
     virtual void SetStyle( long start, long end, const wxTextAttr& style ) ;
     virtual void Copy() ;
     virtual void Cut() ;


@@ -258,18 +248,15 @@ public :
 
     virtual bool HasOwnContextMenu() const
     {
 
     virtual bool HasOwnContextMenu() const
     {

-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
-        if ( UMAGetSystemVersion() >= 0x1040 )
-        {
-            TXNCommandEventSupportOptions options ;
-            TXNGetCommandEventSupport( m_txn , & options ) ;
-            return options & kTXNSupportEditCommandProcessing ;
-        }
-#endif
-
-        return false ;
+        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 ;
     virtual void Clear() ;
 
     virtual bool CanUndo() const ;


@@ -292,12 +279,8 @@ protected :
     TXNObject m_txn ;
 } ;
 
     TXNObject m_txn ;
 } ;
 

-#if TARGET_API_MAC_OSX
-

 // implementation available under OSX
 
 // implementation available under OSX
 

-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
-

 class wxMacMLTEHIViewControl : public wxMacMLTEControl
 {
 public :
 class wxMacMLTEHIViewControl : public wxMacMLTEControl
 {
 public :


@@ -305,54 +288,17 @@ public :
                              const wxString& str,
                              const wxPoint& pos,
                              const wxSize& size, long style ) ;
                              const wxString& str,
                              const wxPoint& pos,
                              const wxSize& size, long style ) ;

-    ~wxMacMLTEHIViewControl() ;
+    virtual ~wxMacMLTEHIViewControl() ;

 
     virtual OSStatus SetFocus( ControlFocusPart focusPart ) ;
     virtual bool HasFocus() const ;
 
     virtual OSStatus SetFocus( ControlFocusPart focusPart ) ;
     virtual bool HasFocus() const ;

-    virtual void SetBackground( const wxBrush &brush) ;
+    virtual void SetBackgroundColour(const wxColour& col ) ;

 
 protected :
     HIViewRef m_scrollView ;
     HIViewRef m_textView ;
 
 protected :
     HIViewRef m_scrollView ;
     HIViewRef m_textView ;

-    EventHandlerRef m_textEventHandlerRef ;
-};
-
-#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 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 ;
-
-    // as the selection tag only works correctly when the control has the focus we have to mirror the
-    // intended value
-    EventHandlerRef m_focusHandlerRef ;
-public :
-    ControlEditTextSelectionRec m_selection ;

 };
 
 };
 

-#endif
-

 // 'classic' MLTE implementation
 
 class wxMacMLTEClassicControl : public wxMacMLTEControl
 // 'classic' MLTE implementation
 
 class wxMacMLTEClassicControl : public wxMacMLTEControl


@@ -362,7 +308,7 @@ public :
                              const wxString& str,
                              const wxPoint& pos,
                              const wxSize& size, long style ) ;
                              const wxString& str,
                              const wxPoint& pos,
                              const wxSize& size, long style ) ;

-    ~wxMacMLTEClassicControl() ;
+    virtual ~wxMacMLTEClassicControl() ;

 
     virtual void VisibilityChanged(bool shown) ;
     virtual void SuperChangedPosition() ;
 
     virtual void VisibilityChanged(bool shown) ;
     virtual void SuperChangedPosition() ;


@@ -400,7 +346,6 @@ private :
     Rect                    m_txnControlBounds ;
     Rect                    m_txnVisBounds ;
 
     Rect                    m_txnControlBounds ;
     Rect                    m_txnVisBounds ;
 

-#ifdef __WXMAC_OSX__

     static pascal void TXNScrollActionProc( ControlRef controlRef , ControlPartCode partCode ) ;
     static pascal void TXNScrollInfoProc(
         SInt32 iValue, SInt32 iMaximumValue,
     static pascal void TXNScrollActionProc( ControlRef controlRef , ControlPartCode partCode ) ;
     static pascal void TXNScrollInfoProc(
         SInt32 iValue, SInt32 iMaximumValue,


@@ -410,14 +355,12 @@ private :
     SInt32                  m_lastHorizontalValue ;
     ControlRef              m_sbVertical ;
     SInt32                  m_lastVerticalValue ;
     SInt32                  m_lastHorizontalValue ;
     ControlRef              m_sbVertical ;
     SInt32                  m_lastVerticalValue ;

-#endif

 };
 
 
 };
 
 

-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)
     EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
     EVT_CHAR(wxTextCtrl::OnChar)
     EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)


@@ -475,14 +418,32 @@ bool wxTextCtrl::Create( wxWindow *parent,
 
     if ( m_windowStyle & wxTE_MULTILINE )
     {
 
     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 ;
     }
 
         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
     bool forceMLTE = false ;
 
 #if wxUSE_SYSTEM_OPTIONS


@@ -492,37 +453,29 @@ bool wxTextCtrl::Create( wxWindow *parent,
     }
 #endif
 
     }
 #endif
 

-#ifdef __WXMAC_OSX__
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
-    if ( UMAGetSystemVersion() >= 0x1030 && !forceMLTE )
+    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 ) ;
     }
             m_peer = new wxMacMLTEHIViewControl( this , str , pos , size , style ) ;
     }

-#endif

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

+        {

             m_peer = new wxMacUnicodeTextControl( this , str , pos , size , style ) ;
             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 ) ;
     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()
 }
 
 void wxTextCtrl::MacSuperChangedPosition()


@@ -533,11 +486,12 @@ void wxTextCtrl::MacSuperChangedPosition()
 
 void wxTextCtrl::MacVisibilityChanged()
 {
 
 void wxTextCtrl::MacVisibilityChanged()
 {

-    GetPeer()->VisibilityChanged( MacIsReallyShown() ) ;
+    GetPeer()->VisibilityChanged( GetPeer()->IsVisible() );

 }
 
 }
 

-void wxTextCtrl::MacEnabledStateChanged()
+void wxTextCtrl::MacCheckSpelling(bool check)

 {
 {

+    GetPeer()->CheckSpelling(check);

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


@@ -550,20 +504,17 @@ void wxTextCtrl::GetSelection(long* from, long* to) const
     GetPeer()->GetSelection( from , to ) ;
 }
 
     GetPeer()->GetSelection( from , to ) ;
 }
 

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

 {
     // optimize redraws
     if ( GetValue() == str )
 {
     // optimize redraws
     if ( GetValue() == str )

-        return ;
+        return;

 
     GetPeer()->SetStringValue( str ) ;
 
 
     GetPeer()->SetStringValue( str ) ;
 

-    if ( m_triggerOnSetValue )
+    if ( (flags & SetValue_SendEvent) && m_triggerOnSetValue )

     {
     {

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

     }
 }
 
     }
 }
 


@@ -613,7 +564,7 @@ void wxTextCtrl::Cut()
 
         wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );
         event.SetEventObject( this );
 
         wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );
         event.SetEventObject( this );

-        GetEventHandler()->ProcessEvent( event );
+        HandleWindowEvent( event );

       }
 }
 
       }
 }
 


@@ -627,7 +578,7 @@ void wxTextCtrl::Paste()
 
         wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );
         event.SetEventObject( this );
 
         wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );
         event.SetEventObject( this );

-        GetEventHandler()->ProcessEvent( event );
+        HandleWindowEvent( event );

     }
 }
 
     }
 }
 


@@ -708,11 +659,6 @@ void wxTextCtrl::SetSelection(long from, long to)
     GetPeer()->SetSelection( from , to ) ;
 }
 
     GetPeer()->SetSelection( from , to ) ;
 }
 

-bool wxTextCtrl::LoadFile(const wxString& file)
-{
-    return wxTextCtrlBase::LoadFile( file );
-}
-

 void wxTextCtrl::WriteText(const wxString& str)
 {
     // TODO: this MPRemoting will be moved into a remoting peer proxy for any command
 void wxTextCtrl::WriteText(const wxString& str)
 {
     // TODO: this MPRemoting will be moved into a remoting peer proxy for any command


@@ -878,15 +824,6 @@ void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event)
         LoadFile( event.GetFiles()[0] );
 }
 
         LoadFile( event.GetFiles()[0] );
 }
 

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

 void wxTextCtrl::OnChar(wxKeyEvent& event)
 {
     int key = event.GetKeyCode() ;
 void wxTextCtrl::OnChar(wxKeyEvent& event)
 {
     int key = event.GetKeyCode() ;


@@ -956,21 +893,16 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
                 event.SetEventObject( this );
                 event.SetString( GetValue() );
                 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) )
             {
                     return;
             }
 
             if ( !(m_windowStyle & wxTE_MULTILINE) )
             {

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

                 {
                 {

-                    parent = parent->GetParent() ;
-                }
-
-                if ( parent && parent->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() );
                     if ( def && def->IsEnabled() )
                     {
                         wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );


@@ -1004,6 +936,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
                 // This is necessary (don't know why);
                 // otherwise the tab will not be inserted.
                 WriteText(wxT("\t"));
                 // This is necessary (don't know why);
                 // otherwise the tab will not be inserted.
                 WriteText(wxT("\t"));

+                eat_key = true;

             }
             break;
 
             }
             break;
 


@@ -1018,6 +951,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
     }
 
     if ( ( key >= 0x20 && key < WXK_START ) ||
     }
 
     if ( ( key >= 0x20 && key < WXK_START ) ||

+         ( key >= WXK_NUMPAD0 && key <= WXK_DIVIDE ) ||

          key == WXK_RETURN ||
          key == WXK_DELETE ||
          key == WXK_BACK)
          key == WXK_RETURN ||
          key == WXK_DELETE ||
          key == WXK_BACK)


@@ -1145,52 +1079,6 @@ bool wxTextCtrl::MacSetupCursor( const wxPoint& pt )
         return true ;
 }
 
         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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // implementation base class
 // ----------------------------------------------------------------------------


@@ -1204,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))

 {
 }
 
 {
 }
 


@@ -1225,7 +1115,7 @@ bool wxMacTextControl::CanPaste() const
     return false ;
 }
 
     return false ;
 }
 

-void wxMacTextControl::SetEditable(bool editable)
+void wxMacTextControl::SetEditable(bool WXUNUSED(editable))

 {
 }
 
 {
 }
 


@@ -1269,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 ;
 }
 
 {
     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 ;
 }
 {
     return false ;
 }


@@ -1364,8 +1256,6 @@ int wxMacTextControl::GetLineLength(long lineNo) const
 // standard unicode control implementation
 // ----------------------------------------------------------------------------
 
 // 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
 // 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


@@ -1425,38 +1315,48 @@ static pascal OSStatus wxMacUnicodeTextControlEventHandler( EventHandlerCallRef
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacUnicodeTextControlEventHandler )
 
 
 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 )
 wxMacUnicodeTextControl::wxMacUnicodeTextControl( wxTextCtrl *wxPeer,
     const wxString& str,
     const wxPoint& pos,
     const wxSize& size, long style )
     : wxMacTextControl( wxPeer )

+{
+    Create( wxPeer, str, pos, size, style );
+}
+
+bool wxMacUnicodeTextControl::Create( wxTextCtrl *wxPeer,
+    const wxString& str,
+    const wxPoint& pos,
+    const wxSize& size, long style )

 {
     m_font = wxPeer->GetFont() ;
     m_windowStyle = style ;
 {
     m_font = wxPeer->GetFont() ;
     m_windowStyle = style ;

+    m_selection.selStart = m_selection.selEnd = 0;

     Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ;
     wxString st = str ;
     wxMacConvertNewlines10To13( &st ) ;
     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 ;
     CFStringRef cfr = cf ;

-    Boolean isPassword = ( m_windowStyle & wxTE_PASSWORD ) != 0 ;
-    m_valueTag = isPassword ? kControlEditTextPasswordCFStringTag : kControlEditTextCFStringTag ;

 
 

-    OSStatus err = CreateEditUnicodeTextControl(
-        MAC_WXHWND(wxPeer->MacGetTopLevelWindowRef()), &bounds , cfr ,
-        isPassword , NULL , &m_controlRef ) ;
-    verify_noerr( err );
+    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,
 
     if ( !(m_windowStyle & wxTE_MULTILINE) )
         SetData<Boolean>( kControlEditTextPart , kControlEditTextSingleLineTag , true ) ;
 
     InstallControlEventHandler( m_controlRef , GetwxMacUnicodeTextControlEventHandlerUPP(),
                                 GetEventTypeCount(unicodeTextControlEventList), unicodeTextControlEventList, this,

-                                &m_focusHandlerRef);
+                                NULL);
+
+    return true;

 }
 
 wxMacUnicodeTextControl::~wxMacUnicodeTextControl()
 {
 }
 
 wxMacUnicodeTextControl::~wxMacUnicodeTextControl()
 {

-    ::RemoveEventHandler( m_focusHandlerRef );

 }
 
 void wxMacUnicodeTextControl::VisibilityChanged(bool shown)
 }
 
 void wxMacUnicodeTextControl::VisibilityChanged(bool shown)


@@ -1483,7 +1383,7 @@ wxString wxMacUnicodeTextControl::GetStringValue() const
     CFStringRef value = GetData<CFStringRef>(0, m_valueTag) ;
     if ( value )
     {
     CFStringRef value = GetData<CFStringRef>(0, m_valueTag) ;
     if ( value )
     {

-        wxMacCFStringHolder cf(value) ;
+        wxCFStringRef cf(value) ;

         result = cf.AsString() ;
     }
 
         result = cf.AsString() ;
     }
 


@@ -1500,10 +1400,23 @@ void wxMacUnicodeTextControl::SetStringValue( const wxString &str )
 {
     wxString st = str ;
     wxMacConvertNewlines10To13( &st ) ;
 {
     wxString st = str ;
     wxMacConvertNewlines10To13( &st ) ;

-    wxMacCFStringHolder cf( st , m_font.GetEncoding() ) ;
+    wxCFStringRef cf( st , m_font.GetEncoding() ) ;

     verify_noerr( SetData<CFStringRef>( 0, m_valueTag , cf ) ) ;
 }
 
     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::Copy()
 {
     SendHICommand( kHICommandCopy ) ;


@@ -1524,7 +1437,7 @@ bool wxMacUnicodeTextControl::CanPaste() const
     return true ;
 }
 
     return true ;
 }
 

-void wxMacUnicodeTextControl::SetEditable(bool editable)
+void wxMacUnicodeTextControl::SetEditable(bool WXUNUSED(editable))

 {
 #if 0 // leads to problem because text cannot be selected anymore
     SetData<Boolean>( kControlEditTextPart , kControlEditTextLockedTag , (Boolean) !editable ) ;
 {
 #if 0 // leads to problem because text cannot be selected anymore
     SetData<Boolean>( kControlEditTextPart , kControlEditTextLockedTag , (Boolean) !editable ) ;


@@ -1553,8 +1466,8 @@ void wxMacUnicodeTextControl::SetSelection( long from , long to )
     CFStringRef value = GetData<CFStringRef>(0, m_valueTag) ;
     if ( value )
     {
     CFStringRef value = GetData<CFStringRef>(0, m_valueTag) ;
     if ( value )
     {

-        wxMacCFStringHolder cf(value) ;
-        textLength = cf.AsString().Length() ;
+        wxCFStringRef cf(value) ;
+        textLength = cf.AsString().length() ;

     }
 
     if ((from == -1) && (to == -1))
     }
 
     if ((from == -1) && (to == -1))


@@ -1565,7 +1478,10 @@ void wxMacUnicodeTextControl::SetSelection( long from , long to )
     else
     {
         from = wxMin(textLength,wxMax(from,0)) ;
     else
     {
         from = wxMin(textLength,wxMax(from,0)) ;

-        to = wxMax(0,wxMin(textLength,to)) ;
+        if ( to == -1 )
+            to = textLength;
+        else
+            to = wxMax(0,wxMin(textLength,to)) ;

     }
 
     sel.selStart = from ;
     }
 
     sel.selStart = from ;


@@ -1581,14 +1497,13 @@ void wxMacUnicodeTextControl::WriteText( const wxString& str )
     wxString st = str ;
     wxMacConvertNewlines10To13( &st ) ;
 
     wxString st = str ;
     wxMacConvertNewlines10To13( &st ) ;
 

-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2

     if ( HasFocus() )
     {
     if ( HasFocus() )
     {

-        wxMacCFStringHolder cf(st , m_font.GetEncoding() ) ;
+        wxCFStringRef cf(st , m_font.GetEncoding() ) ;

         CFStringRef value = cf ;
         SetData<CFStringRef>( 0, kControlEditTextInsertCFStringRefTag, &value );
     }
         CFStringRef value = cf ;
         SetData<CFStringRef>( 0, kControlEditTextInsertCFStringRefTag, &value );
     }

-#endif
+    else

     {
         wxString val = GetStringValue() ;
         long start , end ;
     {
         wxString val = GetStringValue() ;
         long start , end ;


@@ -1600,8 +1515,6 @@ void wxMacUnicodeTextControl::WriteText( const wxString& str )
     }
 }
 
     }
 }
 

-#endif
-

 // ----------------------------------------------------------------------------
 // MLTE control implementation (common part)
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // MLTE control implementation (common part)
 // ----------------------------------------------------------------------------


@@ -1730,7 +1643,9 @@ void wxMacMLTEControl::SetStringValue( const wxString &str )
     wxMacConvertNewlines10To13( &st );
 
     {
     wxMacConvertNewlines10To13( &st );
 
     {

-        wxMacWindowClipper c( m_peer );
+#ifndef __LP64__
+        wxMacWindowClipper c( m_peer ) ;
+#endif

 
         {
             wxMacEditHelper help( m_txn );
 
         {
             wxMacEditHelper help( m_txn );


@@ -1746,9 +1661,7 @@ TXNFrameOptions wxMacMLTEControl::FrameOptionsFromWXStyle( long wxStyle )
 {
     TXNFrameOptions frameOptions = kTXNDontDrawCaretWhenInactiveMask;
 
 {
     TXNFrameOptions frameOptions = kTXNDontDrawCaretWhenInactiveMask;
 

-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3

     frameOptions |= kTXNDoFontSubstitutionMask;
     frameOptions |= kTXNDoFontSubstitutionMask;

-#endif

 
     if ( ! (wxStyle & wxTE_NOHIDESEL) )
         frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ;
 
     if ( ! (wxStyle & wxTE_NOHIDESEL) )
         frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ;


@@ -1758,7 +1671,8 @@ TXNFrameOptions wxMacMLTEControl::FrameOptionsFromWXStyle( long wxStyle )
 
     if ( wxStyle & wxTE_MULTILINE )
     {
 
     if ( wxStyle & wxTE_MULTILINE )
     {

-        frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
+        if ( ! (wxStyle & wxTE_DONTWRAP ) )
+            frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;

 
         if ( !(wxStyle & wxTE_NO_VSCROLL) )
         {
 
         if ( !(wxStyle & wxTE_NO_VSCROLL) )
         {


@@ -1779,7 +1693,8 @@ TXNFrameOptions wxMacMLTEControl::FrameOptionsFromWXStyle( long wxStyle )
     return frameOptions ;
 }
 
     return frameOptions ;
 }
 

-void wxMacMLTEControl::AdjustCreationAttributes( const wxColour &background, bool visible )
+void wxMacMLTEControl::AdjustCreationAttributes(const wxColour &background,
+                                                bool WXUNUSED(visible))

 {
     TXNControlTag iControlTags[] =
         {
 {
     TXNControlTag iControlTags[] =
         {


@@ -1808,26 +1723,23 @@ void wxMacMLTEControl::AdjustCreationAttributes( const wxColour &background, boo
     // setting the default font:
     // under 10.2 this causes a visible caret, therefore we avoid it
 
     // 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 } } ,
-        } ;
-
-        err = TXNSetTypeAttributes(
-            m_txn, sizeof(typeAttr) / sizeof(TXNTypeAttributes),
-            typeAttr, kTXNStartOffset, kTXNEndOffset );
-        verify_noerr( err );
-    }
+    TXNTypeAttributes typeAttr[] =
+    {
+        { kTXNQDFontNameAttribute , kTXNQDFontNameAttributeSize , { (void*) fontName } } ,
+        { kTXNQDFontSizeAttribute , kTXNFontSizeAttributeSize , { (void*) (fontSize << 16) } } ,
+        { kTXNQDFontStyleAttribute , kTXNQDFontStyleAttributeSize , { (void*) normal } } ,
+    } ;
+
+    err = TXNSetTypeAttributes(
+        m_txn, sizeof(typeAttr) / sizeof(TXNTypeAttributes),
+        typeAttr, kTXNStartOffset, kTXNEndOffset );
+    verify_noerr( err );

 
     if ( m_windowStyle & wxTE_PASSWORD )
     {
 
     if ( m_windowStyle & wxTE_PASSWORD )
     {


@@ -1838,103 +1750,180 @@ void wxMacMLTEControl::AdjustCreationAttributes( const wxColour &background, boo
 
     TXNBackground tback;
     tback.bgType = kTXNBackgroundTypeRGB;
 
     TXNBackground tback;
     tback.bgType = kTXNBackgroundTypeRGB;

-    tback.bg.color = MAC_WXCOLORREF( background.GetPixel() );
+    background.GetRGBColor( &tback.bg.color );

     TXNSetBackground( m_txn , &tback );
 
     TXNSetBackground( m_txn , &tback );
 

-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
-    if ( UMAGetSystemVersion() >= 0x1040 )
+
+    TXNCommandEventSupportOptions options ;
+    if ( TXNGetCommandEventSupport( m_txn, &options ) == noErr )

     {
     {

-        TXNCommandEventSupportOptions options ;
-        if ( TXNGetCommandEventSupport( m_txn, &options ) == noErr )
-        {
-            options |=
-                kTXNSupportEditCommandProcessing
-                | kTXNSupportEditCommandUpdating
-                | kTXNSupportSpellCheckCommandProcessing
-                | kTXNSupportSpellCheckCommandUpdating
-                | kTXNSupportFontCommandProcessing
-                | kTXNSupportFontCommandUpdating;
-
-            TXNSetCommandEventSupport( m_txn , options ) ;
+        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 ) ;

     }
     }

-#endif

 }
 
 }
 

-void wxMacMLTEControl::SetBackground( const wxBrush &brush )
+void wxMacMLTEControl::SetBackgroundColour(const wxColour& col )

 {
 {

-    // currently only solid background are supported

     TXNBackground tback;
     TXNBackground tback;

-

     tback.bgType = kTXNBackgroundTypeRGB;
     tback.bgType = kTXNBackgroundTypeRGB;

-    tback.bg.color = MAC_WXCOLORREF( brush.GetColour().GetPixel() );
+    col.GetRGBColor(&tback.bg.color);

     TXNSetBackground( m_txn , &tback );
 }
 
     TXNSetBackground( m_txn , &tback );
 }
 

+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] ;
     RGBColor color ;
 void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , long to )
 {
     TXNTypeAttributes typeAttr[4] ;
     RGBColor color ;

-    int attrCount = 0 ;
+    size_t typeAttrCount = 0 ;
+
+    TXNMargins margins;
+    TXNControlTag    controlTags[4];
+    TXNControlData   controlData[4];
+    size_t controlAttrCount = 0;
+
+    TXNTab* tabs = NULL;
+
+    bool relayout = false;
+    wxFont font ;

 
     if ( style.HasFont() )
     {
 
     if ( style.HasFont() )
     {

-        const wxFont &font = style.GetFont() ;
-
-#if 0 // old version
-        Str255 fontName = "\pMonaco" ;
-        SInt16 fontSize = 12 ;
-        Style fontStyle = normal ;
-        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[attrCount].tag = kTXNQDFontNameAttribute ;
-        typeAttr[attrCount].size = kTXNQDFontNameAttributeSize ;
-        typeAttr[attrCount].data.dataPtr = (void*)fontName ;
-        attrCount++ ;
-
-        typeAttr[attrCount].tag = kTXNQDFontSizeAttribute ;
-        typeAttr[attrCount].size = kTXNFontSizeAttributeSize ;
-        typeAttr[attrCount].data.dataValue = (fontSize << 16) ;
-        attrCount++ ;
-
-        typeAttr[attrCount].tag = kTXNQDFontStyleAttribute ;
-        typeAttr[attrCount].size = kTXNQDFontStyleAttributeSize ;
-        typeAttr[attrCount].data.dataValue = fontStyle ;
-        attrCount++ ;
-#else
-        typeAttr[attrCount].tag = kTXNATSUIStyle ;
-        typeAttr[attrCount].size = kTXNATSUIStyleSize ;
-        typeAttr[attrCount].data.dataValue = (UInt32)font.MacGetATSUStyle() ;
-        attrCount++ ;
-#endif
+        wxASSERT( typeAttrCount < WXSIZEOF(typeAttr) );
+        font = style.GetFont() ;
+        typeAttr[typeAttrCount].tag = kTXNATSUIStyle ;
+        typeAttr[typeAttrCount].size = kTXNATSUIStyleSize ;
+        typeAttr[typeAttrCount].data.dataPtr = font.MacGetATSUStyle() ;
+        typeAttrCount++ ;

     }
 
     if ( style.HasTextColour() )
     {
     }
 
     if ( style.HasTextColour() )
     {

-        color = MAC_WXCOLORREF(style.GetTextColour().GetPixel()) ;
+        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;

 
 

-        typeAttr[attrCount].tag = kTXNQDFontColorAttribute ;
-        typeAttr[attrCount].size = kTXNQDFontColorAttributeSize ;
-        typeAttr[attrCount].data.dataPtr = (void*) &color ;
-        attrCount++ ;
+        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 ( attrCount > 0 )
+    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 ( relayout )

     {
     {

-        verify_noerr( TXNSetTypeAttributes( m_txn , attrCount , typeAttr, from , to ) );
-        // unfortunately the relayout is not automatic

         TXNRecalcTextLayout( m_txn );
     }
 }
 
         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 ) ;


@@ -1948,21 +1937,16 @@ void wxMacMLTEControl::SetStyle( long start, long end, const wxTextAttr& style )
 
 void wxMacMLTEControl::Copy()
 {
 
 void wxMacMLTEControl::Copy()
 {

-    ClearCurrentScrap();

     TXNCopy( m_txn );
     TXNCopy( m_txn );

-    TXNConvertToPublicScrap();

 }
 
 void wxMacMLTEControl::Cut()
 {
 }
 
 void wxMacMLTEControl::Cut()
 {

-    ClearCurrentScrap();

     TXNCut( m_txn );
     TXNCut( m_txn );

-    TXNConvertToPublicScrap();

 }
 
 void wxMacMLTEControl::Paste()
 {
 }
 
 void wxMacMLTEControl::Paste()
 {

-    TXNConvertFromPublicScrap();

     TXNPaste( m_txn );
 }
 
     TXNPaste( m_txn );
 }
 


@@ -2005,16 +1989,20 @@ void wxMacMLTEControl::Replace( long from , long to , const wxString &str )
     wxMacConvertNewlines10To13( &value ) ;
 
     wxMacEditHelper help( m_txn ) ;
     wxMacConvertNewlines10To13( &value ) ;
 
     wxMacEditHelper help( m_txn ) ;

+#ifndef __LP64__

     wxMacWindowClipper c( m_peer ) ;
     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 ) ;
 }
 
 void wxMacMLTEControl::Remove( long from , long to )
 {
     TXNClear( m_txn ) ;
     SetTXNData( value, kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ;
 }
 
 void wxMacMLTEControl::Remove( long from , long to )
 {

+#ifndef __LP64__

     wxMacWindowClipper c( m_peer ) ;
     wxMacWindowClipper c( m_peer ) ;

+#endif

     wxMacEditHelper help( m_txn ) ;
     TXNSetSelection( m_txn , from , to ) ;
     TXNClear( m_txn ) ;
     wxMacEditHelper help( m_txn ) ;
     TXNSetSelection( m_txn , from , to ) ;
     TXNClear( m_txn ) ;


@@ -2022,18 +2010,23 @@ void wxMacMLTEControl::Remove( long from , long to )
 
 void wxMacMLTEControl::GetSelection( long* from, long* to) const
 {
 
 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 )
 {
 }
 
 void wxMacMLTEControl::SetSelection( long from , long to )
 {

+#ifndef __LP64__

     wxMacWindowClipper c( m_peer ) ;
     wxMacWindowClipper c( m_peer ) ;

+#endif

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

-        TXNSetSelection( m_txn, from, to );
+        TXNSetSelection( m_txn, from, to == -1 ? kTXNEndOffset : to );

 
     TXNShowSelection( m_txn, kTXNShowStart );
 }
 
     TXNShowSelection( m_txn, kTXNShowStart );
 }


@@ -2046,7 +2039,9 @@ void wxMacMLTEControl::WriteText( const wxString& str )
     long start , end , dummy ;
 
     GetSelection( &start , &dummy ) ;
     long start , end , dummy ;
 
     GetSelection( &start , &dummy ) ;

+#ifndef __LP64__

     wxMacWindowClipper c( m_peer ) ;
     wxMacWindowClipper c( m_peer ) ;

+#endif

 
     {
         wxMacEditHelper helper( m_txn ) ;
 
     {
         wxMacEditHelper helper( m_txn ) ;


@@ -2060,7 +2055,9 @@ void wxMacMLTEControl::WriteText( const wxString& str )
 
 void wxMacMLTEControl::Clear()
 {
 
 void wxMacMLTEControl::Clear()
 {

+#ifndef __LP64__

     wxMacWindowClipper c( m_peer ) ;
     wxMacWindowClipper c( m_peer ) ;

+#endif

     wxMacEditHelper st( m_txn ) ;
     TXNSetSelection( m_txn , kTXNStartOffset , kTXNEndOffset ) ;
     TXNClear( m_txn ) ;
     wxMacEditHelper st( m_txn ) ;
     TXNSetSelection( m_txn , kTXNStartOffset , kTXNEndOffset ) ;
     TXNClear( m_txn ) ;


@@ -2178,37 +2175,31 @@ bool wxMacMLTEControl::PositionToXY( long pos, long *x, long *y ) const
 
 void wxMacMLTEControl::ShowPosition( long pos )
 {
 
 void wxMacMLTEControl::ShowPosition( long pos )
 {

-#if TARGET_RT_MAC_MACHO && defined(AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER)
-    {
-        Point current, desired ;
-        TXNOffset selstart, selend;
+    Point current, desired ;
+    TXNOffset selstart, selend;

 
 

-        TXNGetSelection( m_txn, &selstart, &selend );
-        TXNOffsetToPoint( m_txn, selstart, &current );
-        TXNOffsetToPoint( m_txn, pos, &desired );
+    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, 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!") );
-        }
-    }
-#endif
+    // TODO: use HIPoints for 10.3 and above
+
+    OSErr theErr = noErr;
+    long dv = desired.v - current.v;
+    long dh = desired.h - current.h;
+    TXNShowSelection( m_txn, kTXNShowStart ) ; // NB: should this be kTXNShowStart or kTXNShowEnd ??
+    theErr = TXNScroll( m_txn, kTXNScrollUnitsInPixels, kTXNScrollUnitsInPixels, &dv, &dh );
+
+    // there will be an error returned for classic MLTE implementation when the control is
+    // invisible, but HITextView works correctly, so we don't assert that one
+    // wxASSERT_MSG( theErr == noErr, _T("TXNScroll returned an error!") );

 }
 
 void wxMacMLTEControl::SetTXNData( const wxString& st, TXNOffset start, TXNOffset end )
 {
 #if wxUSE_UNICODE
 #if SIZEOF_WCHAR_T == 2
 }
 
 void wxMacMLTEControl::SetTXNData( const wxString& st, TXNOffset start, TXNOffset end )
 {
 #if wxUSE_UNICODE
 #if SIZEOF_WCHAR_T == 2

-    size_t len = st.Len() ;
+    size_t len = st.length() ;

     TXNSetData( m_txn, kTXNUnicodeTextData, (void*)st.wc_str(), len * 2, start, end );
 #else
     wxMBConvUTF16 converter ;
     TXNSetData( m_txn, kTXNUnicodeTextData, (void*)st.wc_str(), len * 2, start, end );
 #else
     wxMBConvUTF16 converter ;


@@ -2302,6 +2293,8 @@ int wxMacMLTEControl::GetLineLength(long lineNo) const
     return theLength ;
 }
 
     return theLength ;
 }
 

+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
+

 // ----------------------------------------------------------------------------
 // MLTE control implementation (classic part)
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // MLTE control implementation (classic part)
 // ----------------------------------------------------------------------------


@@ -2312,8 +2305,6 @@ 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 ....
 
 // 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 ;
 
 TXNScrollInfoUPP gTXNScrollInfoProc = NULL ;
 ControlActionUPP gTXNScrollActionProc = NULL ;
 


@@ -2417,7 +2408,6 @@ pascal void wxMacMLTEClassicControl::TXNScrollActionProc( ControlRef controlRef
             mlte->m_lastVerticalValue = newValue ;
     }
 }
             mlte->m_lastVerticalValue = newValue ;
     }
 }

-#endif

 
 // make correct activations
 void wxMacMLTEClassicControl::MacActivatePaneText(bool setActive)
 
 // make correct activations
 void wxMacMLTEClassicControl::MacActivatePaneText(bool setActive)


@@ -2472,7 +2462,7 @@ void wxMacMLTEClassicControl::MacUpdatePosition()
         return ;
 
     Rect bounds ;
         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 } ;
 
     wxRect visRect = textctrl->MacGetClippedClientRect() ;
     Rect visBounds = { visRect.y , visRect.x , visRect.y + visRect.height , visRect.x + visRect.width } ;


@@ -2487,8 +2477,6 @@ void wxMacMLTEClassicControl::MacUpdatePosition()
         m_txnVisBounds = visBounds ;
         wxMacWindowClipper cl( textctrl ) ;
 
         m_txnVisBounds = visBounds ;
         wxMacWindowClipper cl( textctrl ) ;
 

-#ifdef __WXMAC_OSX__
-        bool isCompositing = textctrl->MacGetTopLevelWindow()->MacUsesCompositing() ;

         if ( m_sbHorizontal || m_sbVertical )
         {
             int w = bounds.right - bounds.left ;
         if ( m_sbHorizontal || m_sbVertical )
         {
             int w = bounds.right - bounds.left ;


@@ -2503,9 +2491,6 @@ void wxMacMLTEClassicControl::MacUpdatePosition()
                 sbBounds.right = w + 1 ;
                 sbBounds.bottom = h + 1 ;
 
                 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 ) ;
             }
                 SetControlBounds( m_sbHorizontal , &sbBounds ) ;
                 SetControlViewSize( m_sbHorizontal , w ) ;
             }


@@ -2519,9 +2504,6 @@ void wxMacMLTEClassicControl::MacUpdatePosition()
                 sbBounds.right = w + 1 ;
                 sbBounds.bottom = m_sbHorizontal ? h - 14 : h + 1 ;
 
                 sbBounds.right = w + 1 ;
                 sbBounds.bottom = m_sbHorizontal ? h - 14 : h + 1 ;
 

-                if ( !isCompositing )
-                    OffsetRect( &sbBounds , m_txnControlBounds.left , m_txnControlBounds.top ) ;
-

                 SetControlBounds( m_sbVertical , &sbBounds ) ;
                 SetControlViewSize( m_sbVertical , h ) ;
             }
                 SetControlBounds( m_sbVertical , &sbBounds ) ;
                 SetControlViewSize( m_sbVertical , h ) ;
             }


@@ -2556,13 +2538,6 @@ void wxMacMLTEClassicControl::MacUpdatePosition()
             m_txnControlBounds.right - (m_sbVertical ? 14 : 0),
             m_txnFrameID );
 #endif
             m_txnControlBounds.right - (m_sbVertical ? 14 : 0),
             m_txnFrameID );
 #endif

-#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 );
-#endif

 
         // the SetFrameBounds method under Classic sometimes does not correctly scroll a selection into sight after a
         // movement, therefore we have to force it
 
         // the SetFrameBounds method under Classic sometimes does not correctly scroll a selection into sight after a
         // movement, therefore we have to force it


@@ -2582,13 +2557,13 @@ void wxMacMLTEClassicControl::SetRect( Rect *r )
     MacUpdatePosition() ;
 }
 
     MacUpdatePosition() ;
 }
 

-void wxMacMLTEClassicControl::MacControlUserPaneDrawProc(wxInt16 thePart)
+void wxMacMLTEClassicControl::MacControlUserPaneDrawProc(wxInt16 WXUNUSED(thePart))

 {
     wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );
     if ( textctrl == NULL )
         return ;
 
 {
     wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );
     if ( textctrl == NULL )
         return ;
 

-    if ( textctrl->MacIsReallyShown() )
+    if ( textctrl->IsShownOnScreen() )

     {
         wxMacWindowClipper clipper( textctrl ) ;
         TXNDraw( m_txn , NULL ) ;
     {
         wxMacWindowClipper clipper( textctrl ) ;
         TXNDraw( m_txn , NULL ) ;


@@ -2601,7 +2576,7 @@ wxInt16 wxMacMLTEClassicControl::MacControlUserPaneHitTestProc(wxInt16 x, wxInt1
     ControlPartCode result = kControlNoPart;
 
     wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference( m_controlRef );
     ControlPartCode result = kControlNoPart;
 
     wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference( m_controlRef );

-    if ( (textctrl != NULL) && textctrl->MacIsReallyShown() )
+    if ( (textctrl != NULL) && textctrl->IsShownOnScreen() )

     {
         if (PtInRect( where, &m_txnControlBounds ))
         {
     {
         if (PtInRect( where, &m_txnControlBounds ))
         {


@@ -2610,13 +2585,10 @@ wxInt16 wxMacMLTEClassicControl::MacControlUserPaneHitTestProc(wxInt16 x, wxInt1
         else
         {
             // sometimes we get the coords also in control local coordinates, therefore test again
         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 ;
-            }
+            int x = 0 , y = 0 ;
+            textctrl->MacClientToRootWindow( &x , &y ) ;
+            where.h += x ;
+            where.v += y ;

 
             if (PtInRect( where, &m_txnControlBounds ))
                 result = kControlEditTextPart ;
 
             if (PtInRect( where, &m_txnControlBounds ))
                 result = kControlEditTextPart ;


@@ -2626,22 +2598,20 @@ wxInt16 wxMacMLTEClassicControl::MacControlUserPaneHitTestProc(wxInt16 x, wxInt1
     return result;
 }
 
     return result;
 }
 

-wxInt16 wxMacMLTEClassicControl::MacControlUserPaneTrackingProc( wxInt16 x, wxInt16 y, void* actionProc )
+wxInt16 wxMacMLTEClassicControl::MacControlUserPaneTrackingProc( wxInt16 x, wxInt16 y, void* WXUNUSED(actionProc) )

 {
     ControlPartCode result = kControlNoPart;
 
     wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference( m_controlRef );
 {
     ControlPartCode result = kControlNoPart;
 
     wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference( m_controlRef );

-    if ( (textctrl != NULL) && textctrl->MacIsReallyShown() )
+    if ( (textctrl != NULL) && textctrl->IsShownOnScreen() )

     {
         Point startPt = { y , x } ;
     {
         Point startPt = { y , x } ;

+

         // for compositing, we must convert these into toplevel window coordinates, because hittesting expects them
         // 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 ))
         {
 
         switch (MacControlUserPaneHitTestProc( startPt.h , startPt.v ))
         {


@@ -2669,7 +2639,7 @@ void wxMacMLTEClassicControl::MacControlUserPaneIdleProc()
     if ( textctrl == NULL )
         return ;
 
     if ( textctrl == NULL )
         return ;
 

-    if (textctrl->MacIsReallyShown())
+    if (textctrl->IsShownOnScreen())

     {
         if (IsControlActive(m_controlRef))
         {
     {
         if (IsControlActive(m_controlRef))
         {


@@ -2746,7 +2716,7 @@ wxInt16 wxMacMLTEClassicControl::MacControlUserPaneFocusProc(wxInt16 action)
     return focusResult;
 }
 
     return focusResult;
 }
 

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

 {
 }
 
 {
 }
 


@@ -2775,7 +2745,7 @@ wxMacMLTEClassicControl::wxMacMLTEClassicControl( wxTextCtrl *wxPeer,
 
     AdjustCreationAttributes( *wxWHITE , true ) ;
 
 
     AdjustCreationAttributes( *wxWHITE , true ) ;
 

-    MacSetObjectVisibility( wxPeer->MacIsReallyShown() ) ;
+    MacSetObjectVisibility( wxPeer->IsShownOnScreen() ) ;

 
     {
         wxString st = str ;
 
     {
         wxString st = str ;


@@ -2804,8 +2774,6 @@ void wxMacMLTEClassicControl::SuperChangedPosition()
     wxMacControl::SuperChangedPosition() ;
 }
 
     wxMacControl::SuperChangedPosition() ;
 }
 

-#ifdef __WXMAC_OSX__
-

 ControlUserPaneDrawUPP gTPDrawProc = NULL;
 ControlUserPaneHitTestUPP gTPHitProc = NULL;
 ControlUserPaneTrackingUPP gTPTrackProc = NULL;
 ControlUserPaneDrawUPP gTPDrawProc = NULL;
 ControlUserPaneHitTestUPP gTPHitProc = NULL;
 ControlUserPaneTrackingUPP gTPTrackProc = NULL;


@@ -2888,8 +2856,6 @@ static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, Contro
 }
 #endif
 
 }
 #endif
 

-#endif // __WXMAC_OSX__
-

 // TXNRegisterScrollInfoProc
 
 OSStatus wxMacMLTEClassicControl::DoCreate()
 // TXNRegisterScrollInfoProc
 
 OSStatus wxMacMLTEClassicControl::DoCreate()


@@ -2898,7 +2864,6 @@ OSStatus wxMacMLTEClassicControl::DoCreate()
     OSStatus err = noErr ;
 
     // set up our globals
     OSStatus err = noErr ;
 
     // set up our globals

-#ifdef __WXMAC_OSX__

     if (gTPDrawProc == NULL) gTPDrawProc = NewControlUserPaneDrawUPP(wxMacControlUserPaneDrawProc);
     if (gTPHitProc == NULL) gTPHitProc = NewControlUserPaneHitTestUPP(wxMacControlUserPaneHitTestProc);
     if (gTPTrackProc == NULL) gTPTrackProc = NewControlUserPaneTrackingUPP(wxMacControlUserPaneTrackingProc);
     if (gTPDrawProc == NULL) gTPDrawProc = NewControlUserPaneDrawUPP(wxMacControlUserPaneDrawProc);
     if (gTPHitProc == NULL) gTPHitProc = NewControlUserPaneHitTestUPP(wxMacControlUserPaneHitTestProc);
     if (gTPTrackProc == NULL) gTPTrackProc = NewControlUserPaneTrackingUPP(wxMacControlUserPaneTrackingProc);


@@ -2909,14 +2874,12 @@ OSStatus wxMacMLTEClassicControl::DoCreate()
 
     if (gTXNScrollInfoProc == NULL ) gTXNScrollInfoProc = NewTXNScrollInfoUPP(TXNScrollInfoProc) ;
     if (gTXNScrollActionProc == NULL ) gTXNScrollActionProc = NewControlActionUPP(TXNScrollActionProc) ;
 
     if (gTXNScrollInfoProc == NULL ) gTXNScrollInfoProc = NewTXNScrollInfoUPP(TXNScrollInfoProc) ;
     if (gTXNScrollActionProc == NULL ) gTXNScrollActionProc = NewControlActionUPP(TXNScrollActionProc) ;

-#endif

 
     // set the initial settings for our private data
 
     m_txnWindow = GetControlOwner(m_controlRef);
     m_txnPort = (GrafPtr) GetWindowPort(m_txnWindow);
 
 
     // set the initial settings for our private data
 
     m_txnWindow = GetControlOwner(m_controlRef);
     m_txnPort = (GrafPtr) GetWindowPort(m_txnWindow);
 

-#ifdef __WXMAC_OSX__

     // set up the user pane procedures
     SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneDrawProcTag, sizeof(gTPDrawProc), &gTPDrawProc);
     SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneHitTestProcTag, sizeof(gTPHitProc), &gTPHitProc);
     // set up the user pane procedures
     SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneDrawProcTag, sizeof(gTPDrawProc), &gTPDrawProc);
     SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneHitTestProcTag, sizeof(gTPHitProc), &gTPHitProc);


@@ -2925,10 +2888,9 @@ 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);
     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
 
     // calculate the rectangles used by the control

-    UMAGetControlBoundsInWindowCoords( m_controlRef, &bounds );
+    GetRectInWindowCoords( &bounds );

 
     m_txnControlBounds = bounds ;
     m_txnVisBounds = bounds ;
 
     m_txnControlBounds = bounds ;
     m_txnVisBounds = bounds ;


@@ -2942,7 +2904,6 @@ OSStatus wxMacMLTEClassicControl::DoCreate()
     // create the new edit field
     TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( m_windowStyle );
 
     // create the new edit field
     TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( m_windowStyle );
 

-#ifdef __WXMAC_OSX__

     // the scrollbars are not correctly embedded but are inserted at the root:
     // this gives us problems as we have erratic redraws even over the structure area
 
     // 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
 


@@ -2972,8 +2933,6 @@ OSStatus wxMacMLTEClassicControl::DoCreate()
         frameOptions &= ~(kTXNWantHScrollBarMask | kTXNDrawGrowIconMask);
     }
 
         frameOptions &= ~(kTXNWantHScrollBarMask | kTXNDrawGrowIconMask);
     }
 

-#endif
-

     err = TXNNewObject(
         NULL, m_txnWindow, &bounds, frameOptions,
         kTXNTextEditStyleFrameType, kTXNTextensionFile, kTXNSystemDefaultEncoding,
     err = TXNNewObject(
         NULL, m_txnWindow, &bounds, frameOptions,
         kTXNTextEditStyleFrameType, kTXNTextensionFile, kTXNSystemDefaultEncoding,


@@ -2993,23 +2952,18 @@ OSStatus wxMacMLTEClassicControl::DoCreate()
     verify_noerr( TXNSetTXNObjectControls( m_txn, false, toptag, iControlTags, iControlData ) );
 #endif
 
     verify_noerr( TXNSetTXNObjectControls( m_txn, false, toptag, iControlTags, iControlData ) );
 #endif
 

-#ifdef __WXMAC_OSX__

     TXNRegisterScrollInfoProc( m_txn, gTXNScrollInfoProc, (SInt32)this );
     TXNRegisterScrollInfoProc( m_txn, gTXNScrollInfoProc, (SInt32)this );

-#endif

 
     SetGWorld( origPort , origDev ) ;
 
     return err;
 }
 
     SetGWorld( origPort , origDev ) ;
 
     return err;
 }

+#endif

 
 // ----------------------------------------------------------------------------
 // MLTE control implementation (OSX part)
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // MLTE control implementation (OSX part)
 // ----------------------------------------------------------------------------
 

-#if TARGET_API_MAC_OSX
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
-

 // tiger multi-line textcontrols with no CR in the entire content
 // don't scroll automatically, so we need a hack.
 // This attempt only works 'before' the key (ie before CallNextEventHandler)
 // 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)


@@ -3030,13 +2984,10 @@ static pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler
     {
         case kEventTextInputUnicodeForKeyEvent :
         {
     {
         case kEventTextInputUnicodeForKeyEvent :
         {

-            if ( UMAGetSystemVersion() >= 0x1040 )
-            {
-                TXNOffset from , to ;
-                TXNGetSelection( focus->GetTXNObject() , &from , &to ) ;
-                if ( from == to )
-                    TXNShowSelection( focus->GetTXNObject() , kTXNShowStart );
-            }
+            TXNOffset from , to ;
+            TXNGetSelection( focus->GetTXNObject() , &from , &to ) ;
+            if ( from == to )
+                TXNShowSelection( focus->GetTXNObject() , kTXNShowStart );

             result = CallNextEventHandler(handler,event);
             break;
         }
             result = CallNextEventHandler(handler,event);
             break;
         }


@@ -3082,12 +3033,20 @@ wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer,
 
     m_scrollView = NULL ;
     TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( style ) ;
 
     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 );
 
         HIViewSetFrame( m_scrollView, &hr );
         HIViewSetVisible( m_scrollView, true );


@@ -3110,8 +3069,9 @@ wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer,
     }
 
     AdjustCreationAttributes( *wxWHITE , true ) ;
     }
 
     AdjustCreationAttributes( *wxWHITE , true ) ;

-
+#ifndef __LP64__

     wxMacWindowClipper c( m_peer ) ;
     wxMacWindowClipper c( m_peer ) ;

+#endif

     SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ;
 
     TXNSetSelection( m_txn, 0, 0 );
     SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ;
 
     TXNSetSelection( m_txn, 0, 0 );


@@ -3119,12 +3079,11 @@ wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer,
 
     InstallControlEventHandler( m_textView , GetwxMacTextControlEventHandlerUPP(),
                                 GetEventTypeCount(eventList), eventList, this,
 
     InstallControlEventHandler( m_textView , GetwxMacTextControlEventHandlerUPP(),
                                 GetEventTypeCount(eventList), eventList, this,

-                                &m_textEventHandlerRef);
+                                NULL);

 }
 
 wxMacMLTEHIViewControl::~wxMacMLTEHIViewControl()
 {
 }
 
 wxMacMLTEHIViewControl::~wxMacMLTEHIViewControl()
 {

-    ::RemoveEventHandler( m_textEventHandlerRef ) ;

 }
 
 OSStatus wxMacMLTEHIViewControl::SetFocus( ControlFocusPart focusPart )
 }
 
 OSStatus wxMacMLTEHIViewControl::SetFocus( ControlFocusPart focusPart )


@@ -3135,33 +3094,16 @@ OSStatus wxMacMLTEHIViewControl::SetFocus( ControlFocusPart focusPart )
 bool wxMacMLTEHIViewControl::HasFocus() const
 {
     ControlRef control ;
 bool wxMacMLTEHIViewControl::HasFocus() const
 {
     ControlRef control ;

+    if ( GetUserFocusWindow() == NULL )
+        return false;
+

     GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
     return control == m_textView ;
 }
 
     GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
     return control == m_textView ;
 }
 

-void wxMacMLTEHIViewControl::SetBackground( const wxBrush &brush )
+void wxMacMLTEHIViewControl::SetBackgroundColour(const wxColour& col )

 {
 {

-    wxMacMLTEControl::SetBackground( brush ) ;
-
-#if 0
-    CGColorSpaceRef rgbSpace = CGColorSpaceCreateDeviceRGB();
-    RGBColor col = MAC_WXCOLORREF(brush.GetColour().GetPixel()) ;
-
-    float component[4] ;
-    component[0] = col.red / 65536.0 ;
-    component[1] = col.green / 65536.0 ;
-    component[2] = col.blue / 65536.0 ;
-    component[3] = 1.0 ; // alpha
-
-    CGColorRef color = CGColorCreate( rgbSpace , component );
-    HITextViewSetBackgroundColor( m_textView , color );
-    CGColorSpaceRelease( rgbSpace );
-#endif
+    HITextViewSetBackgroundColor( m_textView, col.GetPixel() );

 }
 
 }
 

-#endif // MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
-
-
-#endif
-

 #endif // wxUSE_TEXTCTRL
 #endif // wxUSE_TEXTCTRL