don't create non-existing groups in HasEntry()

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

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 6cfe85a324ab14653d6cc64bd393e56292a74e4c..24f9fdf83ecd86bd6a06a6d63c8e76d9a123ae20 100644 (file)
--- 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)
 // Purpose:     wxTextCtrl
 // Author:      Stefan Csomor
 // Modified by: Ryan Norton (MLTE GetLineLength and GetLineText)


@@ -9,24 +9,31 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 
 #if wxUSE_TEXTCTRL
 
 
 #if wxUSE_TEXTCTRL
 

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

 
 #ifdef __DARWIN__
 
 #ifdef __DARWIN__

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

 #else
 #else

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

 #endif
 
 #endif
 

-#include "wx/msgdlg.h"
-

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


@@ -35,46 +42,52 @@
     #endif
 #endif
 
     #endif
 #endif
 

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

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

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

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

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

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

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

 #endif
 
 #ifndef __DARWIN__
 #include <Scrap.h>
 #endif
 
 #endif
 
 #ifndef __DARWIN__
 #include <Scrap.h>
 #endif
 

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

-#include <MacTextEditor.h>
-#include <ATSUnicode.h>
-#include <TextCommon.h>
-#include <TextEncodingConverter.h>
-#include "wx/mac/uma.h"
+#ifndef __WXMAC_OSX__
+enum
+{
+    kTXNVisibilityTag = 'visb' // set the visibility state of the object
+};
+#endif
+

 
 class wxMacFunctor
 {
 
 class wxMacFunctor
 {

-public :  
-    wxMacFunctor(){}
+public :
+    wxMacFunctor() {}

     virtual ~wxMacFunctor() {}
     virtual ~wxMacFunctor() {}

+

     virtual void* operator()() = 0 ;
     virtual void* operator()() = 0 ;

-    static void* CallBackProc(void *param) 
+
+    static void* CallBackProc( void *param )

     {
         wxMacFunctor* f = (wxMacFunctor*) param ;
         void *result = (*f)() ;
     {
         wxMacFunctor* f = (wxMacFunctor*) param ;
         void *result = (*f)() ;


@@ -82,14 +95,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 ) ;
 class wxMacObjectFunctor1 : public wxMacFunctor
 {
     typedef void (classtype::*function)( param1type p1 ) ;
     typedef void (classtype::*ref_function)( const param1type& p1 ) ;

-public :   
+public :

     wxMacObjectFunctor1( classtype *obj , function f , param1type p1 ) :
     wxMacObjectFunctor1( classtype *obj , function f , param1type p1 ) :

-        wxMacFunctor(  )
+        wxMacFunctor()

     {
         m_object = obj ;
         m_function = f ;
     {
         m_object = obj ;
         m_function = f ;


@@ -97,7 +111,7 @@ public :
     }
 
     wxMacObjectFunctor1( classtype *obj , ref_function f , param1type p1 ) :
     }
 
     wxMacObjectFunctor1( classtype *obj , ref_function f , param1type p1 ) :

-        wxMacFunctor(  )
+        wxMacFunctor()

     {
         m_object = obj ;
         m_refFunction = f ;
     {
         m_object = obj ;
         m_refFunction = f ;


@@ -105,41 +119,42 @@ public :
     }
 
     ~wxMacObjectFunctor1() {}
     }
 
     ~wxMacObjectFunctor1() {}

-    
-    virtual void* operator()() 
+
+    virtual void* operator()()

     {
     {

-        (m_object->*m_function)(m_param1) ;
+        (m_object->*m_function)( m_param1 ) ;

         return NULL ;
     }
         return NULL ;
     }

+

 private :
     classtype* m_object ;
     param1type m_param1 ;
     union
     {
 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> 
+template<typename classtype, typename param1type>

 void* wxMacMPRemoteCall( classtype *object , void (classtype::*function)( param1type p1 ) , param1type p1 )
 {
 void* wxMacMPRemoteCall( classtype *object , void (classtype::*function)( param1type p1 ) , param1type p1 )
 {

-    wxMacObjectFunctor1<classtype,param1type> params(object,function,p1) ;   
-    void *result = 
-        MPRemoteCall( wxMacFunctor::CallBackProc , &params  , kMPOwningProcessRemoteContext ) ;
+    wxMacObjectFunctor1<classtype, param1type> params(object, function, p1) ;
+    void *result =
+        MPRemoteCall( wxMacFunctor::CallBackProc , &params , kMPOwningProcessRemoteContext ) ;

     return result ;
 }
 
     return result ;
 }
 

-template<typename classtype, typename param1type> 
+template<typename classtype, typename param1type>

 void* wxMacMPRemoteCall( classtype *object , void (classtype::*function)( const param1type& p1 ) , param1type p1 )
 {
 void* wxMacMPRemoteCall( classtype *object , void (classtype::*function)( const param1type& p1 ) , param1type p1 )
 {

-    wxMacObjectFunctor1<classtype,param1type> params(object,function,p1) ;   
-    void *result = 
-        MPRemoteCall( wxMacFunctor::CallBackProc , &params  , kMPOwningProcessRemoteContext ) ;
+    wxMacObjectFunctor1<classtype,param1type> params(object, function, p1) ;
+    void *result =
+        MPRemoteCall( wxMacFunctor::CallBackProc , &params , kMPOwningProcessRemoteContext ) ;

     return result ;
 }
 
     return result ;
 }
 

-template<typename classtype, typename param1type> 
+template<typename classtype, typename param1type>

 void* wxMacMPRemoteGUICall( classtype *object , void (classtype::*function)( param1type p1 ) , param1type p1 )
 {
     wxMutexGuiLeave() ;
 void* wxMacMPRemoteGUICall( classtype *object , void (classtype::*function)( param1type p1 ) , param1type p1 )
 {
     wxMutexGuiLeave() ;


@@ -148,7 +163,7 @@ void* wxMacMPRemoteGUICall( classtype *object , void (classtype::*function)( par
     return result ;
 }
 
     return result ;
 }
 

-template<typename classtype, typename param1type> 
+template<typename classtype, typename param1type>

 void* wxMacMPRemoteGUICall( classtype *object , void (classtype::*function)( const param1type& p1 ) , param1type p1 )
 {
     wxMutexGuiLeave() ;
 void* wxMacMPRemoteGUICall( classtype *object , void (classtype::*function)( const param1type& p1 ) , param1type p1 )
 {
     wxMutexGuiLeave() ;


@@ -156,39 +171,59 @@ void* wxMacMPRemoteGUICall( classtype *object , void (classtype::*function)( con
     wxMutexGuiEnter() ;
     return result ;
 }
     wxMutexGuiEnter() ;
     return result ;
 }

+

 // common interface for all implementations
 class wxMacTextControl : public wxMacControl
 {
 public :
 // common interface for all implementations
 class wxMacTextControl : public wxMacControl
 {
 public :

-    wxMacTextControl() ;
+    wxMacTextControl( wxTextCtrl *peer ) ;

     ~wxMacTextControl() ;
     ~wxMacTextControl() ;

-    
+

     virtual wxString GetStringValue() const = 0 ;
     virtual void SetStringValue( const wxString &val ) = 0 ;
     virtual wxString GetStringValue() const = 0 ;
     virtual void SetStringValue( const wxString &val ) = 0 ;

-    virtual void SetStyle(long start, long end, const wxTextAttr& style) ;
+    virtual void SetSelection( long from, long to ) = 0 ;
+    virtual void GetSelection( long* from, long* to ) const = 0 ;
+    virtual void WriteText( const wxString& str ) = 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 Copy() ;
     virtual void Cut() ;
     virtual void Paste() ;
     virtual bool CanPaste() const ;

-    virtual void SetEditable(bool editable) ;
-    virtual long 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 ;
+    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 bool HasOwnContextMenu() const
+    { return false ; }
+
+    virtual bool SetupCursor( const wxPoint& pt )
+    { return false ; }

 
     virtual void Clear() ;
     virtual bool CanUndo() const;
 
     virtual void Clear() ;
     virtual bool CanUndo() const;

-    virtual void Undo() ; 
+    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 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 void ShowPosition(long WXUNUSED(pos)) ;

     virtual int GetLineLength(long lineNo) const ;
     virtual wxString GetLineText(long lineNo) const ;
     virtual int GetLineLength(long lineNo) const ;
     virtual wxString GetLineText(long lineNo) const ;

+
+#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

 } ;
 
 // common parts for implementations based on MLTE
 } ;
 
 // common parts for implementations based on MLTE


@@ -196,27 +231,45 @@ public :
 class wxMacMLTEControl : public wxMacTextControl
 {
 public :
 class wxMacMLTEControl : public wxMacTextControl
 {
 public :

+    wxMacMLTEControl( wxTextCtrl *peer ) ;
+

     virtual wxString GetStringValue() const ;
     virtual wxString GetStringValue() const ;

-    virtual void SetStringValue( const wxString &str) ;
-    
+    virtual void SetStringValue( const wxString &str ) ;
+

     static TXNFrameOptions FrameOptionsFromWXStyle( long wxStyle ) ;
     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 SetBackground( const wxBrush &brush ) ;
+    virtual void SetStyle( long start, long end, const wxTextAttr& style ) ;

     virtual void Copy() ;
     virtual void Cut() ;
     virtual void Paste() ;
     virtual bool CanPaste() const ;
     virtual void Copy() ;
     virtual void Cut() ;
     virtual void Paste() ;
     virtual bool CanPaste() const ;

-    virtual void SetEditable(bool editable) ;
-    virtual long GetLastPosition() const ;
-    virtual void Replace( long from , long to , const wxString str ) ;
-    virtual void Remove( long from , long to )  ;
-    virtual void GetSelection( long* from, long* to) const ;
-    virtual void SetSelection( long from , long to ) ;
-    
-    virtual void WriteText(const wxString& str) ;
+    virtual void SetEditable( bool editable ) ;
+    virtual wxTextPos GetLastPosition() const ;
+    virtual void Replace( long from, long to, const wxString &str ) ;
+    virtual void Remove( long from, long to ) ;
+    virtual void GetSelection( long* from, long* to ) const ;
+    virtual void SetSelection( long from, long to ) ;
+
+    virtual void WriteText( const wxString& str ) ;
+
+    virtual bool HasOwnContextMenu() const
+    {
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+        if ( UMAGetSystemVersion() >= 0x1040 )
+        {
+            TXNCommandEventSupportOptions options ;
+            TXNGetCommandEventSupport( m_txn , & options ) ;
+            return options & kTXNSupportEditCommandProcessing ;
+        }
+#endif
+
+        return false ;
+    }
+

     virtual void Clear() ;
 
     virtual bool CanUndo() const ;
     virtual void Clear() ;
 
     virtual bool CanUndo() const ;


@@ -231,9 +284,11 @@ public :
     virtual wxString GetLineText(long lineNo) const ;
 
     void SetTXNData( const wxString& st , TXNOffset start , TXNOffset end ) ;
     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 ) ;
 
 protected :
     void TXNSetAttribute( const wxTextAttr& style , long from , long to ) ;

+

     TXNObject m_txn ;
 } ;
 
     TXNObject m_txn ;
 } ;
 


@@ -243,31 +298,36 @@ protected :
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
 
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
 

-class wxMacMLTEHIViewControl : public wxMacMLTEControl 
+class wxMacMLTEHIViewControl : public wxMacMLTEControl

 {
 public :
 {
 public :

-    wxMacMLTEHIViewControl( wxWindow *wxPeer,
+    wxMacMLTEHIViewControl( wxTextCtrl *wxPeer,

                              const wxString& str,
                              const wxPoint& pos,
                              const wxSize& size, long style ) ;
                              const wxString& str,
                              const wxPoint& pos,
                              const wxSize& size, long style ) ;

+    ~wxMacMLTEHIViewControl() ;
+

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

-    virtual bool NeedsFocusRect() const;
+    virtual void SetBackground( const wxBrush &brush) ;
+

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

-} ;
+    EventHandlerRef m_textEventHandlerRef ;
+};

 
 #endif
 
 class wxMacUnicodeTextControl : public wxMacTextControl
 {
 public :
 
 #endif
 
 class wxMacUnicodeTextControl : public wxMacTextControl
 {
 public :

-    wxMacUnicodeTextControl( wxWindow *wxPeer,
+    wxMacUnicodeTextControl( wxTextCtrl *wxPeer,

                              const wxString& str,
                              const wxPoint& pos,
                              const wxSize& size, long style ) ;
     ~wxMacUnicodeTextControl();
                              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 VisibilityChanged(bool shown);
     virtual wxString GetStringValue() const ;
     virtual void SetStringValue( const wxString &str) ;


@@ -276,44 +336,87 @@ public :
     virtual void Paste();
     virtual bool CanPaste() const;
     virtual void SetEditable(bool editable) ;
     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) ;
     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 ;
 protected :
     // contains the tag for the content (is different for password and non-password controls)
     OSType m_valueTag ;

-} ;

 
 

-#endif
+    // 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 ;
+};

 
 

-// implementation available under classic
+#endif

 
 

-class STPTextPaneVars ;
+// 'classic' MLTE implementation

 
 class wxMacMLTEClassicControl : public wxMacMLTEControl
 {
 public :
 
 class wxMacMLTEClassicControl : public wxMacMLTEControl
 {
 public :

-    wxMacMLTEClassicControl( wxWindow *wxPeer,
+    wxMacMLTEClassicControl( wxTextCtrl *wxPeer,

                              const wxString& str,
                              const wxPoint& pos,
                              const wxSize& size, long style ) ;
     ~wxMacMLTEClassicControl() ;
                              const wxString& str,
                              const wxPoint& pos,
                              const wxSize& size, long style ) ;
     ~wxMacMLTEClassicControl() ;

+

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

-    virtual bool NeedsFocusRect() const;
+    virtual void SuperChangedPosition() ;
+
+    virtual void            MacControlUserPaneDrawProc(wxInt16 part) ;
+    virtual wxInt16         MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) ;
+    virtual wxInt16         MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) ;
+    virtual void            MacControlUserPaneIdleProc() ;
+    virtual wxInt16         MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) ;
+    virtual void            MacControlUserPaneActivateProc(bool activating) ;
+    virtual wxInt16         MacControlUserPaneFocusProc(wxInt16 action) ;
+    virtual void            MacControlUserPaneBackgroundProc(void* info) ;
+
+    virtual bool SetupCursor( const wxPoint& WXUNUSED(pt) )
+    {
+        MacControlUserPaneIdleProc();
+        return true;
+    }
+
+    virtual void            SetRect( Rect *r ) ;
+

 protected :
     OSStatus                 DoCreate();
 protected :
     OSStatus                 DoCreate();

-public :
-    // hack to make public until we have migrated all procs
-    STPTextPaneVars*    m_macTXNvars ;
-} ;

 
 

-#define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL
+    void                    MacUpdatePosition() ;
+    void                    MacActivatePaneText(bool setActive) ;
+    void                    MacFocusPaneText(bool setFocus) ;
+    void                    MacSetObjectVisibility(bool vis) ;
+
+private :
+    TXNFrameID              m_txnFrameID ;
+    GrafPtr                 m_txnPort ;
+    WindowRef               m_txnWindow ;
+    // bounds of the control as we last did set the txn frames
+    Rect                    m_txnControlBounds ;
+    Rect                    m_txnVisBounds ;
+
+#ifdef __WXMAC_OSX__
+    static pascal void TXNScrollActionProc( ControlRef controlRef , ControlPartCode partCode ) ;
+    static pascal void TXNScrollInfoProc(
+        SInt32 iValue, SInt32 iMaximumValue,
+        TXNScrollBarOrientation iScrollBarOrientation, SInt32 iRefCon ) ;
+
+    ControlRef              m_sbHorizontal ;
+    SInt32                  m_lastHorizontalValue ;
+    ControlRef              m_sbVertical ;
+    SInt32                  m_lastVerticalValue ;
+#endif
+};
+

 
 

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

 
 

-BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
+BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)

     EVT_ERASE_BACKGROUND( wxTextCtrl::OnEraseBackground )
     EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
     EVT_CHAR(wxTextCtrl::OnChar)
     EVT_ERASE_BACKGROUND( wxTextCtrl::OnEraseBackground )
     EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
     EVT_CHAR(wxTextCtrl::OnChar)


@@ -322,98 +425,118 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
     EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste)
     EVT_MENU(wxID_UNDO, wxTextCtrl::OnUndo)
     EVT_MENU(wxID_REDO, wxTextCtrl::OnRedo)
     EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste)
     EVT_MENU(wxID_UNDO, wxTextCtrl::OnUndo)
     EVT_MENU(wxID_REDO, wxTextCtrl::OnRedo)

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

 
     EVT_UPDATE_UI(wxID_CUT, wxTextCtrl::OnUpdateCut)
     EVT_UPDATE_UI(wxID_COPY, wxTextCtrl::OnUpdateCopy)
     EVT_UPDATE_UI(wxID_PASTE, wxTextCtrl::OnUpdatePaste)
     EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo)
     EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
 
     EVT_UPDATE_UI(wxID_CUT, wxTextCtrl::OnUpdateCut)
     EVT_UPDATE_UI(wxID_COPY, wxTextCtrl::OnUpdateCopy)
     EVT_UPDATE_UI(wxID_PASTE, wxTextCtrl::OnUpdatePaste)
     EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo)
     EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)

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

 END_EVENT_TABLE()
 END_EVENT_TABLE()

-#endif

 
 

-// Text item
+

 void wxTextCtrl::Init()
 {
 void wxTextCtrl::Init()
 {

-  m_editable = true ;
-  m_dirty = false;
+    m_editable = true ;
+    m_dirty = false;

 
 

-  m_maxLength = TE_UNLIMITED_LENGTH ;
+    m_maxLength = 0;
+    m_privateContextMenu = NULL;
+    m_triggerOnSetValue = true ;

 }
 
 wxTextCtrl::~wxTextCtrl()
 {
 }
 
 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_macIsUserPane = false ;

     m_editable = true ;
 
     m_editable = true ;
 

-    if ( ! ( style & wxNO_BORDER) )
-        style = ( style & ~wxBORDER_MASK) | wxSUNKEN_BORDER ;
-    
-    if ( !wxTextCtrlBase::Create(parent, id, pos, size, style & ~(wxHSCROLL|wxVSCROLL), validator, name) )
-        return FALSE;
+    if ( ! (style & wxNO_BORDER) )
+        style = (style & ~wxBORDER_MASK) | wxSUNKEN_BORDER ;

 
 

-    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;    
+    if ( !wxTextCtrlBase::Create( parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), validator, name ) )
+        return false;

 
     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)") );
+        wxASSERT_MSG(
+            !(m_windowStyle & wxTE_PROCESS_ENTER),
+            wxT("wxTE_PROCESS_ENTER style is ignored for multiline text controls (they always process it)") );

 
         m_windowStyle |= wxTE_PROCESS_ENTER;
         style |= wxTE_PROCESS_ENTER ;
     }
 
 
         m_windowStyle |= wxTE_PROCESS_ENTER;
         style |= wxTE_PROCESS_ENTER ;
     }
 

-#if TARGET_API_MAC_OSX
+    bool forceMLTE = false ;
+
+#if wxUSE_SYSTEM_OPTIONS
+    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 MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2

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

     {
     {

-        m_peer = new wxMacMLTEHIViewControl( this , str , pos , size , style ) ;
+        if ( m_windowStyle & wxTE_MULTILINE )
+            m_peer = new wxMacMLTEHIViewControl( this , str , pos , size , style ) ;

     }
 #endif
     }
 #endif

-#if !wxMAC_AWAYS_USE_MLTE
+

     if ( !m_peer )
     if ( !m_peer )

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

     }
 #endif
     }
 #endif

-#endif
+

     if ( !m_peer )
     if ( !m_peer )

-    {
-        // this control draws the border itself
-        if ( !HasFlag(wxNO_BORDER) )
-        {
-            m_windowStyle &= ~wxSUNKEN_BORDER ;
-            bounds = wxMacGetBoundsForControl( this , pos , size ) ;    
-        }    

         m_peer = new wxMacMLTEClassicControl( this , str , pos , size , style ) ;
         m_peer = new wxMacMLTEClassicControl( this , str , pos , size , style ) ;

-    }

 
 

-    MacPostControlCreate(pos,size) ;
+    MacPostControlCreate(pos, size) ;
+
+    // only now the embedding is correct and we can do a positioning update
+
+    MacSuperChangedPosition() ;

 
     if ( m_windowStyle & wxTE_READONLY)
 
     if ( m_windowStyle & wxTE_READONLY)

-    {

         SetEditable( false ) ;
         SetEditable( false ) ;

-    }
-        

 
 

-    return TRUE;
+    SetCursor( wxCursor( wxCURSOR_IBEAM ) ) ;
+
+    return true;
+}
+
+void wxTextCtrl::MacSuperChangedPosition()
+{
+    wxWindow::MacSuperChangedPosition() ;
+    GetPeer()->SuperChangedPosition() ;

 }
 
 }
 

-void wxTextCtrl::MacVisibilityChanged() 
+void wxTextCtrl::MacVisibilityChanged()

 {
     GetPeer()->VisibilityChanged( MacIsReallyShown() ) ;
 }
 
 {
     GetPeer()->VisibilityChanged( MacIsReallyShown() ) ;
 }
 

-void wxTextCtrl::MacEnabledStateChanged() 
+void wxTextCtrl::MacEnabledStateChanged()

 {
 }
 
 {
 }
 


@@ -423,7 +546,7 @@ wxString wxTextCtrl::GetValue() const
 }
 
 void wxTextCtrl::GetSelection(long* from, long* to) const
 }
 
 void wxTextCtrl::GetSelection(long* from, long* to) const

-{    
+{

     GetPeer()->GetSelection( from , to ) ;
 }
 
     GetPeer()->GetSelection( from , to ) ;
 }
 


@@ -433,12 +556,15 @@ void wxTextCtrl::SetValue(const wxString& str)
     if ( GetValue() == str )
         return ;
 
     if ( GetValue() == str )
         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 ( m_triggerOnSetValue )
+    {
+        wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );
+        event.SetString( GetValue() );
+        event.SetEventObject( this );
+        GetEventHandler()->ProcessEvent( event );
+    }

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


@@ -449,15 +575,17 @@ void wxTextCtrl::SetMaxLength(unsigned long len)
 bool wxTextCtrl::SetFont( const wxFont& font )
 {
     if ( !wxTextCtrlBase::SetFont( font ) )
 bool wxTextCtrl::SetFont( const wxFont& font )
 {
     if ( !wxTextCtrlBase::SetFont( font ) )

-        return FALSE ;
-        
+        return false ;
+

     GetPeer()->SetFont( font , GetForegroundColour() , GetWindowStyle() ) ;
     GetPeer()->SetFont( font , GetForegroundColour() , GetWindowStyle() ) ;

+

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

+

     return true ;
 }
 
     return true ;
 }
 


@@ -465,28 +593,27 @@ bool wxTextCtrl::SetDefaultStyle(const wxTextAttr& style)
 {
     wxTextCtrlBase::SetDefaultStyle( style ) ;
     SetStyle( kTXNUseCurrentSelection , kTXNUseCurrentSelection , GetDefaultStyle() ) ;
 {
     wxTextCtrlBase::SetDefaultStyle( style ) ;
     SetStyle( kTXNUseCurrentSelection , kTXNUseCurrentSelection , GetDefaultStyle() ) ;

-    return TRUE ;
+
+    return true ;

 }
 
 // Clipboard operations
 }
 
 // Clipboard operations

+

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

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

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

-        GetPeer()->Cut() ;    
+        GetPeer()->Cut() ;

 
 

-        wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
-        event.SetString( GetValue() ) ;
+        wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );

         event.SetEventObject( this );
         event.SetEventObject( this );

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

       }
 }
 
       }
 }
 


@@ -494,13 +621,13 @@ void wxTextCtrl::Paste()
 {
     if (CanPaste())
     {
 {
     if (CanPaste())
     {

-        GetPeer()->Paste() ;    
-        // eventually we should add setting the default style again
+        GetPeer()->Paste() ;
+
+        // TODO: eventually we should add setting the default style again

 
 

-        wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
-        event.SetString( GetValue() ) ;
+        wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );

         event.SetEventObject( this );
         event.SetEventObject( this );

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

     }
 }
 
     }
 }
 


@@ -508,26 +635,27 @@ bool wxTextCtrl::CanCopy() const
 {
     // Can copy if there's a selection
     long from, to;
 {
     // Can copy if there's a selection
     long from, to;

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

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

-    {
-        return false ;
-    }
+        return false;
+

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

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

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

-        return FALSE;
+        return false;

 
     return GetPeer()->CanPaste() ;
 }
 
     return GetPeer()->CanPaste() ;
 }


@@ -548,25 +676,26 @@ void wxTextCtrl::SetInsertionPoint(long pos)
 
 void wxTextCtrl::SetInsertionPointEnd()
 {
 
 void wxTextCtrl::SetInsertionPointEnd()
 {

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

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

-    long begin,end ;
+    long begin, end ;

     GetSelection( &begin , &end ) ;
     GetSelection( &begin , &end ) ;

+

     return begin ;
 }
 
     return begin ;
 }
 

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

 {
 {

-    return GetPeer()->GetLastPosition( ) ;
+    return GetPeer()->GetLastPosition() ;

 }
 
 void wxTextCtrl::Replace(long from, long to, const wxString& str)
 {
 }
 
 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)
 }
 
 void wxTextCtrl::Remove(long from, long to)


@@ -581,34 +710,28 @@ void wxTextCtrl::SetSelection(long from, long to)
 
 bool wxTextCtrl::LoadFile(const wxString& file)
 {
 
 bool wxTextCtrl::LoadFile(const wxString& file)
 {

-    if ( wxTextCtrlBase::LoadFile(file) )
-    {
-        return TRUE;
-    }
-
-    return FALSE;
+    return wxTextCtrlBase::LoadFile( file );

 }
 
 void wxTextCtrl::WriteText(const wxString& str)
 {
 }
 
 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() )
     {
     if ( !wxIsMainThread() )
     {

-        // unfortunately CW 8 is not able to correctly deduce the template types, so we have 
-        // to instantiate explicitely
+        // 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 ) ;
         wxMacMPRemoteGUICall<wxTextCtrl,wxString>( this , &wxTextCtrl::WriteText , str ) ;

+

         return ;
     }
         return ;
     }

-    else
-    {
-        GetPeer()->WriteText( str ) ;
-    }
+
+    GetPeer()->WriteText( str ) ;

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

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

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


@@ -634,35 +757,35 @@ bool wxTextCtrl::AcceptsFocus() const
 
 wxSize wxTextCtrl::DoGetBestSize() const
 {
 
 wxSize wxTextCtrl::DoGetBestSize() const
 {

-    int wText = 100 ;
-
-    int hText;
+    int wText, hText;

 
 

-    // these are the numbers from the HIG, we reduce them by the borders
-    // first
+    // these are the numbers from the HIG:
+    // we reduce them by the borders first
+    wText = 100 ;

 
 

-    switch( m_windowVariant )
+    switch ( m_windowVariant )

     {
         case wxWINDOW_VARIANT_NORMAL :
             hText = 22 - 6 ;
             break ;
     {
         case wxWINDOW_VARIANT_NORMAL :
             hText = 22 - 6 ;
             break ;

+

         case wxWINDOW_VARIANT_SMALL :
             hText = 19 - 6 ;
             break ;
         case wxWINDOW_VARIANT_SMALL :
             hText = 19 - 6 ;
             break ;

+

         case wxWINDOW_VARIANT_MINI :
         case wxWINDOW_VARIANT_MINI :

-            hText= 15 - 6 ;
+            hText = 15 - 6 ;

             break ;
             break ;

+

         default :
             hText = 22 - 6;
         default :
             hText = 22 - 6;

-            break ; 
+            break ;

     }
 
     // as the above numbers have some free space around the text
     // we get 5 lines like this anyway
     if ( m_windowStyle & wxTE_MULTILINE )
     }
 
     // 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 ;
          hText *= 5 ;

-    }

 
     if ( !HasFlag(wxNO_BORDER) )
         hText += 6 ;
 
     if ( !HasFlag(wxNO_BORDER) )
         hText += 6 ;


@@ -677,34 +800,28 @@ wxSize wxTextCtrl::DoGetBestSize() const
 void wxTextCtrl::Undo()
 {
     if (CanUndo())
 void wxTextCtrl::Undo()
 {
     if (CanUndo())

-    {

         GetPeer()->Undo() ;
         GetPeer()->Undo() ;

-    }

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

-    {

         GetPeer()->Redo() ;
         GetPeer()->Redo() ;

-    }

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

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

     return GetPeer()->CanUndo() ;
 }
 
 bool wxTextCtrl::CanRedo() const
 {
     return GetPeer()->CanUndo() ;
 }
 
 bool wxTextCtrl::CanRedo() const
 {

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

     return GetPeer()->CanRedo() ;
 }
 
     return GetPeer()->CanRedo() ;
 }
 


@@ -730,7 +847,7 @@ long wxTextCtrl::XYToPosition(long x, long y) const
 
 bool wxTextCtrl::PositionToXY(long pos, 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)
 }
 
 void wxTextCtrl::ShowPosition(long pos)


@@ -748,23 +865,17 @@ wxString wxTextCtrl::GetLineText(long lineNo) const
     return GetPeer()->GetLineText(lineNo) ;
 }
 
     return GetPeer()->GetLineText(lineNo) ;
 }
 

-/*
- * Text item
- */
-

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

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

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

-    {
-        LoadFile(event.GetFiles()[0]);
-    }
+        LoadFile( event.GetFiles()[0] );

 }
 
 void wxTextCtrl::OnEraseBackground(wxEraseEvent& event)
 }
 
 void wxTextCtrl::OnEraseBackground(wxEraseEvent& event)


@@ -781,29 +892,40 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
     int key = event.GetKeyCode() ;
     bool eat_key = false ;
 
     int key = event.GetKeyCode() ;
     bool eat_key = false ;
 

+    if ( key == 'a' && event.MetaDown() )
+    {
+        SelectAll() ;
+
+        return ;
+    }
+

     if ( key == 'c' && event.MetaDown() )
     {
         if ( CanCopy() )
             Copy() ;
     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 &&
         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 ;
     }
 
         )
     {
         // 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_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
        )
     {
         // eat it, we don't want to add more than allowed # of characters

+
+        // TODO: generate EVT_TEXT_MAXLEN()

         return;
     }
 
         return;
     }
 


@@ -814,18 +936,22 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
     {
         if ( CanPaste() )
             Paste() ;
     {
         if ( CanPaste() )
             Paste() ;

+

         return ;
     }
         return ;
     }

+

     if ( key == 'x' && event.MetaDown() )
     {
         if ( CanCut() )
             Cut() ;
     if ( key == 'x' && event.MetaDown() )
     {
         if ( CanCut() )
             Cut() ;

+

         return ;
     }
         return ;
     }

+

     switch ( key )
     {
         case WXK_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 );
             {
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
                 event.SetEventObject( this );


@@ -833,31 +959,32 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
                 if ( GetEventHandler()->ProcessEvent(event) )
                     return;
             }
                 if ( GetEventHandler()->ProcessEvent(event) )
                     return;
             }

+

             if ( !(m_windowStyle & wxTE_MULTILINE) )
             {
                 wxWindow *parent = GetParent();
             if ( !(m_windowStyle & wxTE_MULTILINE) )
             {
                 wxWindow *parent = GetParent();

-                while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) {
-                  parent = parent->GetParent() ;
+                while ( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL )
+                {
+                    parent = parent->GetParent() ;

                 }
                 }

+

                 if ( parent && parent->GetDefaultItem() )
                 {
                 if ( parent && parent->GetDefaultItem() )
                 {

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

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

+

                         return ;
                         return ;

-                   }
+                    }

                 }
 
                 // this will make wxWidgets eat the ENTER key so that
                 }
 
                 // this will make wxWidgets eat the ENTER key so that

-                // we actually prevent line wrapping in a single line
-                // text control
-                eat_key = TRUE;
+                // we actually prevent line wrapping in a single line text control
+                eat_key = true;

             }
             }

-

             break;
 
         case WXK_TAB:
             break;
 
         case WXK_TAB:


@@ -869,47 +996,36 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
                 if (event.ControlDown())
                     flags |= wxNavigationKeyEvent::WinChange ;
                 Navigate(flags);
                 if (event.ControlDown())
                     flags |= wxNavigationKeyEvent::WinChange ;
                 Navigate(flags);

+

                 return;
             }
             else
             {
                 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"));
             }
                 WriteText(wxT("\t"));
             }

-            
+            break;
+
+        default:

             break;
     }
 
     if (!eat_key)
     {
         // perform keystroke handling
             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 ) ||
     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);
          key == WXK_RETURN ||
          key == WXK_DELETE ||
          key == WXK_BACK)
     {
         wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);

-        event1.SetString( GetValue() ) ;

         event1.SetEventObject( this );
         event1.SetEventObject( this );

-        wxPostEvent(GetEventHandler(),event1);
+        wxPostEvent( GetEventHandler(), event1 );

     }
 }
 
     }
 }
 


@@ -942,6 +1058,20 @@ void wxTextCtrl::OnRedo(wxCommandEvent& WXUNUSED(event))
     Redo();
 }
 
     Redo();
 }
 

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

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


@@ -967,113 +1097,176 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
     event.Enable( CanRedo() );
 }
 
     event.Enable( CanRedo() );
 }
 

+void wxTextCtrl::OnUpdateDelete(wxUpdateUIEvent& event)
+{
+    long from, to;
+
+    GetSelection( &from, &to );
+    event.Enable( from != -1 && to != -1 && from != to && IsEditable() ) ;
+}
+
+void wxTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event)
+{
+    event.Enable(GetLastPosition() > 0);
+}
+
+// CS: Context Menus only work with MLTE implementations or non-multiline HIViews at the moment
+
+void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event)
+{
+    if ( GetPeer()->HasOwnContextMenu() )
+    {
+        event.Skip() ;
+        return ;
+    }
+
+    if (m_privateContextMenu == NULL)
+    {
+        m_privateContextMenu = new wxMenu;
+        m_privateContextMenu->Append(wxID_UNDO, _("&Undo"));
+        m_privateContextMenu->Append(wxID_REDO, _("&Redo"));
+        m_privateContextMenu->AppendSeparator();
+        m_privateContextMenu->Append(wxID_CUT, _("Cu&t"));
+        m_privateContextMenu->Append(wxID_COPY, _("&Copy"));
+        m_privateContextMenu->Append(wxID_PASTE, _("&Paste"));
+        m_privateContextMenu->Append(wxID_CLEAR, _("&Delete"));
+        m_privateContextMenu->AppendSeparator();
+        m_privateContextMenu->Append(wxID_SELECTALL, _("Select &All"));
+    }
+
+    if (m_privateContextMenu != NULL)
+        PopupMenu(m_privateContextMenu);
+}
+

 bool wxTextCtrl::MacSetupCursor( const wxPoint& pt )
 {
 bool wxTextCtrl::MacSetupCursor( const wxPoint& pt )
 {

-    return true ;
+    if ( !GetPeer()->SetupCursor( pt ) )
+        return wxWindow::MacSetupCursor( pt ) ;
+    else
+        return true ;

 }
 
 }
 

+#if !TARGET_API_MAC_OSX
+

 // user pane implementation
 
 // user pane implementation
 

-void wxTextCtrl::MacControlUserPaneDrawProc(wxInt16 part) 
+void wxTextCtrl::MacControlUserPaneDrawProc(wxInt16 part)

 {
 {

+    GetPeer()->MacControlUserPaneDrawProc( part ) ;

 }
 
 }
 

-wxInt16 wxTextCtrl::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) 
+wxInt16 wxTextCtrl::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y)

 {
 {

-    return kControlNoPart ;
+    return GetPeer()->MacControlUserPaneHitTestProc( x , y ) ;

 }
 
 }
 

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

 {
 {

-    return kControlNoPart ;
+    return GetPeer()->MacControlUserPaneTrackingProc( x , y , actionProc ) ;

 }
 
 }
 

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

 {
 {

+    GetPeer()->MacControlUserPaneIdleProc( ) ;

 }
 
 }
 

-wxInt16 wxTextCtrl::MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) 
+wxInt16 wxTextCtrl::MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers)

 {
 {

-    return kControlNoPart ;
+    return GetPeer()->MacControlUserPaneKeyDownProc( keyCode , charCode , modifiers ) ;

 }
 
 }
 

-void wxTextCtrl::MacControlUserPaneActivateProc(bool activating) 
+void wxTextCtrl::MacControlUserPaneActivateProc(bool activating)

 {
 {

+    GetPeer()->MacControlUserPaneActivateProc( activating ) ;

 }
 
 }
 

-wxInt16 wxTextCtrl::MacControlUserPaneFocusProc(wxInt16 action) 
+wxInt16 wxTextCtrl::MacControlUserPaneFocusProc(wxInt16 action)

 {
 {

-    return kControlNoPart ;
+    return GetPeer()->MacControlUserPaneFocusProc( action ) ;

 }
 
 }
 

-void wxTextCtrl::MacControlUserPaneBackgroundProc(void* info) 
+void wxTextCtrl::MacControlUserPaneBackgroundProc(void* info)

 {
 {

+    GetPeer()->MacControlUserPaneBackgroundProc( info ) ;

 }
 
 }
 

+#endif
+

 // ----------------------------------------------------------------------------
 // implementation base class
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // implementation base class
 // ----------------------------------------------------------------------------
 

-wxMacTextControl::wxMacTextControl() 
+wxMacTextControl::wxMacTextControl(wxTextCtrl* peer) :
+    wxMacControl( peer )

 {
 }
 
 {
 }
 

-wxMacTextControl::~wxMacTextControl() 
+wxMacTextControl::~wxMacTextControl()

 {
 }
 
 {
 }
 

-void wxMacTextControl::SetStyle(long start, long end, const wxTextAttr& style) 
+void wxMacTextControl::SetStyle(long start, long end, const wxTextAttr& style)

 {
 }
 
 {
 }
 

-void wxMacTextControl::Copy() 
+void wxMacTextControl::Copy()

 {
 }
 
 {
 }
 

-void wxMacTextControl::Cut() 
+void wxMacTextControl::Cut()

 {
 }
 
 {
 }
 

-void wxMacTextControl::Paste() 
+void wxMacTextControl::Paste()

 {
 }
 
 {
 }
 

-bool wxMacTextControl::CanPaste() const 
-{  
+bool wxMacTextControl::CanPaste() const
+{

     return false ;
 }
 
     return false ;
 }
 

-void wxMacTextControl::SetEditable(bool editable) 
+void wxMacTextControl::SetEditable(bool editable)
+{
+}
+
+wxTextPos wxMacTextControl::GetLastPosition() const

 {
 {

-} 
+    return GetStringValue().length() ;
+}

 
 

-long wxMacTextControl::GetLastPosition() const
+void wxMacTextControl::Replace( long from , long to , const wxString &val )

 {
 {

-    return GetStringValue().Length() ;
+    SetSelection( from , to ) ;
+    WriteText( val ) ;

 }
 
 }
 

-void wxMacTextControl::Replace( long from , long to , const wxString str ) 
+void wxMacTextControl::Remove( long from , long to )

 {
 {

+    SetSelection( from , to ) ;
+    WriteText( wxEmptyString) ;

 }
 
 }
 

-void wxMacTextControl::Clear() 
+void wxMacTextControl::Clear()

 {
     SetStringValue( wxEmptyString ) ;
 }
 
 {
     SetStringValue( wxEmptyString ) ;
 }
 

-bool wxMacTextControl::CanUndo() const 
+bool wxMacTextControl::CanUndo() const

 {
     return false ;
 }
 
 {
     return false ;
 }
 

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

 
 bool wxMacTextControl::CanRedo()  const
 {
     return false ;
 
 bool wxMacTextControl::CanRedo()  const
 {
     return false ;

-} 
+}

 
 

-void wxMacTextControl::Redo() 
+void wxMacTextControl::Redo()

 {
 }
 
 {
 }
 


@@ -1082,79 +1275,89 @@ long wxMacTextControl::XYToPosition(long x, long y) const
     return 0 ;
 }
 
     return 0 ;
 }
 

-bool wxMacTextControl::PositionToXY(long pos, long *x, long *y) const 
+bool wxMacTextControl::PositionToXY(long pos, long *x, long *y) const

 {
     return false ;
 }
 
 {
     return false ;
 }
 

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

 
 

-int wxMacTextControl::GetNumberOfLines() const 
+int wxMacTextControl::GetNumberOfLines() const

 {
     ItemCount lines = 0 ;
     wxString content = GetStringValue() ;
     lines = 1;
 {
     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
 {
     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() ;
     wxString content = GetStringValue() ;

-    
+

     // Find line first
     int count = 0;
     // 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;
     {
         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;
             {
                 if (content[j] == '\n')
                     return tmp;

-                
+

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

-            
+

             return tmp;
         }
             return tmp;
         }

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

     }
     }

+

     return wxEmptyString ;
 }
 
     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() ;
     wxString content = GetStringValue() ;

-    
+

     // Find line first
     int count = 0;
     // 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;
     {
         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++;
             {
                 count++;

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

             }
             }

-            
+

             return count;
         }
             return count;
         }

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

     }
     }

+

     return 0 ;
 }
 
     return 0 ;
 }
 


@@ -1164,128 +1367,239 @@ int  wxMacTextControl::GetLineLength(long lineNo) const
 
 #if TARGET_API_MAC_OSX
 
 
 #if TARGET_API_MAC_OSX
 

-wxMacUnicodeTextControl::wxMacUnicodeTextControl( wxWindow *wxPeer,
-                         const wxString& str,
-                         const wxPoint& pos,
-                         const wxSize& size, long style )
+// 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[] =

 {
 {

-    m_font = wxPeer->GetFont() ;
-    m_windowStyle = style ;
-    Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ;    
-    wxString st = str ;
-    wxMacConvertNewlines10To13( &st ) ;
-    wxMacCFStringHolder cf(st , m_font.GetEncoding()) ;
-    CFStringRef cfr = cf ;
+    { 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,
+    const wxString& str,
+    const wxPoint& pos,
+    const wxSize& size, long style )
+    : wxMacTextControl( wxPeer )
+{
+    m_font = wxPeer->GetFont() ;
+    m_windowStyle = style ;
+    Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ;
+    wxString st = str ;
+    wxMacConvertNewlines10To13( &st ) ;
+    wxMacCFStringHolder cf(st , m_font.GetEncoding()) ;
+    CFStringRef cfr = cf ;

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

-    CreateEditUnicodeTextControl( MAC_WXHWND(wxPeer->MacGetTopLevelWindowRef()), &bounds , cfr , isPassword , NULL , &m_controlRef ) ;
-    
+
+    OSStatus err = CreateEditUnicodeTextControl(
+        MAC_WXHWND(wxPeer->MacGetTopLevelWindowRef()), &bounds , cfr ,
+        isPassword , NULL , &m_controlRef ) ;
+    verify_noerr( err );
+

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

-    {

         SetData<Boolean>( kControlEditTextPart , kControlEditTextSingleLineTag , true ) ;
         SetData<Boolean>( kControlEditTextPart , kControlEditTextSingleLineTag , true ) ;

-    }
+
+    InstallControlEventHandler( m_controlRef , GetwxMacUnicodeTextControlEventHandlerUPP(),
+                                GetEventTypeCount(unicodeTextControlEventList), unicodeTextControlEventList, this,
+                                &m_focusHandlerRef);

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

+    ::RemoveEventHandler( m_focusHandlerRef );

 }
 
 }
 

-void wxMacUnicodeTextControl::VisibilityChanged(bool shown) 
+void wxMacUnicodeTextControl::VisibilityChanged(bool shown)

 {
     if ( !(m_windowStyle & wxTE_MULTILINE) && 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 ) );
         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 ) );
         verify_noerr( SetData<CFStringRef>( 0, m_valueTag, &value ) );
         verify_noerr( SetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &sel ) );

-        
+

         CFRelease( value ) ;
     }
 }
         CFRelease( value ) ;
     }
 }

-wxString wxMacUnicodeTextControl::GetStringValue() const 
+
+wxString wxMacUnicodeTextControl::GetStringValue() const

 {
     wxString result ;
 {
     wxString result ;

-    CFStringRef value = GetData<CFStringRef>(0,m_valueTag) ;
+    CFStringRef value = GetData<CFStringRef>(0, m_valueTag) ;

     if ( value )
     {
         wxMacCFStringHolder cf(value) ;
         result = cf.AsString() ;
     }
     if ( value )
     {
         wxMacCFStringHolder cf(value) ;
         result = cf.AsString() ;
     }

+

 #if '\n' == 10
     wxMacConvertNewlines13To10( &result ) ;
 #else
     wxMacConvertNewlines10To13( &result ) ;
 #endif
 #if '\n' == 10
     wxMacConvertNewlines13To10( &result ) ;
 #else
     wxMacConvertNewlines10To13( &result ) ;
 #endif

+

     return result ;
 }
     return result ;
 }

-void wxMacUnicodeTextControl::SetStringValue( const wxString &str) 
+
+void wxMacUnicodeTextControl::SetStringValue( const wxString &str )

 {
     wxString st = str ;
     wxMacConvertNewlines10To13( &st ) ;
 {
     wxString st = str ;
     wxMacConvertNewlines10To13( &st ) ;

-    wxMacCFStringHolder cf(st , m_font.GetEncoding() ) ;
-    verify_noerr( SetData<CFStringRef>(  0, m_valueTag , cf ) ) ;
+    wxMacCFStringHolder cf( st , m_font.GetEncoding() ) ;
+    verify_noerr( SetData<CFStringRef>( 0, m_valueTag , cf ) ) ;

 }
 }

+

 void wxMacUnicodeTextControl::Copy()
 {
     SendHICommand( kHICommandCopy ) ;
 }
 void wxMacUnicodeTextControl::Copy()
 {
     SendHICommand( kHICommandCopy ) ;
 }

+

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

+

 void wxMacUnicodeTextControl::Paste()
 {
     SendHICommand( kHICommandPaste ) ;
 }
 void wxMacUnicodeTextControl::Paste()
 {
     SendHICommand( kHICommandPaste ) ;
 }

+

 bool wxMacUnicodeTextControl::CanPaste() const
 {
     return true ;
 }
 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 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 ;
 {
     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 ) 
+void wxMacUnicodeTextControl::SetSelection( long from , long to )

 {
     ControlEditTextSelectionRec sel ;
 {
     ControlEditTextSelectionRec sel ;

+    wxString result ;
+    int textLength = 0 ;
+    CFStringRef value = GetData<CFStringRef>(0, m_valueTag) ;
+    if ( value )
+    {
+        wxMacCFStringHolder cf(value) ;
+        textLength = cf.AsString().length() ;
+    }
+
+    if ((from == -1) && (to == -1))
+    {
+        from = 0 ;
+        to = textLength ;
+    }
+    else
+    {
+        from = wxMin(textLength,wxMax(from,0)) ;
+        to = wxMax(0,wxMin(textLength,to)) ;
+    }
+

     sel.selStart = from ;
     sel.selEnd = to ;
     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 ) ;
 {
     wxString st = str ;
     wxMacConvertNewlines10To13( &st ) ;

-    #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+    if ( HasFocus() )
+    {

         wxMacCFStringHolder cf(st , m_font.GetEncoding() ) ;
         CFStringRef value = cf ;
         SetData<CFStringRef>( 0, kControlEditTextInsertCFStringRefTag, &value );
         wxMacCFStringHolder cf(st , m_font.GetEncoding() ) ;
         CFStringRef value = cf ;
         SetData<CFStringRef>( 0, kControlEditTextInsertCFStringRefTag, &value );

-    #else
+    }
+    else
+#endif
+    {

         wxString val = GetStringValue() ;
         long start , end ;
         GetSelection( &start , &end ) ;
         val.Remove( start , end - start ) ;
         val.insert( start , str ) ;
         SetStringValue( val ) ;
         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
 }
 
 #endif


@@ -1294,19 +1608,14 @@ void wxMacUnicodeTextControl::WriteText(const wxString& str)
 // MLTE control implementation (common part)
 // ----------------------------------------------------------------------------
 
 // MLTE control implementation (common part)
 // ----------------------------------------------------------------------------
 

-#if TARGET_API_MAC_OSX == 0 
-// declaration needed because of one line in the code...
-static void TPUpdateVisibility(ControlRef theControl) ;
-#endif
-
-// 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
 
 // procedural API, in order to allow changes via API all the same we must undo
 // the readonly status while we are executing, this class helps to do so
 

-class EditHelper
+class wxMacEditHelper

 {
 public :
 {
 public :

-    EditHelper( TXNObject txn )
+    wxMacEditHelper( TXNObject txn )

     {
         TXNControlTag tag[] = { kTXNIOPrivilegesTag } ;
         m_txn = txn ;
     {
         TXNControlTag tag[] = { kTXNIOPrivilegesTag } ;
         m_txn = txn ;


@@ -1317,66 +1626,79 @@ public :
             TXNSetTXNObjectControls( m_txn , false , 1 , tag , data ) ;
         }
     }
             TXNSetTXNObjectControls( m_txn , false , 1 , tag , data ) ;
         }
     }

-    ~EditHelper() 
+
+    ~wxMacEditHelper()

     {
         TXNControlTag tag[] = { kTXNIOPrivilegesTag } ;
         if ( m_data[0].uValue == kTXNReadOnly )
     {
         TXNControlTag tag[] = { kTXNIOPrivilegesTag } ;
         if ( m_data[0].uValue == kTXNReadOnly )

-        {

             TXNSetTXNObjectControls( m_txn , false , 1 , tag , m_data ) ;
             TXNSetTXNObjectControls( m_txn , false , 1 , tag , m_data ) ;

-        }

     }
     }

-    protected :
-        TXNObject m_txn ;
-        TXNControlData m_data[1] ;
+
+protected :
+    TXNObject m_txn ;
+    TXNControlData m_data[1] ;

 } ;
 
 } ;
 

-wxString wxMacMLTEControl::GetStringValue() const 
+wxMacMLTEControl::wxMacMLTEControl( wxTextCtrl *peer )
+    : wxMacTextControl( peer )
+{
+    SetNeedsFocusRect( true ) ;
+}
+
+wxString wxMacMLTEControl::GetStringValue() const

 {
     wxString result ;
     OSStatus err ;
     Size actualSize = 0;
 {
     wxString result ;
     OSStatus err ;
     Size actualSize = 0;

+

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

-        err = TXNGetDataEncoded( m_txn , kTXNStartOffset, kTXNEndOffset, &theText , kTXNUnicodeTextData );
+        err = TXNGetDataEncoded( m_txn, kTXNStartOffset, kTXNEndOffset, &theText, kTXNUnicodeTextData );
+

         // all done
         // all done

-        if ( err )
+        if ( err != noErr )

         {
             actualSize = 0 ;
         }
         else
         {
         {
             actualSize = 0 ;
         }
         else
         {

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

             if ( actualSize > 0 )
             {
                 wxChar *ptr = NULL ;
             if ( actualSize > 0 )
             {
                 wxChar *ptr = NULL ;

-#if SIZEOF_WCHAR_T == 2                
-                ptr = new wxChar[actualSize + 1 ] ;            
-                wxStrncpy( ptr , (wxChar*) *theText , actualSize ) ;
-                
+
+#if SIZEOF_WCHAR_T == 2
+                ptr = new wxChar[actualSize + 1] ;
+                wxStrncpy( ptr , (wxChar*)(*theText) , actualSize ) ;

 #else
 #else

-                SetHandleSize( theText , ( actualSize + 1 ) * sizeof( UniChar ) ) ;
+                SetHandleSize( theText, (actualSize + 1) * sizeof(UniChar) ) ;

                 HLock( theText ) ;
                 (((UniChar*)*theText)[actualSize]) = 0 ;
                 HLock( theText ) ;
                 (((UniChar*)*theText)[actualSize]) = 0 ;

-                wxMBConvUTF16BE converter ;
+                wxMBConvUTF16 converter ;

                 size_t noChars = converter.MB2WC( NULL , (const char*)*theText , 0 ) ;
                 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] ;
                 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[noChars] = 0 ;
                 HUnlock( theText ) ;
 #endif

+

                 ptr[actualSize] = 0 ;
                 result = wxString( ptr ) ;
                 ptr[actualSize] = 0 ;
                 result = wxString( ptr ) ;

-                delete[] ptr ;
+                delete [] ptr ;

             }
             }

+

             DisposeHandle( theText ) ;
         }
 #else
         Handle theText ;
             DisposeHandle( theText ) ;
         }
 #else
         Handle theText ;

-        err = TXNGetDataEncoded( m_txn , kTXNStartOffset, kTXNEndOffset, &theText , kTXNTextData );
+        err = TXNGetDataEncoded( m_txn , kTXNStartOffset, kTXNEndOffset, &theText, kTXNTextData );
+

         // all done
         // all done

-        if ( err )
+        if ( err != noErr )

         {
             actualSize = 0 ;
         }
         {
             actualSize = 0 ;
         }


@@ -1389,137 +1711,182 @@ wxString wxMacMLTEControl::GetStringValue() const
                 result = wxString( *theText , wxConvLocal , actualSize ) ;
                 HUnlock( theText ) ;
             }
                 result = wxString( *theText , wxConvLocal , actualSize ) ;
                 HUnlock( theText ) ;
             }

+

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

+

 #if '\n' == 10
     wxMacConvertNewlines13To10( &result ) ;
 #else
     wxMacConvertNewlines10To13( &result ) ;
 #endif
 #if '\n' == 10
     wxMacConvertNewlines13To10( &result ) ;
 #else
     wxMacConvertNewlines10To13( &result ) ;
 #endif

+

     return result ;
 }
 
     return result ;
 }
 

-void wxMacMLTEControl::SetStringValue( const wxString &str) 
+void wxMacMLTEControl::SetStringValue( const wxString &str )

 {
 {

-    wxString st = str ;
+    wxString st = str;
+    wxMacConvertNewlines10To13( &st );

 
 

-    wxMacConvertNewlines10To13( &st ) ;
-    EditHelper help(m_txn) ;
+    {
+        wxMacWindowClipper c( m_peer );

 
 

-    // wxMacWindowClipper c( this ) ;
-#if !TARGET_API_MAC_OSX
-    // otherwise scrolling might have problems ?
-    TPUpdateVisibility( m_controlRef ) ;
-#endif
-    SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ;
-    TXNSetSelection( m_txn, 0, 0);
-    TXNShowSelection( m_txn, kTXNShowStart);
+        {
+            wxMacEditHelper help( m_txn );
+            SetTXNData( st, kTXNStartOffset, kTXNEndOffset );
+        }
+
+        TXNSetSelection( m_txn, 0, 0 );
+        TXNShowSelection( m_txn, kTXNShowStart );
+    }

 }
 
 TXNFrameOptions wxMacMLTEControl::FrameOptionsFromWXStyle( long wxStyle )
 {
 }
 
 TXNFrameOptions wxMacMLTEControl::FrameOptionsFromWXStyle( long wxStyle )
 {

-    TXNFrameOptions frameOptions =
-        kTXNDontDrawCaretWhenInactiveMask ;
-    if ( ! ( wxStyle & wxTE_NOHIDESEL ) )
+    TXNFrameOptions frameOptions = kTXNDontDrawCaretWhenInactiveMask;
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
+    frameOptions |= kTXNDoFontSubstitutionMask;
+#endif
+
+    if ( ! (wxStyle & wxTE_NOHIDESEL) )

         frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ;
 
         frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ;
 

+    if ( wxStyle & (wxHSCROLL | wxTE_DONTWRAP) )
+        frameOptions |= kTXNWantHScrollBarMask ;
+

     if ( wxStyle & wxTE_MULTILINE )
     {
     if ( wxStyle & wxTE_MULTILINE )
     {

-        if ( ! ( wxStyle & wxTE_DONTWRAP ) )
-            frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
-        else
-        {
-            frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
-            frameOptions |= kTXNWantHScrollBarMask ;
-        }
+        frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;

 
 

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

             frameOptions |= kTXNWantVScrollBarMask ;
             frameOptions |= kTXNWantVScrollBarMask ;

+
+            // The following code causes drawing problems on 10.4. Perhaps it can be restored for
+            // older versions of the OS, but I'm not sure it's appropriate to put a grow icon here
+            // anyways, as AFAIK users can't actually use it to resize the text ctrl.
+//            if ( frameOptions & kTXNWantHScrollBarMask )
+//                frameOptions |= kTXNDrawGrowIconMask ;
+        }

     }
     else
     }
     else

+    {

         frameOptions |= kTXNSingleLineOnlyMask ;
         frameOptions |= kTXNSingleLineOnlyMask ;

-        
-    if ( wxStyle & wxHSCROLL )
-        frameOptions |= kTXNWantHScrollBarMask ;
-    
+    }
+

     return frameOptions ;
 }
 
 void wxMacMLTEControl::AdjustCreationAttributes( const wxColour &background, bool visible )
 {
     return frameOptions ;
 }
 
 void wxMacMLTEControl::AdjustCreationAttributes( const wxColour &background, bool visible )
 {

-    TXNControlTag iControlTags[3] = { kTXNDoFontSubstitution, kTXNWordWrapStateTag };
-    TXNControlData iControlData[3] = { {false}, {kTXNNoAutoWrap} };
-    int toptag = 2 ;
-#if TARGET_API_MAC_OSX
-    iControlTags[2] = kTXNVisibilityTag ;
-    iControlData[2].uValue = visible ;
-    toptag++ ;
-#endif        
-    
+    TXNControlTag iControlTags[] =
+        {
+            kTXNDoFontSubstitution,
+            kTXNWordWrapStateTag ,
+        };
+    TXNControlData iControlData[] =
+        {
+            { true },
+            { kTXNNoAutoWrap },
+        };
+
+    int toptag = WXSIZEOF( iControlTags ) ;
+

     if ( m_windowStyle & wxTE_MULTILINE )
     {
     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

 
 

-    Str255 fontName ;
-    SInt16 fontSize ;
-    Style fontStyle ;
+    OSStatus err = TXNSetTXNObjectControls( m_txn, false, toptag, iControlTags, iControlData ) ;
+    verify_noerr( err );

 
 

-    GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+    // setting the default font:
+    // under 10.2 this causes a visible caret, therefore we avoid it

 
 

-    TXNTypeAttributes typeAttr[] =
+    if ( UMAGetSystemVersion() >= 0x1030 )

     {
     {

-        {   kTXNQDFontNameAttribute , kTXNQDFontNameAttributeSize , { (void*) fontName } } ,
-        {   kTXNQDFontSizeAttribute , kTXNFontSizeAttributeSize , { (void*) (fontSize << 16) } } ,
-        {   kTXNQDFontStyleAttribute , kTXNQDFontStyleAttributeSize , {  (void*) normal } } ,
-    } ;
+        Str255 fontName ;
+        SInt16 fontSize ;
+        Style fontStyle ;
+
+        GetThemeFont( kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+
+        TXNTypeAttributes typeAttr[] =
+        {
+            { kTXNQDFontNameAttribute , kTXNQDFontNameAttributeSize , { (void*) fontName } } ,
+            { kTXNQDFontSizeAttribute , kTXNFontSizeAttributeSize , { (void*) (fontSize << 16) } } ,
+            { kTXNQDFontStyleAttribute , kTXNQDFontStyleAttributeSize , { (void*) normal } } ,
+        } ;

 
 

-    verify_noerr( TXNSetTypeAttributes (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 )
     {
 
     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() );
     }
 
     TXNBackground tback;
     tback.bgType = kTXNBackgroundTypeRGB;
     tback.bg.color = MAC_WXCOLORREF( background.GetPixel() );

-    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 )
+        {
+            options |=
+                kTXNSupportEditCommandProcessing
+                | kTXNSupportEditCommandUpdating
+                | kTXNSupportSpellCheckCommandProcessing
+                | kTXNSupportSpellCheckCommandUpdating
+                | kTXNSupportFontCommandProcessing
+                | kTXNSupportFontCommandUpdating;
+
+            TXNSetCommandEventSupport( m_txn , options ) ;
+        }
+    }
+#endif

 }
 
 }
 

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

 {
     // currently only solid background are supported
     TXNBackground tback;
 {
     // currently only solid background are supported
     TXNBackground tback;

+

     tback.bgType = kTXNBackgroundTypeRGB;
     tback.bg.color = MAC_WXCOLORREF( brush.GetColour().GetPixel() );
     tback.bgType = kTXNBackgroundTypeRGB;
     tback.bg.color = MAC_WXCOLORREF( brush.GetColour().GetPixel() );

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

 }
 
 }
 

-void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , long to)
+void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , long to )

 {
 {

-       TXNTypeAttributes typeAttr[4] ;
-    Str255 fontName = "\pMonaco" ;
-    SInt16 fontSize = 12 ;
-    Style fontStyle = normal ;
+    TXNTypeAttributes typeAttr[4] ;

     RGBColor color ;
     RGBColor color ;

-    int attrCounter = 0 ;
+    int attrCount = 0 ;
+

     if ( style.HasFont() )
     {
         const wxFont &font = style.GetFont() ;
     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() )
         wxMacStringToPascal( font.GetFaceName() , fontName ) ;
         fontSize = font.GetPointSize() ;
         if ( font.GetUnderlined() )


@@ -1529,60 +1896,76 @@ void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , lo
         if ( font.GetStyle() == wxITALIC )
             fontStyle |= italic ;
 
         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[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

     }
     }

+

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

-        typeAttr[attrCounter].tag = kTXNQDFontColorAttribute ;
-        typeAttr[attrCounter].size = kTXNQDFontColorAttributeSize ;
-        typeAttr[attrCounter].data.dataPtr = (void*) &color ;

         color = MAC_WXCOLORREF(style.GetTextColour().GetPixel()) ;
         color = MAC_WXCOLORREF(style.GetTextColour().GetPixel()) ;

-        attrCounter += 1 ;
+
+        typeAttr[attrCount].tag = kTXNQDFontColorAttribute ;
+        typeAttr[attrCount].size = kTXNQDFontColorAttributeSize ;
+        typeAttr[attrCount].data.dataPtr = (void*) &color ;
+        attrCount++ ;

     }
     }

-    if ( attrCounter > 0 )
+
+    if ( attrCount > 0 )

     {
     {

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

     }
 }
 
     }
 }
 

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

 {
 {

-    EditHelper help(m_txn) ;
-    TXNSetAttribute( wxTextAttr(foreground,wxNullColour,font) , kTXNStartOffset,kTXNEndOffset ) ;
+    wxMacEditHelper help( m_txn ) ;
+    TXNSetAttribute( style, start, end ) ;

 }
 }

-void wxMacMLTEControl::SetStyle(long start, long end, const wxTextAttr& style) 
-{ 
-    EditHelper help(m_txn) ;
-    TXNSetAttribute( style , start,end ) ;
-}   
- 
-void wxMacMLTEControl::Copy() 
+
+void wxMacMLTEControl::Copy()

 {
     ClearCurrentScrap();
 {
     ClearCurrentScrap();

-    TXNCopy(m_txn);
+    TXNCopy( m_txn );

     TXNConvertToPublicScrap();
 }
 
     TXNConvertToPublicScrap();
 }
 

-void wxMacMLTEControl::Cut() 
+void wxMacMLTEControl::Cut()

 {
     ClearCurrentScrap();
 {
     ClearCurrentScrap();

-    TXNCut(m_txn);
+    TXNCut( m_txn );

     TXNConvertToPublicScrap();
 }
 
     TXNConvertToPublicScrap();
 }
 

-void wxMacMLTEControl::Paste() 
+void wxMacMLTEControl::Paste()

 {
     TXNConvertFromPublicScrap();
 {
     TXNConvertFromPublicScrap();

-    TXNPaste(m_txn);
+    TXNPaste( m_txn );

 }
 
 bool wxMacMLTEControl::CanPaste() const
 }
 
 bool wxMacMLTEControl::CanPaste() const


@@ -1590,50 +1973,52 @@ bool wxMacMLTEControl::CanPaste() const
     return TXNIsScrapPastable() ;
 }
 
     return TXNIsScrapPastable() ;
 }
 

-void wxMacMLTEControl::SetEditable(bool editable) 
+void wxMacMLTEControl::SetEditable(bool editable)

 {
     TXNControlTag tag[] = { kTXNIOPrivilegesTag } ;
     TXNControlData data[] = { { editable ? kTXNReadWrite : kTXNReadOnly } } ;
 {
     TXNControlTag tag[] = { kTXNIOPrivilegesTag } ;
     TXNControlData data[] = { { editable ? kTXNReadWrite : kTXNReadOnly } } ;

-    TXNSetTXNObjectControls( m_txn , false , sizeof(tag) / sizeof (TXNControlTag) , tag , data ) ;
+    TXNSetTXNObjectControls( m_txn, false, WXSIZEOF(tag), tag, data ) ;

 }
 
 }
 

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

 {
 {

-    long actualsize = 0 ;
+    wxTextPos actualsize = 0 ;

 
     Handle theText ;
 
     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
     {
     }
     else
     {

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

     }
 
     return actualsize ;
 }
 
     }
 
     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 ) ;
 
 {
     wxString value = str ;
     wxMacConvertNewlines10To13( &value ) ;
 

-    EditHelper help( m_txn ) ;
+    wxMacEditHelper help( m_txn ) ;
+    wxMacWindowClipper c( m_peer ) ;

 
 

-    TXNSetSelection(m_txn , from , to ) ;
+    TXNSetSelection( m_txn, from, to ) ;

     TXNClear( m_txn ) ;
     TXNClear( m_txn ) ;

-    SetTXNData( value , kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ;
+    SetTXNData( value, kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ;

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

-    EditHelper help( m_txn ) ;
-
-    TXNSetSelection(m_txn , from , to ) ;
+    wxMacWindowClipper c( m_peer ) ;
+    wxMacEditHelper help( m_txn ) ;
+    TXNSetSelection( m_txn , from , to ) ;

     TXNClear( m_txn ) ;
 }
 
     TXNClear( m_txn ) ;
 }
 


@@ -1642,486 +2027,589 @@ void wxMacMLTEControl::GetSelection( long* from, long* to) const
     TXNGetSelection( m_txn , (TXNOffset*) from , (TXNOffset*) to ) ;
 }
 
     TXNGetSelection( m_txn , (TXNOffset*) from , (TXNOffset*) to ) ;
 }
 

-void wxMacMLTEControl::SetSelection( long from , long to ) 
+void wxMacMLTEControl::SetSelection( long from , long to )

 {
 {

-    /* change the selection */
+    wxMacWindowClipper c( m_peer ) ;
+
+    // change the selection

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

-       TXNSelectAll(m_txn);
+        TXNSelectAll( m_txn );

     else
     else

-       TXNSetSelection( m_txn, from, to);
-    TXNShowSelection( m_txn, kTXNShowStart);
+        TXNSetSelection( m_txn, from, to );
+
+    TXNShowSelection( m_txn, kTXNShowStart );

 }
 
 }
 

-void wxMacMLTEControl::WriteText(const wxString& str) 
+void wxMacMLTEControl::WriteText( const wxString& str )

 {
 {

-    EditHelper helper( m_txn ) ;

     wxString st = str ;
     wxMacConvertNewlines10To13( &st ) ;
 
     long start , end , dummy ;
     wxString st = str ;
     wxMacConvertNewlines10To13( &st ) ;
 
     long start , end , dummy ;

+

     GetSelection( &start , &dummy ) ;
     GetSelection( &start , &dummy ) ;

-    SetTXNData( st , kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ;
-    GetSelection( &dummy , &end ) ;
-    // TODO SetStyle( start , end , GetDefaultStyle() ) ;
+    wxMacWindowClipper c( m_peer ) ;
+
+    {
+        wxMacEditHelper helper( m_txn ) ;
+        SetTXNData( st, kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ;
+    }
+
+    GetSelection( &dummy, &end ) ;
+
+    // TODO: SetStyle( start , end , GetDefaultStyle() ) ;

 }
 
 }
 

-void wxMacMLTEControl::Clear() 
+void wxMacMLTEControl::Clear()

 {
 {

-    EditHelper st(m_txn) ;
+    wxMacWindowClipper c( m_peer ) ;
+    wxMacEditHelper st( m_txn ) ;

     TXNSetSelection( m_txn , kTXNStartOffset , kTXNEndOffset ) ;
     TXNSetSelection( m_txn , kTXNStartOffset , kTXNEndOffset ) ;

-    TXNClear(m_txn);
+    TXNClear( m_txn ) ;

 }
 
 }
 

-bool wxMacMLTEControl::CanUndo() const 
+bool wxMacMLTEControl::CanUndo() const

 {
     return TXNCanUndo( m_txn , NULL ) ;
 }
 
 {
     return TXNCanUndo( m_txn , NULL ) ;
 }
 

-void wxMacMLTEControl::Undo() 
+void wxMacMLTEControl::Undo()

 {
 {

-    TXNUndo( m_txn ) ; 
-} 
+    TXNUndo( m_txn ) ;
+}

 
 

-bool wxMacMLTEControl::CanRedo()  const
+bool wxMacMLTEControl::CanRedo() const

 {
     return TXNCanRedo( m_txn , NULL ) ;
 {
     return TXNCanRedo( m_txn , NULL ) ;

-} 
+}

 
 

-void wxMacMLTEControl::Redo() 
-{ 
+void wxMacMLTEControl::Redo()
+{

     TXNRedo( m_txn ) ;
 }
 
     TXNRedo( m_txn ) ;
 }
 

-int wxMacMLTEControl::GetNumberOfLines() const 
+int wxMacMLTEControl::GetNumberOfLines() const

 {
     ItemCount lines = 0 ;
 {
     ItemCount lines = 0 ;

-    TXNGetLineCount(m_txn, &lines ) ;
+    TXNGetLineCount( m_txn, &lines ) ;
+

     return lines ;
 }
 
 long wxMacMLTEControl::XYToPosition(long x, long y) const
 {
     Point curpt ;
     return lines ;
 }
 
 long wxMacMLTEControl::XYToPosition(long x, long y) const
 {
     Point curpt ;

-    
-    long lastpos = GetLastPosition() ;
-    
-    // TODO find a better implementation : while we can get the 
+    wxTextPos lastpos ;
+
+    // TODO: find a better implementation : while we can get the

     // line metrics of a certain line, we don't get its starting
     // position, so it would probably be rather a binary search
     // for the start position
     // 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 ;
     int lastHeight = 0 ;

-

     ItemCount n ;
     ItemCount n ;

+
+    lastpos = GetLastPosition() ;

     for ( n = 0 ; n <= (ItemCount) lastpos ; ++n )
     {
         if ( y == ypos && x == xpos )
             return n ;
     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 ;
 
         if ( curpt.v > lastHeight )
         {
             xpos = 0 ;
             if ( n > 0 )
                 ++ypos ;

+

             lastHeight = curpt.v ;
         }
         else
             ++xpos ;
     }
             lastHeight = curpt.v ;
         }
         else
             ++xpos ;
     }

+

     return 0 ;
 }
 
     return 0 ;
 }
 

-bool wxMacMLTEControl::PositionToXY(long pos, long *x, long *y) const
+bool wxMacMLTEControl::PositionToXY( long pos, long *x, long *y ) const

 {
     Point curpt ;
 {
     Point curpt ;

-    
-    long lastpos = GetLastPosition() ;
-    
-    if ( y ) *y = 0 ;
-    if ( x ) *x = 0 ;
-    
+    wxTextPos lastpos ;
+
+    if ( y )
+        *y = 0 ;
+    if ( x )
+        *x = 0 ;
+
+    lastpos = GetLastPosition() ;

     if ( pos <= lastpos )
     {
     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
         // 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 ;
         int lastHeight = 0 ;

-

         ItemCount n ;
         ItemCount n ;

+

         for ( n = 0 ; n <= (ItemCount) pos ; ++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 ;
 
             if ( curpt.v > lastHeight )
             {
                 xpos = 0 ;
                 if ( n > 0 )
                     ++ypos ;

+

                 lastHeight = curpt.v ;
             }
             else
                 ++xpos ;
         }
                 lastHeight = curpt.v ;
             }
             else
                 ++xpos ;
         }

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

     }
 
     }
 

-    return FALSE ;
+    return false ;

 }
 
 }
 

-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)
     {
 {
 #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 )
+        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
+        if ( (UInt32)TXNScroll != (UInt32)kUnresolvedCFragSymbolAddress )

         {
             OSErr theErr = noErr;
         {
             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 );          
-            wxASSERT_MSG( theErr == noErr, _T("TXNScroll returned an error!") );
+            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
 }
 
         }
     }
 #endif
 }
 

-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
 {
 #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
 #else

-       wxMBConvUTF16BE converter ;
-       ByteCount byteBufferLen = converter.WC2MB( NULL , st.wc_str() , 0 ) ;
-       UniChar *unibuf = (UniChar*) malloc(byteBufferLen) ;
-       converter.WC2MB( (char*) unibuf , st.wc_str() , byteBufferLen ) ;
-    TXNSetData( m_txn , kTXNUnicodeTextData,  (void*)unibuf, byteBufferLen ,
-      start, end);
-       free( unibuf ) ;
+    wxMBConvUTF16 converter ;
+    ByteCount byteBufferLen = converter.WC2MB( NULL, st.wc_str(), 0 ) ;
+    UniChar *unibuf = (UniChar*)malloc( byteBufferLen ) ;
+    converter.WC2MB( (char*)unibuf, st.wc_str(), byteBufferLen ) ;
+    TXNSetData( m_txn, kTXNUnicodeTextData, (void*)unibuf, byteBufferLen, start, end ) ;
+    free( unibuf ) ;

 #endif
 #else
 #endif
 #else

-       wxCharBuffer text =  st.mb_str(wxConvLocal)  ;
-    TXNSetData( m_txn , kTXNTextData,  (void*)text.data(), strlen( text ) ,
-      start, end);
-#endif  
+    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() )
     {
 wxString wxMacMLTEControl::GetLineText(long lineNo) const
 {
     wxString line ;
 
     if ( lineNo < GetNumberOfLines() )
     {

-        long ypos = 0 ;
-        
-        Fixed  lineWidth,
-                lineHeight,
-                currentHeight = 0;
-        
-        // get the first possible position in the control

         Point firstPoint;
         Point firstPoint;

+        Fixed lineWidth, lineHeight, currentHeight;
+        long ypos ;
+
+        // get the first possible position in the control

         TXNOffsetToPoint(m_txn, 0, &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
         // Iterate through the lines until we reach the one we want,
         // adding to our current y pixel point position

+        ypos = 0 ;
+        currentHeight = 0;

         while (ypos < lineNo)
         {
             TXNGetLineMetrics(m_txn, ypos++, &lineWidth, &lineHeight);
             currentHeight += lineHeight;
         }
         while (ypos < lineNo)
         {
             TXNGetLineMetrics(m_txn, ypos++, &lineWidth, &lineHeight);
             currentHeight += lineHeight;
         }

-        
+

         Point thePoint = { firstPoint.v + (currentHeight >> 16), firstPoint.h + (0) };
         TXNOffset theOffset;
         TXNPointToOffset(m_txn, thePoint, &theOffset);
         Point thePoint = { firstPoint.v + (currentHeight >> 16), firstPoint.h + (0) };
         TXNOffset theOffset;
         TXNPointToOffset(m_txn, thePoint, &theOffset);

-                    
+

         wxString content = GetStringValue() ;
         Point currentPoint = thePoint;
         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);
         }
     }
         {
             line += content[theOffset];
             TXNOffsetToPoint(m_txn, ++theOffset, &currentPoint);
         }
     }

+

     return line ;
 }
 
     return line ;
 }
 

-int  wxMacMLTEControl::GetLineLength(long lineNo) const
+int wxMacMLTEControl::GetLineLength(long lineNo) const

 {
     int theLength = 0;
 
     if ( lineNo < GetNumberOfLines() )
     {
 {
     int theLength = 0;
 
     if ( lineNo < GetNumberOfLines() )
     {

-        long ypos = 0 ;
-        
-        Fixed  lineWidth,
-                lineHeight,
-                currentHeight = 0;
-        
-        // get the first possible position in the control

         Point firstPoint;
         Point firstPoint;

+        Fixed lineWidth, lineHeight, currentHeight;
+        long ypos;
+
+        // get the first possible position in the control

         TXNOffsetToPoint(m_txn, 0, &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
         // Iterate through the lines until we reach the one we want,
         // adding to our current y pixel point position

+        ypos = 0;
+        currentHeight = 0;

         while (ypos < lineNo)
         {
             TXNGetLineMetrics(m_txn, ypos++, &lineWidth, &lineHeight);
             currentHeight += lineHeight;
         }
         while (ypos < lineNo)
         {
             TXNGetLineMetrics(m_txn, ypos++, &lineWidth, &lineHeight);
             currentHeight += lineHeight;
         }

-        
+

         Point thePoint = { firstPoint.v + (currentHeight >> 16), firstPoint.h + (0) };
         TXNOffset theOffset;
         TXNPointToOffset(m_txn, thePoint, &theOffset);
         Point thePoint = { firstPoint.v + (currentHeight >> 16), firstPoint.h + (0) };
         TXNOffset theOffset;
         TXNPointToOffset(m_txn, thePoint, &theOffset);

-                    
+

         wxString content = GetStringValue() ;
         Point currentPoint = thePoint;
         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);
         }
     }
         {
             ++theLength;
             TXNOffsetToPoint(m_txn, ++theOffset, &currentPoint);
         }
     }

+

     return theLength ;
 }
 
     return theLength ;
 }
 

-

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

-// CS:TODO we still have a problem getting properly at the text events of a control because under Carbon
-// the MLTE engine registers itself for the key events thus the normal flow never occurs, the only measure for the
-// moment is to avoid setting the true focus on the control, the proper solution at the end would be to have
-// an alternate path for carbon key events that routes automatically into the same wx flow of events
-
-/* part codes */
+// OS X Notes : We still don't have a full replacement for MLTE, so this implementation
+// has to live on. We have different problems coming from outdated implementations on the
+// various OS X versions. Most deal with the scrollbars: they are not correctly embedded
+// while this can be solved on 10.3 by reassigning them the correct place, on 10.2 there is
+// no way out, therefore we are using our own implementation and our own scrollbars ....

 
 

-/* kmUPTextPart is the part code we return to indicate the user has clicked
-in the text area of our control */
-#define kmUPTextPart 1
-
-
-/* routines for using existing user pane controls.
-These routines are useful for cases where you would like to use an
-existing user pane control in, say, a dialog window as a scrolling
-text edit field.*/
-
-/* Utility Routines */
-
-/* kUserClickedToFocusPart is a part code we pass to the SetKeyboardFocus
-routine.  In our focus switching routine this part code is understood
-as meaning 'the user has clicked in the control and we need to switch
-the current focus to ourselves before we can continue'. */
-#define kUserClickedToFocusPart 100
-
-/* STPTextPaneVars is a structure used for storing the the mUP Control's
-internal variables and state information.  A handle to this record is
-stored in the pane control's reference value field using the
-SetControlReference routine. */
-
-class STPTextPaneVars {
-public :
-    /* OS records referenced */
-    TXNObject fTXNRec; /* the txn record */
-    TXNFrameID fTXNFrame; /* the txn frame ID */
-    ControlRef fUserPaneRec;  /* handle to the user pane control */
-    WindowPtr fOwner; /* window containing control */
-    GrafPtr fDrawingEnvironment; /* grafport where control is drawn */
-    /* flags */
-    Boolean fInFocus; /* true while the focus rect is drawn around the control */
-    Boolean fIsActive; /* true while the control is drawn in the active state */
-    Boolean fTXNObjectActive; /* reflects the activation state of the text edit record */
-       Boolean fFocusDrawState; /* true if focus is drawn (default: true) */ 
-    /* calculated locations */
-    Rect fRBounds; /* control bounds */
-    Rect fRTextArea; /* area where the text is drawn */
-    Rect fRFocusOutline;  /* rectangle used to draw the focus box */
-    Rect fRTextOutline; /* rectangle used to draw the border */
-    RgnHandle fRTextOutlineRegion; /* background region for the text, erased before calling TEUpdate */
-    /* our focus advance override routine */
-    EventHandlerUPP handlerUPP;
-    EventHandlerRef handlerRef;
-    bool fNoBorders ;
-    bool fMultiline ;
-    bool fVisible ;
-} ;
+#ifdef __WXMAC_OSX__

 
 

-/* Univerals Procedure Pointer variables used by the
-mUP Control.  These variables are set up
-the first time that mUPOpenControl is called. */
-ControlUserPaneDrawUPP gTPDrawProc = NULL;
-ControlUserPaneHitTestUPP gTPHitProc = NULL;
-ControlUserPaneTrackingUPP gTPTrackProc = NULL;
-ControlUserPaneIdleUPP gTPIdleProc = NULL;
-ControlUserPaneKeyDownUPP gTPKeyProc = NULL;
-ControlUserPaneActivateUPP gTPActivateProc = NULL;
-ControlUserPaneFocusUPP gTPFocusProc = NULL;
+TXNScrollInfoUPP gTXNScrollInfoProc = NULL ;
+ControlActionUPP gTXNScrollActionProc = NULL ;

 
 

-// one place for calculating all
-static void TPCalculateBounds(STPTextPaneVars *varsp, const Rect& bounds) 
+pascal void wxMacMLTEClassicControl::TXNScrollInfoProc(
+    SInt32 iValue, SInt32 iMaximumValue,
+    TXNScrollBarOrientation iScrollBarOrientation, SInt32 iRefCon )

 {
 {

-    SetRect(&varsp->fRBounds, bounds.left, bounds.top, bounds.right, bounds.bottom);
-    SetRect(&varsp->fRFocusOutline, bounds.left, bounds.top, bounds.right, bounds.bottom);
-    // eventually make TextOutline inset 1,1
-    SetRect(&varsp->fRTextOutline, bounds.left, bounds.top, bounds.right, bounds.bottom);
-    if ( !varsp->fNoBorders )
+    wxMacMLTEClassicControl* mlte = (wxMacMLTEClassicControl*) iRefCon ;
+    SInt32 value =  wxMax( iValue , 0 ) ;
+    SInt32 maximum = wxMax( iMaximumValue , 0 ) ;
+
+    if ( iScrollBarOrientation == kTXNHorizontal )

     {
     {

-       SetRect(&varsp->fRTextArea, bounds.left + 2 , bounds.top + (varsp->fMultiline ? 0 : 2) ,
-                bounds.right - (varsp->fMultiline ? 0 : 2), bounds.bottom - (varsp->fMultiline ? 0 : 2));
+        if ( mlte->m_sbHorizontal )
+        {
+            SetControl32BitValue( mlte->m_sbHorizontal , value ) ;
+            SetControl32BitMaximum( mlte->m_sbHorizontal , maximum ) ;
+            mlte->m_lastHorizontalValue = value ;
+        }

     }
     }

-    else
+    else if ( iScrollBarOrientation == kTXNVertical )

     {
     {

-        SetRect(&varsp->fRTextArea, bounds.left , bounds.top ,
-                bounds.right, bounds.bottom);
+        if ( mlte->m_sbVertical )
+        {
+            SetControl32BitValue( mlte->m_sbVertical , value ) ;
+            SetControl32BitMaximum( mlte->m_sbVertical , maximum ) ;
+            mlte->m_lastVerticalValue = value ;
+        }

     }
 }
 
     }
 }
 

-OSStatus MLTESetObjectVisibility( STPTextPaneVars *varsp, Boolean vis , long wxStyle)
+pascal void wxMacMLTEClassicControl::TXNScrollActionProc( ControlRef controlRef , ControlPartCode partCode )

 {
 {

-    OSStatus err = noErr ;
-#if TARGET_API_MAC_OSX
-    TXNControlTag iControlTags[1] = { kTXNVisibilityTag };
-    TXNControlData iControlData[1] = {{ vis }};
-    err = ::TXNSetTXNObjectControls( varsp->fTXNRec, false, 1, iControlTags, iControlData );
-#endif
-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(varsp->fUserPaneRec);
-    if ( vis && textctrl )
-    {
-        Rect bounds ;
-        UMAGetControlBoundsInWindowCoords( varsp->fUserPaneRec, &bounds);
-        TPCalculateBounds( varsp , bounds ) ;
-        wxMacWindowClipper cl(textctrl) ;
-        TXNSetFrameBounds( varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left,
-                           varsp->fRTextArea.bottom, varsp->fRTextArea.right, varsp->fTXNFrame);
-        TXNShowSelection( varsp->fTXNRec, kTXNShowStart);
-    }
-    return err ;
-}
+    wxMacMLTEClassicControl* mlte = (wxMacMLTEClassicControl*) GetControlReference( controlRef ) ;
+    if ( mlte == NULL )
+        return ;

 
 

-// make sure we don't miss changes as carbon events are not available for these under classic
-static void TPUpdateVisibility(ControlRef theControl) {
-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(theControl);
-    if ( textctrl == NULL )
+    if ( controlRef != mlte->m_sbVertical && controlRef != mlte->m_sbHorizontal )

         return ;
         return ;

-    
-    STPTextPaneVars *varsp = (STPTextPaneVars *) ((wxMacMLTEClassicControl*)textctrl->GetPeer())->m_macTXNvars ;
-    
-    Rect bounds ;
-    UMAGetControlBoundsInWindowCoords(theControl, &bounds);
-    if ( textctrl->MacIsReallyShown() != varsp->fVisible )
-    {
-        // invalidate old position
-        // InvalWindowRect( GetControlOwner( theControl ) , &varsp->fRBounds ) ;
-        varsp->fVisible = textctrl->MacIsReallyShown() ;
-    }
-    if ( !EqualRect( &bounds , &varsp->fRBounds ) )
-    {
-        // old position
-        Rect oldBounds = varsp->fRBounds ;
-        TPCalculateBounds( varsp , bounds ) ;
-        // we only recalculate when visible, otherwise scrollbars get drawn at incorrect places
-        if ( varsp->fVisible )
-        {
-            wxMacWindowClipper cl(textctrl) ;
-            TXNSetFrameBounds( varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left,
-                               varsp->fRTextArea.bottom, varsp->fRTextArea.right, varsp->fTXNFrame);
-        }
-        InvalWindowRect( GetControlOwner( theControl ) , &oldBounds ) ;
-        InvalWindowRect( GetControlOwner( theControl ) , &varsp->fRBounds ) ;
-    }
-}

 
 

-// make correct activations
-static void TPActivatePaneText(STPTextPaneVars *varsp, Boolean setActive) {
-    
-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(varsp->fUserPaneRec);
-    if (varsp->fTXNObjectActive != setActive && textctrl->MacIsReallyShown() ) 
-    {
-        varsp->fTXNObjectActive = setActive;
-        TXNActivate(varsp->fTXNRec, varsp->fTXNFrame, varsp->fTXNObjectActive);
-        if (varsp->fInFocus)
-            TXNFocus( varsp->fTXNRec, varsp->fTXNObjectActive);
+    OSStatus err ;
+    bool isHorizontal = ( controlRef == mlte->m_sbHorizontal ) ;
+
+    SInt32 minimum = 0 ;
+    SInt32 maximum = GetControl32BitMaximum( controlRef ) ;
+    SInt32 value = GetControl32BitValue( controlRef ) ;
+    SInt32 delta = 0;
+
+    switch ( partCode )
+    {
+        case kControlDownButtonPart :
+            delta = 10 ;
+            break ;
+
+        case kControlUpButtonPart :
+            delta = -10 ;
+            break ;
+
+        case kControlPageDownPart :
+            delta = GetControlViewSize( controlRef ) ;
+            break ;
+
+        case kControlPageUpPart :
+            delta = -GetControlViewSize( controlRef ) ;
+            break ;
+
+        case kControlIndicatorPart :
+            delta = value - (isHorizontal ? mlte->m_lastHorizontalValue : mlte->m_lastVerticalValue) ;
+            break ;
+
+        default :
+            break ;
+    }
+
+    if ( delta != 0 )
+    {
+        SInt32 newValue = value ;
+
+        if ( partCode != kControlIndicatorPart )
+        {
+            if ( value + delta < minimum )
+                delta = minimum - value ;
+            if ( value + delta > maximum )
+                delta = maximum - value ;
+
+            SetControl32BitValue( controlRef , value + delta ) ;
+            newValue = value + delta ;
+        }
+
+        SInt32 verticalDelta = isHorizontal ? 0 : delta ;
+        SInt32 horizontalDelta = isHorizontal ? delta : 0 ;
+
+        err = TXNScroll(
+            mlte->m_txn, kTXNScrollUnitsInPixels, kTXNScrollUnitsInPixels,
+            &verticalDelta, &horizontalDelta );
+        verify_noerr( err );
+
+        if ( isHorizontal )
+            mlte->m_lastHorizontalValue = newValue ;
+        else
+            mlte->m_lastVerticalValue = newValue ;

     }
 }
     }
 }

+#endif

 
 

-// update focus outlines
-static void TPRedrawFocusOutline(STPTextPaneVars *varsp) {
-    
-    /* state changed */
-       if (varsp->fFocusDrawState != (varsp->fIsActive && varsp->fInFocus)) 
-       { 
-               varsp->fFocusDrawState = (varsp->fIsActive && varsp->fInFocus);
-               // DrawThemeFocusRect(&varsp->fRFocusOutline, varsp->fFocusDrawState);
-       }
+// make correct activations
+void wxMacMLTEClassicControl::MacActivatePaneText(bool setActive)
+{
+    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
+
+    wxMacWindowClipper clipper( textctrl ) ;
+    TXNActivate( m_txn, m_txnFrameID, setActive );
+
+    ControlRef controlFocus = 0 ;
+    GetKeyboardFocus( m_txnWindow , &controlFocus ) ;
+    if ( controlFocus == m_controlRef )
+        TXNFocus( m_txn, setActive );
+}
+
+void wxMacMLTEClassicControl::MacFocusPaneText(bool setFocus)
+{
+    TXNFocus( m_txn, setFocus );

 }
 
 }
 

-// update TXN focus state
-static void TPFocusPaneText(STPTextPaneVars *varsp, Boolean setFocus) {
-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(varsp->fUserPaneRec);
-    
-    if (varsp->fInFocus != setFocus && textctrl->MacIsReallyShown()) {
-        varsp->fInFocus = setFocus;
-        TXNFocus( varsp->fTXNRec, varsp->fInFocus);
+// guards against inappropriate redraw (hidden objects drawing onto window)
+
+void wxMacMLTEClassicControl::MacSetObjectVisibility(bool vis)
+{
+    ControlRef controlFocus = 0 ;
+    GetKeyboardFocus( m_txnWindow , &controlFocus ) ;
+
+    if ( !vis && (controlFocus == m_controlRef ) )
+        SetKeyboardFocus( m_txnWindow , m_controlRef , kControlFocusNoPart ) ;
+
+    TXNControlTag iControlTags[1] = { kTXNVisibilityTag };
+    TXNControlData iControlData[1] = { { (UInt32)false } };
+
+    verify_noerr( TXNGetTXNObjectControls( m_txn , 1, iControlTags, iControlData ) ) ;
+
+    if ( iControlData[0].uValue != vis )
+    {
+        iControlData[0].uValue = vis ;
+        verify_noerr( TXNSetTXNObjectControls( m_txn, false , 1, iControlTags, iControlData ) ) ;

     }
     }

+
+    // currently, we always clip as partial visibility (overlapped) visibility is also a problem,
+    // if we run into further problems we might set the FrameBounds to an empty rect here

 }
 
 }
 

-// draw the control
-static pascal void TPPaneDrawProc(ControlRef theControl, ControlPartCode thePart) {
-    /* set up our globals */
-    
-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(theControl);
+// make sure that the TXNObject is at the right position
+
+void wxMacMLTEClassicControl::MacUpdatePosition()
+{
+    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );

     if ( textctrl == NULL )
         return ;
     if ( textctrl == NULL )
         return ;

-    TPUpdateVisibility( theControl ) ;
-    
-    STPTextPaneVars *varsp = (STPTextPaneVars *) ((wxMacMLTEClassicControl*)textctrl->GetPeer())->m_macTXNvars ;
+
+    Rect bounds ;
+    UMAGetControlBoundsInWindowCoords( m_controlRef, &bounds );
+
+    wxRect visRect = textctrl->MacGetClippedClientRect() ;
+    Rect visBounds = { visRect.y , visRect.x , visRect.y + visRect.height , visRect.x + visRect.width } ;
+    int x , y ;
+    x = y = 0 ;
+    textctrl->MacWindowToRootWindow( &x , &y ) ;
+    OffsetRect( &visBounds , x , y ) ;
+
+    if ( !EqualRect( &bounds, &m_txnControlBounds ) || !EqualRect( &visBounds, &m_txnVisBounds ) )
+    {
+        m_txnControlBounds = bounds ;
+        m_txnVisBounds = visBounds ;
+        wxMacWindowClipper cl( textctrl ) ;
+
+#ifdef __WXMAC_OSX__
+        bool isCompositing = textctrl->MacGetTopLevelWindow()->MacUsesCompositing() ;
+        if ( m_sbHorizontal || m_sbVertical )
+        {
+            int w = bounds.right - bounds.left ;
+            int h = bounds.bottom - bounds.top ;
+
+            if ( m_sbHorizontal )
+            {
+                Rect sbBounds ;
+
+                sbBounds.left = -1 ;
+                sbBounds.top = h - 14 ;
+                sbBounds.right = w + 1 ;
+                sbBounds.bottom = h + 1 ;
+
+                if ( !isCompositing )
+                    OffsetRect( &sbBounds , m_txnControlBounds.left , m_txnControlBounds.top ) ;
+
+                SetControlBounds( m_sbHorizontal , &sbBounds ) ;
+                SetControlViewSize( m_sbHorizontal , w ) ;
+            }
+
+            if ( m_sbVertical )
+            {
+                Rect sbBounds ;
+
+                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 ) ;
+
+                SetControlBounds( m_sbVertical , &sbBounds ) ;
+                SetControlViewSize( m_sbVertical , h ) ;
+            }
+        }
+
+        Rect oldviewRect ;
+        TXNLongRect olddestRect ;
+        TXNGetRectBounds( m_txn , &oldviewRect , &olddestRect , NULL ) ;
+
+        Rect viewRect = { m_txnControlBounds.top, m_txnControlBounds.left,
+            m_txnControlBounds.bottom - ( m_sbHorizontal ? 14 : 0 ) ,
+            m_txnControlBounds.right - ( m_sbVertical ? 14 : 0 ) } ;
+        TXNLongRect destRect = { m_txnControlBounds.top, m_txnControlBounds.left,
+            m_txnControlBounds.bottom - ( m_sbHorizontal ? 14 : 0 ) ,
+            m_txnControlBounds.right - ( m_sbVertical ? 14 : 0 ) } ;
+
+        if ( olddestRect.right >= 10000 )
+            destRect.right = destRect.left + 32000 ;
+
+        if ( olddestRect.bottom >= 0x20000000 )
+            destRect.bottom = destRect.top + 0x40000000 ;
+
+        SectRect( &viewRect , &visBounds , &viewRect ) ;
+        TXNSetRectBounds( m_txn , &viewRect , &destRect , true ) ;
+
+#if 0
+        TXNSetFrameBounds(
+            m_txn,
+            m_txnControlBounds.top,
+            m_txnControlBounds.left,
+            m_txnControlBounds.bottom - (m_sbHorizontal ? 14 : 0),
+            m_txnControlBounds.right - (m_sbVertical ? 14 : 0),
+            m_txnFrameID );
+#endif
+#else
+
+        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
+
+        // 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 , kTXNShowStart ) ;
+    }
+}
+
+void wxMacMLTEClassicControl::SetRect( Rect *r )
+{
+    wxMacControl::SetRect( r ) ;
+    MacUpdatePosition() ;
+}
+
+void wxMacMLTEClassicControl::MacControlUserPaneDrawProc(wxInt16 thePart)
+{
+    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );
+    if ( textctrl == NULL )
+        return ;
+

     if ( textctrl->MacIsReallyShown() )
     {
         wxMacWindowClipper clipper( textctrl ) ;
     if ( textctrl->MacIsReallyShown() )
     {
         wxMacWindowClipper clipper( textctrl ) ;

-        TXNDraw(varsp->fTXNRec, NULL);
-        if ( !varsp->fNoBorders )
-               DrawThemeEditTextFrame(&varsp->fRTextOutline, varsp->fIsActive ? kThemeStateActive: kThemeStateInactive);
-        TPRedrawFocusOutline( varsp ) ;
+        TXNDraw( m_txn , NULL ) ;

     }
     }

-    

 }
 
 }
 

+wxInt16 wxMacMLTEClassicControl::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y)
+{
+    Point where = { y , x } ;
+    ControlPartCode result = kControlNoPart;

 
 

-/* TPPaneHitTestProc is called when the control manager would
-like to determine what part of the control the mouse resides over.
-We also call this routine from our tracking proc to determine how
-to handle mouse clicks. */
-static pascal ControlPartCode TPPaneHitTestProc(ControlRef theControl, Point where) {
-    ControlPartCode result;
-    /* set up our locals and lock down our globals*/
-    result = 0;
-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(theControl);
-    if ( textctrl == NULL )
-        return 0 ;
-    TPUpdateVisibility( theControl ) ;
-    STPTextPaneVars *varsp = (STPTextPaneVars *) ((wxMacMLTEClassicControl*)textctrl->GetPeer())->m_macTXNvars ;
-    if (textctrl->MacIsReallyShown() ) 
-    {
-        if (PtInRect(where, &varsp->fRBounds))
-            result = kmUPTextPart;
-        else 
+    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference( m_controlRef );
+    if ( (textctrl != NULL) && textctrl->MacIsReallyShown() )
+    {
+        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() )
         {
             // sometimes we get the coords also in control local coordinates, therefore test again
             if ( textctrl->MacGetTopLevelWindow()->MacUsesCompositing() )


@@ -2131,42 +2619,23 @@ static pascal ControlPartCode TPPaneHitTestProc(ControlRef theControl, Point whe
                 where.h += x ;
                 where.v += y ;
             }
                 where.h += x ;
                 where.v += y ;
             }

-            if (PtInRect(where, &varsp->fRBounds))
-                result = kmUPTextPart;
-            else 
-                result = 0;
+
+            if (PtInRect( where, &m_txnControlBounds ))
+                result = kControlEditTextPart ;

         }
     }
         }
     }

+

     return result;
 }
 
     return result;
 }
 

+wxInt16 wxMacMLTEClassicControl::MacControlUserPaneTrackingProc( wxInt16 x, wxInt16 y, void* actionProc )
+{
+    ControlPartCode result = kControlNoPart;

 
 

-
-
-
-/* TPPaneTrackingProc is called when the mouse is being held down
-over our control.  This routine handles clicks in the text area
-and in the scroll bar. */
-static pascal ControlPartCode TPPaneTrackingProc(ControlRef theControl, Point startPt, ControlActionUPP actionProc) {
-       
-    ControlPartCode partCodeResult;
-       /* make sure we have some variables... */
-    partCodeResult = 0;
-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(theControl);
-    if ( textctrl == NULL )
-        return 0;
-    TPUpdateVisibility( theControl ) ;
-    STPTextPaneVars *varsp = (STPTextPaneVars *) ((wxMacMLTEClassicControl*)textctrl->GetPeer())->m_macTXNvars ;
-    if (textctrl->MacIsReallyShown() ) 
-       {
-               /* we don't do any of these functions unless we're in focus */
-        if ( ! varsp->fInFocus) {
-            WindowPtr owner;
-            owner = GetControlOwner(theControl);
-            ClearKeyboardFocus(owner);
-            SetKeyboardFocus(owner, theControl, kUserClickedToFocusPart);
-        }
-               /* find the location for the click */
+    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference( m_controlRef );
+    if ( (textctrl != NULL) && textctrl->MacIsReallyShown() )
+    {
+        Point startPt = { y , x } ;

         // for compositing, we must convert these into toplevel window coordinates, because hittesting expects them
         if ( textctrl->MacGetTopLevelWindow()->MacUsesCompositing() )
         {
         // for compositing, we must convert these into toplevel window coordinates, because hittesting expects them
         if ( textctrl->MacGetTopLevelWindow()->MacUsesCompositing() )
         {


@@ -2175,282 +2644,282 @@ static pascal ControlPartCode TPPaneTrackingProc(ControlRef theControl, Point st
             startPt.h += x ;
             startPt.v += y ;
         }
             startPt.h += x ;
             startPt.v += y ;
         }

-        
-        switch (TPPaneHitTestProc(theControl, startPt)) 
+
+        switch (MacControlUserPaneHitTestProc( startPt.h , startPt.v ))

         {
         {

-                       
-                       /* handle clicks in the text part */
-            case kmUPTextPart:
-                       { 
-                               wxMacWindowClipper clipper( textctrl ) ;
-                               
-                               EventRecord rec ;
-                               ConvertEventRefToEventRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) ;
-                               TXNClick( varsp->fTXNRec, &rec );
-                               
-                       }
+            case kControlEditTextPart :
+            {
+                wxMacWindowClipper clipper( textctrl ) ;
+                EventRecord rec ;
+
+                ConvertEventRefToEventRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) ;
+                TXNClick( m_txn, &rec );
+            }
+                break;
+
+            default :

                 break;
                 break;

-                               

         }
     }
         }
     }

-    return partCodeResult;
-}

 
 

+    return result;
+}

 
 

-/* TPPaneIdleProc is our user pane idle routine.  When our text field
-is active and in focus, we use this routine to set the cursor. */
-static pascal void TPPaneIdleProc(ControlRef theControl) {
-    /* set up locals */
-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(theControl);
+void wxMacMLTEClassicControl::MacControlUserPaneIdleProc()
+{
+    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );

     if ( textctrl == NULL )
         return ;
     if ( textctrl == NULL )
         return ;

-    TPUpdateVisibility( theControl ) ;
-    STPTextPaneVars *varsp = (STPTextPaneVars *) ((wxMacMLTEClassicControl*)textctrl->GetPeer())->m_macTXNvars ;
-    if (textctrl->MacIsReallyShown()) {
-        /* if we're not active, then we have nothing to say about the cursor */
-        if (varsp->fIsActive) {
-            Rect bounds;
+
+    if (textctrl->MacIsReallyShown())
+    {
+        if (IsControlActive(m_controlRef))
+        {

             Point mousep;
             Point mousep;

-            
+

             wxMacWindowClipper clipper( textctrl ) ;
             GetMouse(&mousep);
             wxMacWindowClipper clipper( textctrl ) ;
             GetMouse(&mousep);

-            /* there's a 'focus thing' and an 'unfocused thing' */
-            if (varsp->fInFocus) {
-                /* flash the cursor */
-                SetPort(varsp->fDrawingEnvironment);
-                TXNIdle(varsp->fTXNRec);
-                /* set the cursor */
-                if (PtInRect(mousep, &varsp->fRTextArea)) {
-                    RgnHandle theRgn;
-                    RectRgn((theRgn = NewRgn()), &varsp->fRTextArea);
-                    TXNAdjustCursor(varsp->fTXNRec, theRgn);
-                    DisposeRgn(theRgn);
-                }
-                else
-                {
-                    // SetThemeCursor(kThemeArrowCursor);
-                }
-            } else {
-                /* if it's in our bounds, set the cursor */
-                UMAGetControlBoundsInWindowCoords(theControl, &bounds);
-                if (PtInRect(mousep, &bounds))
-                {
-                    //    SetThemeCursor(kThemeArrowCursor);
-                }
+
+            TXNIdle(m_txn);
+
+            if (PtInRect(mousep, &m_txnControlBounds))
+            {
+                RgnHandle theRgn = NewRgn();
+                RectRgn(theRgn, &m_txnControlBounds);
+                TXNAdjustCursor(m_txn, theRgn);
+                DisposeRgn(theRgn);

             }
         }
     }
 }
 
             }
         }
     }
 }
 

-
-/* TPPaneKeyDownProc is called whenever a keydown event is directed
-at our control.  Here, we direct the keydown event to the text
-edit record and redraw the scroll bar and text field as appropriate. */
-static pascal ControlPartCode TPPaneKeyDownProc(ControlRef theControl,
-                                                SInt16 keyCode, SInt16 charCode, SInt16 modifiers) {
-    
-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(theControl);
+wxInt16 wxMacMLTEClassicControl::MacControlUserPaneKeyDownProc (wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers)
+{
+    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );

     if ( textctrl == NULL )
     if ( textctrl == NULL )

-        return 0;
-    TPUpdateVisibility( theControl ) ;
-    
-    STPTextPaneVars *varsp = (STPTextPaneVars *) ((wxMacMLTEClassicControl*)textctrl->GetPeer())->m_macTXNvars ;
-    if (varsp->fInFocus) 
-    {
-        /* turn autoscrolling on and send the key event to text edit */
-        wxMacWindowClipper clipper( textctrl ) ;
-        EventRecord ev ;
-        memset( &ev , 0 , sizeof( ev ) ) ;
-        ev.what = keyDown ;
-        ev.modifiers = modifiers ;
-        ev.message = (( keyCode << 8 ) & keyCodeMask ) + ( charCode & charCodeMask ) ;
-        TXNKeyDown( varsp->fTXNRec, &ev);
-    }
+        return kControlNoPart;
+
+    wxMacWindowClipper clipper( textctrl ) ;
+
+    EventRecord ev ;
+    memset( &ev , 0 , sizeof( ev ) ) ;
+    ev.what = keyDown ;
+    ev.modifiers = modifiers ;
+    ev.message = ((keyCode << 8) & keyCodeMask) | (charCode & charCodeMask);
+    TXNKeyDown( m_txn , &ev );
+

     return kControlEntireControl;
 }
 
     return kControlEntireControl;
 }
 

+void wxMacMLTEClassicControl::MacControlUserPaneActivateProc(bool activating)
+{
+    MacActivatePaneText( activating );
+}

 
 

-/* TPPaneActivateProc is called when the window containing
-the user pane control receives activate events. Here, we redraw
-the control and it's text as necessary for the activation state. */
-static pascal void TPPaneActivateProc(ControlRef theControl, Boolean activating) {
-    /* set up locals */
-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(theControl);
-    
+wxInt16 wxMacMLTEClassicControl::MacControlUserPaneFocusProc(wxInt16 action)
+{
+    ControlPartCode focusResult = kControlFocusNoPart;
+
+    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );

     if ( textctrl == NULL )
     if ( textctrl == NULL )

-        return ;
-    TPUpdateVisibility( theControl ) ;
-    
-    STPTextPaneVars *varsp = (STPTextPaneVars *) ((wxMacMLTEClassicControl*)textctrl->GetPeer())->m_macTXNvars ;
-    
-    varsp->fIsActive = activating;
+        return focusResult;
+

     wxMacWindowClipper clipper( textctrl ) ;
     wxMacWindowClipper clipper( textctrl ) ;

-    TPActivatePaneText(varsp, varsp->fIsActive && varsp->fInFocus);
-    /* redraw the frame */
-    if ( textctrl->MacIsReallyShown() )
-    {
-        if ( !varsp->fNoBorders )
-               DrawThemeEditTextFrame(&varsp->fRTextOutline, varsp->fIsActive ? kThemeStateActive: kThemeStateInactive);
-        TPRedrawFocusOutline( varsp ) ;
-    }
-}

 
 

+    ControlRef controlFocus = NULL ;
+    GetKeyboardFocus( m_txnWindow , &controlFocus ) ;
+    bool wasFocused = ( controlFocus == m_controlRef ) ;

 
 

-/* TPPaneFocusProc is called when every the focus changes to or
-from our control.  Herein, switch the focus appropriately
-according to the parameters and redraw the control as
-necessary.  */
-static pascal ControlPartCode TPPaneFocusProc(ControlRef theControl, ControlFocusPart action) {
-    ControlPartCode focusResult;
-    
-    focusResult = kControlFocusNoPart;
-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(theControl);
-    if ( textctrl == NULL )
-        return 0;
-    TPUpdateVisibility( theControl ) ;
-    STPTextPaneVars *varsp = (STPTextPaneVars *) ((wxMacMLTEClassicControl*)textctrl->GetPeer())->m_macTXNvars ;
-    /* if kControlFocusPrevPart and kControlFocusNextPart are received when the user is
-        tabbing forwards (or shift tabbing backwards) through the items in the dialog,
-        and kControlFocusNextPart will be received.  When the user clicks in our field
-        and it is not the current focus, then the constant kUserClickedToFocusPart will
-        be received.  The constant kControlFocusNoPart will be received when our control
-        is the current focus and the user clicks in another control.  In your focus routine,
-        you should respond to these codes as follows:
-        
-        kControlFocusNoPart - turn off focus and return kControlFocusNoPart.  redraw
-        the control and the focus rectangle as necessary.
-        
-        kControlFocusPrevPart or kControlFocusNextPart - toggle focus on or off
-        depending on its current state.  redraw the control and the focus rectangle
-        as appropriate for the new focus state.  If the focus state is 'off', return the constant
-        kControlFocusNoPart, otherwise return a non-zero part code.
-        kUserClickedToFocusPart - is a constant defined for this example.  You should
-        define your own value for handling click-to-focus type events. */
-    /* calculate the next highlight state */
-    switch (action) {
-        default:
-        case kControlFocusNoPart:
-            TPFocusPaneText(varsp, false);
-            focusResult = kControlFocusNoPart;
-            break;
-        case kUserClickedToFocusPart:
-            TPFocusPaneText(varsp, true);
-            focusResult = 1;
-            break;
+    switch (action)
+    {

         case kControlFocusPrevPart:
         case kControlFocusNextPart:
         case kControlFocusPrevPart:
         case kControlFocusNextPart:

-            TPFocusPaneText(varsp, ( ! varsp->fInFocus));
-            focusResult = varsp->fInFocus ? 1 : kControlFocusNoPart;
+            MacFocusPaneText( !wasFocused );
+            focusResult = (!wasFocused ? (ControlPartCode) kControlEditTextPart : (ControlPartCode) kControlFocusNoPart);
+            break;
+
+        case kControlFocusNoPart:
+        default:
+            MacFocusPaneText( false );
+            focusResult = kControlFocusNoPart;

             break;
     }
             break;
     }

-    TPActivatePaneText(varsp, varsp->fIsActive && varsp->fInFocus);
-    /* redraw the text fram and focus rectangle to indicate the
-        new focus state */
-    if ( textctrl->MacIsReallyShown() )
-    {
-        wxMacWindowClipper c( textctrl ) ;
-        if ( !varsp->fNoBorders )
-               DrawThemeEditTextFrame(&varsp->fRTextOutline, varsp->fIsActive ? kThemeStateActive: kThemeStateInactive);
-        TPRedrawFocusOutline( varsp ) ;
-    }
+

     return focusResult;
 }
 
     return focusResult;
 }
 

-wxMacMLTEClassicControl::wxMacMLTEClassicControl( wxWindow *wxPeer,
-                         const wxString& str,
-                         const wxPoint& pos,
-                         const wxSize& size, long style ) 
+void wxMacMLTEClassicControl::MacControlUserPaneBackgroundProc( void *info )
+{
+}
+
+wxMacMLTEClassicControl::wxMacMLTEClassicControl( wxTextCtrl *wxPeer,
+    const wxString& str,
+    const wxPoint& pos,
+    const wxSize& size, long style )
+    : wxMacMLTEControl( wxPeer )

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

-    Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ;    
-    wxString st = str ;
-    wxMacConvertNewlines10To13( &st ) ;
+    Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ;

 
 

-    short featurSet;
+    short featureSet =
+        kControlSupportsEmbedding | kControlSupportsFocus | kControlWantsIdle
+        | kControlWantsActivate  | kControlHandlesTracking
+//    | kControlHasSpecialBackground
+        | kControlGetsFocusOnClick | kControlSupportsLiveFeedback;

 
 

-    featurSet = kControlSupportsEmbedding | kControlSupportsFocus  | kControlWantsIdle
-            | kControlWantsActivate | kControlHandlesTracking | kControlHasSpecialBackground
-            | kControlGetsFocusOnClick | kControlSupportsLiveFeedback;
-        /* create the control */
+   OSStatus err = ::CreateUserPaneControl(
+        MAC_WXHWND(wxPeer->GetParent()->MacGetTopLevelWindowRef()),
+        &bounds, featureSet, &m_controlRef );
+    verify_noerr( err );
+
+    DoCreate();
+
+    AdjustCreationAttributes( *wxWHITE , true ) ;
+
+    MacSetObjectVisibility( wxPeer->MacIsReallyShown() ) ;

 
 

-    verify_noerr( ::CreateUserPaneControl( MAC_WXHWND(wxPeer->GetParent()->MacGetTopLevelWindowRef()), &bounds, featurSet, &m_controlRef ) );
-    

     {
     {

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

     }
     }

-    
-    if ( wxPeer->MacIsReallyShown() )
-        MLTESetObjectVisibility( (STPTextPaneVars*) m_macTXNvars, true , style ) ;
+}

 
 

-    {
- //            wxMacWindowClipper clipper( wxPeer ) ;
+wxMacMLTEClassicControl::~wxMacMLTEClassicControl()
+{
+    TXNDeleteObject( m_txn );
+    m_txn = NULL ;
+}

 
 

-        TPUpdateVisibility( m_controlRef ) ;
+void wxMacMLTEClassicControl::VisibilityChanged(bool shown)
+{
+    MacSetObjectVisibility( shown ) ;
+    wxMacControl::VisibilityChanged( shown ) ;
+}

 
 

-        SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ;
+void wxMacMLTEClassicControl::SuperChangedPosition()
+{
+    MacUpdatePosition() ;
+    wxMacControl::SuperChangedPosition() ;
+}

 
 

-        TXNSetSelection( m_txn, 0, 0);
-        TXNShowSelection( m_txn, kTXNShowStart);
-    }    
-    
-    AdjustCreationAttributes( *wxWHITE , true ) ;
+#ifdef __WXMAC_OSX__
+
+ControlUserPaneDrawUPP gTPDrawProc = NULL;
+ControlUserPaneHitTestUPP gTPHitProc = NULL;
+ControlUserPaneTrackingUPP gTPTrackProc = NULL;
+ControlUserPaneIdleUPP gTPIdleProc = NULL;
+ControlUserPaneKeyDownUPP gTPKeyProc = NULL;
+ControlUserPaneActivateUPP gTPActivateProc = NULL;
+ControlUserPaneFocusUPP gTPFocusProc = NULL;
+
+static pascal void wxMacControlUserPaneDrawProc(ControlRef control, SInt16 part)
+{
+    wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
+    wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
+    if ( win )
+        win->MacControlUserPaneDrawProc( part ) ;

 }
 
 }
 

-wxMacMLTEClassicControl::~wxMacMLTEClassicControl()
+static pascal ControlPartCode wxMacControlUserPaneHitTestProc(ControlRef control, Point where)

 {
 {

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

 }
 
 }
 

-void wxMacMLTEClassicControl::VisibilityChanged(bool shown) 
+static pascal ControlPartCode wxMacControlUserPaneTrackingProc(ControlRef control, Point startPt, ControlActionUPP actionProc)

 {
 {

-    MLTESetObjectVisibility((STPTextPaneVars*) m_macTXNvars , shown , m_windowStyle ) ;
-    if ( !shown )
-        InvalWindowRect( GetControlOwner( m_controlRef ) , &((STPTextPaneVars *)m_macTXNvars)->fRBounds ) ;
+    wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
+    wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
+    if ( win )
+        return win->MacControlUserPaneTrackingProc( startPt.h , startPt.v , (void*) actionProc ) ;
+    else
+        return kControlNoPart ;

 }
 
 }
 

-bool wxMacMLTEClassicControl::NeedsFocusRect() const 
+static pascal void wxMacControlUserPaneIdleProc(ControlRef control)

 {
 {

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

 }
 
 }
 

+static pascal ControlPartCode wxMacControlUserPaneKeyDownProc(ControlRef control, SInt16 keyCode, SInt16 charCode, SInt16 modifiers)
+{
+    wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
+    wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
+    if ( win )
+        return win->MacControlUserPaneKeyDownProc( keyCode, charCode, modifiers ) ;
+    else
+        return kControlNoPart ;
+}
+
+static pascal void wxMacControlUserPaneActivateProc(ControlRef control, Boolean activating)
+{
+    wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
+    wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
+    if ( win )
+        win->MacControlUserPaneActivateProc( activating ) ;
+}
+
+static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control, ControlFocusPart action)
+{
+    wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
+    wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
+    if ( win )
+        return win->MacControlUserPaneFocusProc( action ) ;
+    else
+        return kControlNoPart ;
+}
+
+#if 0
+static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, ControlBackgroundPtr info)
+{
+    wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
+    wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
+    if ( win )
+        win->MacControlUserPaneBackgroundProc(info) ;
+}
+#endif
+
+#endif // __WXMAC_OSX__
+
+// TXNRegisterScrollInfoProc
+

 OSStatus wxMacMLTEClassicControl::DoCreate()
 {
     Rect bounds;
 OSStatus wxMacMLTEClassicControl::DoCreate()
 {
     Rect bounds;

-    WindowRef theWindow;
-

     OSStatus err = noErr ;
     OSStatus err = noErr ;

-    
-    /* set up our globals */
-    if (gTPDrawProc == NULL) gTPDrawProc = NewControlUserPaneDrawUPP(TPPaneDrawProc);
-    if (gTPHitProc == NULL) gTPHitProc = NewControlUserPaneHitTestUPP(TPPaneHitTestProc);
-    if (gTPTrackProc == NULL) gTPTrackProc = NewControlUserPaneTrackingUPP(TPPaneTrackingProc);
-    if (gTPIdleProc == NULL) gTPIdleProc = NewControlUserPaneIdleUPP(TPPaneIdleProc);
-    if (gTPKeyProc == NULL) gTPKeyProc = NewControlUserPaneKeyDownUPP(TPPaneKeyDownProc);
-    if (gTPActivateProc == NULL) gTPActivateProc = NewControlUserPaneActivateUPP(TPPaneActivateProc);
-    if (gTPFocusProc == NULL) gTPFocusProc = NewControlUserPaneFocusUPP(TPPaneFocusProc);
-    
-    /* allocate our private storage */
-    m_macTXNvars = (STPTextPaneVars *) malloc(sizeof(STPTextPaneVars));
-    
-    /* set the initial settings for our private data */
-    m_macTXNvars->fMultiline = m_windowStyle & wxTE_MULTILINE ;
-    m_macTXNvars->fNoBorders = m_windowStyle & wxNO_BORDER ;
-    m_macTXNvars->fInFocus = false;
-    m_macTXNvars->fIsActive = true;
-    m_macTXNvars->fTXNObjectActive = false; 
-    m_macTXNvars->fFocusDrawState = false ;
-    m_macTXNvars->fUserPaneRec = m_controlRef ;
-    m_macTXNvars->fVisible = true ;
-    
-    theWindow = m_macTXNvars->fOwner = GetControlOwner(m_controlRef);
-    
-    m_macTXNvars->fDrawingEnvironment = (GrafPtr)  GetWindowPort(theWindow);
-    
-    /* set up the user pane procedures */
+
+    // set up our globals
+#ifdef __WXMAC_OSX__
+    if (gTPDrawProc == NULL) gTPDrawProc = NewControlUserPaneDrawUPP(wxMacControlUserPaneDrawProc);
+    if (gTPHitProc == NULL) gTPHitProc = NewControlUserPaneHitTestUPP(wxMacControlUserPaneHitTestProc);
+    if (gTPTrackProc == NULL) gTPTrackProc = NewControlUserPaneTrackingUPP(wxMacControlUserPaneTrackingProc);
+    if (gTPIdleProc == NULL) gTPIdleProc = NewControlUserPaneIdleUPP(wxMacControlUserPaneIdleProc);
+    if (gTPKeyProc == NULL) gTPKeyProc = NewControlUserPaneKeyDownUPP(wxMacControlUserPaneKeyDownProc);
+    if (gTPActivateProc == NULL) gTPActivateProc = NewControlUserPaneActivateUPP(wxMacControlUserPaneActivateProc);
+    if (gTPFocusProc == NULL) gTPFocusProc = NewControlUserPaneFocusUPP(wxMacControlUserPaneFocusProc);
+
+    if (gTXNScrollInfoProc == NULL ) gTXNScrollInfoProc = NewTXNScrollInfoUPP(TXNScrollInfoProc) ;
+    if (gTXNScrollActionProc == NULL ) gTXNScrollActionProc = NewControlActionUPP(TXNScrollActionProc) ;
+#endif
+
+    // 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);
     SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneTrackingProcTag, sizeof(gTPTrackProc), &gTPTrackProc);
     SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneDrawProcTag, sizeof(gTPDrawProc), &gTPDrawProc);
     SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneHitTestProcTag, sizeof(gTPHitProc), &gTPHitProc);
     SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneTrackingProcTag, sizeof(gTPTrackProc), &gTPTrackProc);


@@ -2458,31 +2927,80 @@ 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);

-    
-    /* calculate the rectangles used by the control */
-    UMAGetControlBoundsInWindowCoords(m_controlRef, &bounds);
-    m_macTXNvars->fRTextOutlineRegion = NewRgn() ;
-    TPCalculateBounds( m_macTXNvars , bounds ) ;
-    
-    /* set up the drawing environment */
-    SetPort(m_macTXNvars->fDrawingEnvironment);
-    
-    /* create the new edit field */
-    
-    TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( m_windowStyle ) ;
-    
-    verify_noerr(TXNNewObject(NULL, m_macTXNvars->fOwner, &m_macTXNvars->fRTextArea,
-                              frameOptions ,
-                              kTXNTextEditStyleFrameType,
-                              kTXNTextensionFile,
-                              kTXNSystemDefaultEncoding,
-                              &m_macTXNvars->fTXNRec, &m_macTXNvars->fTXNFrame, (TXNObjectRefcon) m_macTXNvars));
-    m_txn = m_macTXNvars->fTXNRec ;
-    
-    /* perform final activations and setup for our text field.  Here,
-        we assume that the window is going to be the 'active' window. */
-    TPActivatePaneText(m_macTXNvars, m_macTXNvars->fIsActive && m_macTXNvars->fInFocus);
-    /* all done */
+#endif
+
+    // calculate the rectangles used by the control
+    UMAGetControlBoundsInWindowCoords( m_controlRef, &bounds );
+
+    m_txnControlBounds = bounds ;
+    m_txnVisBounds = bounds ;
+
+    CGrafPtr origPort ;
+    GDHandle origDev ;
+
+    GetGWorld( &origPort, &origDev ) ;
+    SetPort( m_txnPort );
+
+    // create the new edit field
+    TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( m_windowStyle );
+
+#ifdef __WXMAC_OSX__
+    // the scrollbars are not correctly embedded but are inserted at the root:
+    // this gives us problems as we have erratic redraws even over the structure area
+
+    m_sbHorizontal = 0 ;
+    m_sbVertical = 0 ;
+    m_lastHorizontalValue = 0 ;
+    m_lastVerticalValue = 0 ;
+
+    Rect sb = { 0 , 0 , 0 , 0 } ;
+    if ( frameOptions & kTXNWantVScrollBarMask )
+    {
+        CreateScrollBarControl( m_txnWindow, &sb, 0, 0, 100, 1, true, gTXNScrollActionProc, &m_sbVertical );
+        SetControlReference( m_sbVertical, (SInt32)this );
+        SetControlAction( m_sbVertical, gTXNScrollActionProc );
+        ShowControl( m_sbVertical );
+        EmbedControl( m_sbVertical , m_controlRef );
+        frameOptions &= ~kTXNWantVScrollBarMask;
+    }
+
+    if ( frameOptions & kTXNWantHScrollBarMask )
+    {
+        CreateScrollBarControl( m_txnWindow, &sb, 0, 0, 100, 1, true, gTXNScrollActionProc, &m_sbHorizontal );
+        SetControlReference( m_sbHorizontal, (SInt32)this );
+        SetControlAction( m_sbHorizontal, gTXNScrollActionProc );
+        ShowControl( m_sbHorizontal );
+        EmbedControl( m_sbHorizontal, m_controlRef );
+        frameOptions &= ~(kTXNWantHScrollBarMask | kTXNDrawGrowIconMask);
+    }
+
+#endif
+
+    err = TXNNewObject(
+        NULL, m_txnWindow, &bounds, frameOptions,
+        kTXNTextEditStyleFrameType, kTXNTextensionFile, kTXNSystemDefaultEncoding,
+        &m_txn, &m_txnFrameID, NULL );
+    verify_noerr( err );
+
+#if 0
+    TXNControlTag iControlTags[] = { kTXNUseCarbonEvents };
+    TXNControlData iControlData[] = { { (UInt32)&cInfo } };
+    int toptag = WXSIZEOF( iControlTags ) ;
+    TXNCarbonEventInfo cInfo ;
+    cInfo.useCarbonEvents = false ;
+    cInfo.filler = 0 ;
+    cInfo.flags = 0 ;
+    cInfo.fDictionary = NULL ;
+
+    verify_noerr( TXNSetTXNObjectControls( m_txn, false, toptag, iControlTags, iControlData ) );
+#endif
+
+#ifdef __WXMAC_OSX__
+    TXNRegisterScrollInfoProc( m_txn, gTXNScrollInfoProc, (SInt32)this );
+#endif
+
+    SetGWorld( origPort , origDev ) ;
+

     return err;
 }
 
     return err;
 }
 


@@ -2494,71 +3012,153 @@ OSStatus wxMacMLTEClassicControl::DoCreate()
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
 
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
 

-wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxWindow *wxPeer,
-                         const wxString& str,
-                         const wxPoint& pos,
-                         const wxSize& size, long style ) 
+// 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 :
+        {
+            if ( UMAGetSystemVersion() >= 0x1040 )
+            {
+                TXNOffset from , to ;
+                TXNGetSelection( focus->GetTXNObject() , &from , &to ) ;
+                if ( from == to )
+                    TXNShowSelection( focus->GetTXNObject() , kTXNShowStart );
+            }
+            result = CallNextEventHandler(handler,event);
+            break;
+        }
+        default:
+            break ;
+    }
+
+    return result ;
+}
+
+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 ;
+}
+
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacTextControlEventHandler )
+
+wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer,
+    const wxString& str,
+    const wxPoint& pos,
+    const wxSize& size, long style ) : wxMacMLTEControl( wxPeer )

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

-    Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ;    
+    Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ;

     wxString st = str ;
     wxMacConvertNewlines10To13( &st ) ;
     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 ) ;
 
     m_scrollView = NULL ;
     TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( style ) ;

-    if ( frameOptions & (kTXNWantVScrollBarMask|kTXNWantHScrollBarMask) )
+    if ( frameOptions & (kTXNWantVScrollBarMask | kTXNWantHScrollBarMask) )

     {
     {

-        HIScrollViewCreate(( frameOptions & kTXNWantHScrollBarMask ? kHIScrollViewOptionsHorizScroll : 0) | 
-            ( frameOptions & kTXNWantVScrollBarMask ? kHIScrollViewOptionsVertScroll: 0 ) , &m_scrollView ) ;
-       
-       HIViewSetFrame( m_scrollView, &hr );
-       HIViewSetVisible( m_scrollView, true );
+        HIScrollViewCreate(
+            (frameOptions & kTXNWantHScrollBarMask ? kHIScrollViewOptionsHorizScroll : 0)
+            | (frameOptions & kTXNWantVScrollBarMask ? kHIScrollViewOptionsVertScroll : 0) ,
+            &m_scrollView ) ;
+
+        HIViewSetFrame( m_scrollView, &hr );
+        HIViewSetVisible( m_scrollView, true );

     }
     }

-    
+

     m_textView = NULL ;
     HITextViewCreate( NULL , 0, frameOptions , &m_textView ) ;
     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 ;
     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
     {
     }
     else
     {

-       HIViewSetFrame( m_textView, &hr );
+        HIViewSetFrame( m_textView, &hr );

         m_controlRef = m_textView ;
     }
         m_controlRef = m_textView ;
     }

-    
-    
+
+    AdjustCreationAttributes( *wxWHITE , true ) ;
+
+    wxMacWindowClipper c( m_peer ) ;

     SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ;
 
     SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ;
 

-    TXNSetSelection( m_txn, 0, 0);
-    TXNShowSelection( m_txn, kTXNShowStart);
+    TXNSetSelection( m_txn, 0, 0 );
+    TXNShowSelection( m_txn, kTXNShowStart );

 
 

-    AdjustCreationAttributes( *wxWHITE , true ) ;
+    InstallControlEventHandler( m_textView , GetwxMacTextControlEventHandlerUPP(),
+                                GetEventTypeCount(eventList), eventList, this,
+                                &m_textEventHandlerRef);
+}
+
+wxMacMLTEHIViewControl::~wxMacMLTEHIViewControl()
+{
+    ::RemoveEventHandler( m_textEventHandlerRef ) ;

 }
 
 }
 

-OSStatus wxMacMLTEHIViewControl::SetFocus( ControlFocusPart focusPart ) 
+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 
+bool wxMacMLTEHIViewControl::HasFocus() const

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

-bool wxMacMLTEHIViewControl::NeedsFocusRect() const 
+void wxMacMLTEHIViewControl::SetBackground( const wxBrush &brush )

 {
 {

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

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