Missing #includes to allow wx/mac/carbon/tooltip.h be included first by user.

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

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 2fd923f875079693731eca34296a7536ac950913..687f527adbee6a986b98d5b9cc259e25e4253936 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,20 +9,25 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "textctrl.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #if wxUSE_TEXTCTRL
 
 #include "wx/wxprec.h"
 
 #if wxUSE_TEXTCTRL
 

+#include "wx/textctrl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/dc.h"
+    #include "wx/button.h"
+#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
 
 #include "wx/msgdlg.h"
 #endif
 
 #include "wx/msgdlg.h"


@@ -35,27 +40,32 @@
     #endif
 #endif
 
     #endif
 #endif
 

-#include "wx/app.h"
-#include "wx/dc.h"
-#include "wx/button.h"

 #include "wx/toplevel.h"
 #include "wx/toplevel.h"

-#include "wx/textctrl.h"

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

-#include "wx/utils.h"

 #include "wx/sysopt.h"
 #include "wx/menu.h"
 
 #if defined(__BORLANDC__) && !defined(__WIN32__)
 #include "wx/sysopt.h"
 #include "wx/menu.h"
 
 #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
 // 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


@@ -65,25 +75,20 @@
 #ifndef __WXMAC_OSX__
 enum
 {
 #ifndef __WXMAC_OSX__
 enum
 {

-    kTXNVisibilityTag             = 'visb' /*set the visibility state of the object  */
+    kTXNVisibilityTag = 'visb' // set the visibility state of the object

 };
 #endif
 
 };
 #endif
 

-#ifndef __DARWIN__
-#include <MacTextEditor.h>
-#include <ATSUnicode.h>
-#include <TextCommon.h>
-#include <TextEncodingConverter.h>
-#endif
-#include "wx/mac/uma.h"

 
 class wxMacFunctor
 {
 public :
 
 class wxMacFunctor
 {
 public :

-    wxMacFunctor(){}
+    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)() ;


@@ -91,14 +96,15 @@ public :
     }
 } ;
 
     }
 } ;
 

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

 class wxMacObjectFunctor1 : public wxMacFunctor
 {
     typedef void (classtype::*function)( param1type p1 ) ;
     typedef void (classtype::*ref_function)( const param1type& p1 ) ;
 public :
     wxMacObjectFunctor1( classtype *obj , function f , param1type p1 ) :
 class wxMacObjectFunctor1 : public wxMacFunctor
 {
     typedef void (classtype::*function)( param1type p1 ) ;
     typedef void (classtype::*ref_function)( const param1type& p1 ) ;
 public :
     wxMacObjectFunctor1( classtype *obj , function f , param1type p1 ) :

-        wxMacFunctor(  )
+        wxMacFunctor()

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


@@ -106,7 +112,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 ;


@@ -117,34 +123,35 @@ public :
 
     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>
 void* wxMacMPRemoteCall( classtype *object , void (classtype::*function)( param1type p1 ) , param1type p1 )
 {
     } ;
 } ;
 
 template<typename classtype, typename param1type>
 void* wxMacMPRemoteCall( classtype *object , void (classtype::*function)( param1type p1 ) , param1type p1 )
 {

-    wxMacObjectFunctor1<classtype,param1type> params(object,function,p1) ;
+    wxMacObjectFunctor1<classtype, param1type> params(object, function, p1) ;

     void *result =
     void *result =

-        MPRemoteCall( wxMacFunctor::CallBackProc , &params  , kMPOwningProcessRemoteContext ) ;
+        MPRemoteCall( wxMacFunctor::CallBackProc , &params , kMPOwningProcessRemoteContext ) ;

     return result ;
 }
 
 template<typename classtype, typename param1type>
 void* wxMacMPRemoteCall( classtype *object , void (classtype::*function)( const param1type& p1 ) , param1type p1 )
 {
     return result ;
 }
 
 template<typename classtype, typename param1type>
 void* wxMacMPRemoteCall( classtype *object , void (classtype::*function)( const param1type& p1 ) , param1type p1 )
 {

-    wxMacObjectFunctor1<classtype,param1type> params(object,function,p1) ;
+    wxMacObjectFunctor1<classtype,param1type> params(object, function, p1) ;

     void *result =
     void *result =

-        MPRemoteCall( wxMacFunctor::CallBackProc , &params  , kMPOwningProcessRemoteContext ) ;
+        MPRemoteCall( wxMacFunctor::CallBackProc , &params , kMPOwningProcessRemoteContext ) ;

     return result ;
 }
 
     return result ;
 }
 


@@ -165,6 +172,7 @@ void* wxMacMPRemoteGUICall( classtype *object , void (classtype::*function)( con
     wxMutexGuiEnter() ;
     return result ;
 }
     wxMutexGuiEnter() ;
     return result ;
 }

+

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


@@ -174,18 +182,26 @@ public :
 
     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 void SetEditable( bool editable ) ;

     virtual wxTextPos GetLastPosition() const ;
     virtual wxTextPos GetLastPosition() const ;

-    virtual void Replace( long from , long to , const wxString str ) ;
-    virtual void Remove( long from , long to ) = 0 ;
-    virtual void SetSelection( long from , long to ) = 0 ;
-    virtual void GetSelection( long* from, long* to) const = 0 ;
-    virtual void WriteText(const wxString& str) = 0 ;
+    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;


@@ -195,10 +211,9 @@ public :
     virtual int GetNumberOfLines() const ;
     virtual long XYToPosition(long x, long y) const;
     virtual bool PositionToXY(long pos, long *x, long *y) const ;
     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 ;

-    virtual bool SetupCursor( const wxPoint& pt ) { return false ; }

 
 #ifndef __WXMAC_OSX__
     virtual void            MacControlUserPaneDrawProc(wxInt16 part) = 0 ;
 
 #ifndef __WXMAC_OSX__
     virtual void            MacControlUserPaneDrawProc(wxInt16 part) = 0 ;


@@ -218,27 +233,44 @@ class wxMacMLTEControl : public wxMacTextControl
 {
 public :
     wxMacMLTEControl( wxTextCtrl *peer ) ;
 {
 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 void SetEditable( bool editable ) ;

     virtual wxTextPos GetLastPosition() const ;
     virtual wxTextPos GetLastPosition() const ;

-    virtual void Replace( long from , long to , const wxString str ) ;
-    virtual void Remove( long from , long to )  ;
-    virtual void GetSelection( long* from, long* to) const ;
-    virtual void SetSelection( long from , long to ) ;
+    virtual void Replace( long from, long to, const wxString &str ) ;
+    virtual void Remove( long from, long to ) ;
+    virtual void GetSelection( long* from, long* to ) const ;
+    virtual void SetSelection( long from, long to ) ;
+
+    virtual void WriteText( const wxString& str ) ;
+
+    virtual 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 WriteText(const wxString& str) ;

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


@@ -256,6 +288,7 @@ public :
 
 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 ;
 } ;
 


@@ -274,10 +307,12 @@ public :
                              const wxSize& size, long style ) ;
     virtual OSStatus SetFocus( ControlFocusPart focusPart ) ;
     virtual bool HasFocus() const ;
                              const wxSize& size, long style ) ;
     virtual OSStatus SetFocus( ControlFocusPart focusPart ) ;
     virtual bool HasFocus() const ;

+    virtual void SetBackground( const wxBrush &brush) ;
+

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

-} ;
+};

 
 #endif
 
 
 #endif
 


@@ -289,6 +324,7 @@ public :
                              const wxPoint& pos,
                              const wxSize& size, long style ) ;
     ~wxMacUnicodeTextControl();
                              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) ;


@@ -297,14 +333,14 @@ 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
 
 
 #endif
 


@@ -318,6 +354,7 @@ public :
                              const wxPoint& pos,
                              const wxSize& size, long style ) ;
     ~wxMacMLTEClassicControl() ;
                              const wxPoint& pos,
                              const wxSize& size, long style ) ;
     ~wxMacMLTEClassicControl() ;

+

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


@@ -330,7 +367,11 @@ public :
     virtual wxInt16         MacControlUserPaneFocusProc(wxInt16 action) ;
     virtual void            MacControlUserPaneBackgroundProc(void* info) ;
 
     virtual wxInt16         MacControlUserPaneFocusProc(wxInt16 action) ;
     virtual void            MacControlUserPaneBackgroundProc(void* info) ;
 

-    virtual bool            SetupCursor( const wxPoint& WXUNUSED(pt) ) { MacControlUserPaneIdleProc() ; return true ;}
+    virtual bool SetupCursor( const wxPoint& WXUNUSED(pt) )
+    {
+        MacControlUserPaneIdleProc();
+        return true;
+    }

 
     virtual void            SetRect( Rect *r ) ;
 
 
     virtual void            SetRect( Rect *r ) ;
 


@@ -338,10 +379,10 @@ protected :
     OSStatus                 DoCreate();
 
     void                    MacUpdatePosition() ;
     OSStatus                 DoCreate();
 
     void                    MacUpdatePosition() ;

-    void                    MacActivatePaneText(Boolean setActive) ;
-    void                    MacFocusPaneText(Boolean setFocus) ;
+    void                    MacActivatePaneText(bool setActive) ;
+    void                    MacFocusPaneText(bool setFocus) ;
+    void                    MacSetObjectVisibility(bool vis) ;

 
 

-    void                    MacSetObjectVisibility(Boolean vis) ;

 private :
     TXNFrameID              m_txnFrameID ;
     GrafPtr                 m_txnPort ;
 private :
     TXNFrameID              m_txnFrameID ;
     GrafPtr                 m_txnPort ;


@@ -349,18 +390,20 @@ private :
     // bounds of the control as we last did set the txn frames
     Rect                    m_txnControlBounds ;
     Rect                    m_txnVisBounds ;
     // bounds of the control as we last did set the txn frames
     Rect                    m_txnControlBounds ;
     Rect                    m_txnVisBounds ;

+

 #ifdef __WXMAC_OSX__
 #ifdef __WXMAC_OSX__

-    static pascal void      TXNScrollInfoProc (SInt32 iValue, SInt32 iMaximumValue,
-                                TXNScrollBarOrientation iScrollBarOrientation, SInt32 iRefCon) ;
-    static pascal void      TXNScrollActionProc( ControlRef controlRef , ControlPartCode partCode ) ;
+    static pascal void TXNScrollActionProc( ControlRef controlRef , ControlPartCode partCode ) ;
+    static pascal void TXNScrollInfoProc(
+        SInt32 iValue, SInt32 iMaximumValue,
+        TXNScrollBarOrientation iScrollBarOrientation, SInt32 iRefCon ) ;
+

     ControlRef              m_sbHorizontal ;
     SInt32                  m_lastHorizontalValue ;
     ControlRef              m_sbVertical ;
     SInt32                  m_lastVerticalValue ;
 #endif
     ControlRef              m_sbHorizontal ;
     SInt32                  m_lastHorizontalValue ;
     ControlRef              m_sbVertical ;
     SInt32                  m_lastVerticalValue ;
 #endif

-} ;
+};

 
 

-#define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL

 
 IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
 


@@ -387,15 +430,15 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
     EVT_UPDATE_UI(wxID_SELECTALL, wxTextCtrl::OnUpdateSelectAll)
 END_EVENT_TABLE()
 
     EVT_UPDATE_UI(wxID_SELECTALL, wxTextCtrl::OnUpdateSelectAll)
 END_EVENT_TABLE()
 

-// Text item
+

 void wxTextCtrl::Init()
 {
     m_editable = true ;
     m_dirty = false;
 
 void wxTextCtrl::Init()
 {
     m_editable = true ;
     m_dirty = false;
 

+    m_maxLength = 0;

     m_privateContextMenu = NULL;
     m_privateContextMenu = NULL;

-
-    m_maxLength = TE_UNLIMITED_LENGTH ;
+    m_triggerOnSetValue = true ;

 }
 
 wxTextCtrl::~wxTextCtrl()
 }
 
 wxTextCtrl::~wxTextCtrl()


@@ -403,35 +446,38 @@ wxTextCtrl::~wxTextCtrl()
     delete m_privateContextMenu;
 }
 
     delete m_privateContextMenu;
 }
 

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

 {
     m_macIsUserPane = false ;
     m_editable = true ;
 
 {
     m_macIsUserPane = false ;
     m_editable = true ;
 

-    if ( ! ( style & wxNO_BORDER) )
-        style = ( style & ~wxBORDER_MASK) | wxSUNKEN_BORDER ;
+    if ( ! (style & wxNO_BORDER) )
+        style = (style & ~wxBORDER_MASK) | wxSUNKEN_BORDER ;

 
 

-    if ( !wxTextCtrlBase::Create(parent, id, pos, size, style & ~(wxHSCROLL|wxVSCROLL), validator, name) )
+    if ( !wxTextCtrlBase::Create( parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), validator, name ) )

         return false;
 
     if ( m_windowStyle & wxTE_MULTILINE )
     {
         return false;
 
     if ( m_windowStyle & wxTE_MULTILINE )
     {

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

+

 #if wxUSE_SYSTEM_OPTIONS
 #if wxUSE_SYSTEM_OPTIONS

-    if ( (wxSystemOptions::HasOption(wxMAC_TEXTCONTROL_USE_MLTE) ) && ( wxSystemOptions::GetOptionInt( wxMAC_TEXTCONTROL_USE_MLTE ) == 1) )
+    if (wxSystemOptions::HasOption( wxMAC_TEXTCONTROL_USE_MLTE ) && (wxSystemOptions::GetOptionInt( wxMAC_TEXTCONTROL_USE_MLTE ) == 1))

     {
         forceMLTE = true ;
     }
     {
         forceMLTE = true ;
     }


@@ -439,33 +485,31 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
 
 #ifdef __WXMAC_OSX__
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
 
 #ifdef __WXMAC_OSX__
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2

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

     {
         if ( m_windowStyle & wxTE_MULTILINE )
             m_peer = new wxMacMLTEHIViewControl( this , str , pos , size , style ) ;
     }
 #endif
     {
         if ( m_windowStyle & wxTE_MULTILINE )
             m_peer = new wxMacMLTEHIViewControl( this , str , pos , size , style ) ;
     }
 #endif

+

     if ( !m_peer )
     {
     if ( !m_peer )
     {

-        if ( !(m_windowStyle & wxTE_MULTILINE) && forceMLTE == false )
+        if ( !(m_windowStyle & wxTE_MULTILINE) && !forceMLTE )

             m_peer = new wxMacUnicodeTextControl( this , str , pos , size , style ) ;
     }
 #endif
             m_peer = new wxMacUnicodeTextControl( this , str , pos , size , style ) ;
     }
 #endif

+

     if ( !m_peer )
     if ( !m_peer )

-    {

         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)
 
     // only now the embedding is correct and we can do a positioning update
 
     MacSuperChangedPosition() ;
 
     if ( m_windowStyle & wxTE_READONLY)

-    {

         SetEditable( false ) ;
         SetEditable( false ) ;

-    }

 
     SetCursor( wxCursor( wxCURSOR_IBEAM ) ) ;
 
 
     SetCursor( wxCursor( wxCURSOR_IBEAM ) ) ;
 


@@ -503,12 +547,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)


@@ -522,12 +569,14 @@ bool wxTextCtrl::SetFont( const wxFont& font )
         return false ;
 
     GetPeer()->SetFont( font , GetForegroundColour() , GetWindowStyle() ) ;
         return false ;
 
     GetPeer()->SetFont( font , GetForegroundColour() , GetWindowStyle() ) ;

+

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

+

     return true ;
 }
 
     return true ;
 }
 


@@ -535,16 +584,16 @@ bool wxTextCtrl::SetDefaultStyle(const wxTextAttr& style)
 {
     wxTextCtrlBase::SetDefaultStyle( style ) ;
     SetStyle( kTXNUseCurrentSelection , kTXNUseCurrentSelection , GetDefaultStyle() ) ;
 {
     wxTextCtrlBase::SetDefaultStyle( style ) ;
     SetStyle( kTXNUseCurrentSelection , kTXNUseCurrentSelection , GetDefaultStyle() ) ;

+

     return true ;
 }
 
 // Clipboard operations
     return true ;
 }
 
 // Clipboard operations

+

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

-    {

         GetPeer()->Copy() ;
         GetPeer()->Copy() ;

-    }

 }
 
 void wxTextCtrl::Cut()
 }
 
 void wxTextCtrl::Cut()


@@ -553,9 +602,9 @@ void wxTextCtrl::Cut()
     {
         GetPeer()->Cut() ;
 
     {
         GetPeer()->Cut() ;
 

-        wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
+        wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );

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

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

       }
 }
 
       }
 }
 


@@ -564,11 +613,12 @@ void wxTextCtrl::Paste()
     if (CanPaste())
     {
         GetPeer()->Paste() ;
     if (CanPaste())
     {
         GetPeer()->Paste() ;

-        // eventually we should add setting the default style again

 
 

-        wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
+        // TODO: eventually we should add setting the default style again
+
+        wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );

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

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

     }
 }
 
     }
 }
 


@@ -576,19 +626,20 @@ 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);
 }
 
     return (from != to);
 }
 


@@ -617,24 +668,25 @@ void wxTextCtrl::SetInsertionPoint(long pos)
 void wxTextCtrl::SetInsertionPointEnd()
 {
     wxTextPos pos = GetLastPosition();
 void wxTextCtrl::SetInsertionPointEnd()
 {
     wxTextPos pos = GetLastPosition();

-    SetInsertionPoint(pos);
+    SetInsertionPoint( pos );

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

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

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

+

     return begin ;
 }
 
 wxTextPos wxTextCtrl::GetLastPosition() const
 {
     return begin ;
 }
 
 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)


@@ -649,34 +701,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 explicitly
+        // unfortunately CW 8 is not able to correctly deduce the template types,
+        // so we have to instantiate explicitly

         wxMacMPRemoteGUICall<wxTextCtrl,wxString>( this , &wxTextCtrl::WriteText , str ) ;
         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()


@@ -702,24 +748,26 @@ 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;
             break ;
         default :
             hText = 22 - 6;
             break ;


@@ -728,9 +776,7 @@ wxSize wxTextCtrl::DoGetBestSize() const
     // as the above numbers have some free space around the text
     // we get 5 lines like this anyway
     if ( m_windowStyle & wxTE_MULTILINE )
     // 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 ;


@@ -745,34 +791,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
 {
     if ( !IsEditable() )
 }
 
 bool wxTextCtrl::CanUndo() const
 {
     if ( !IsEditable() )

-    {

         return false ;
         return false ;

-    }
+

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

-    {

         return false ;
         return false ;

-    }
+

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


@@ -798,7 +838,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)


@@ -816,23 +856,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)


@@ -849,29 +883,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;
     }
 


@@ -882,18 +927,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 );


@@ -901,31 +950,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 ;
                     }
                 }
 
                 // this will make wxWidgets eat the ENTER key so that
                         return ;
                     }
                 }
 
                 // this will make wxWidgets eat the ENTER key so that

-                // we actually prevent line wrapping in a single line
-                // text control
+                // we actually prevent line wrapping in a single line text control

                 eat_key = true;
             }
                 eat_key = true;
             }

-

             break;
 
         case WXK_TAB:
             break;
 
         case WXK_TAB:


@@ -937,38 +987,27 @@ 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 ) ||
          key == WXK_RETURN ||
          key == WXK_DELETE ||
     if ( ( key >= 0x20 && key < WXK_START ) ||
          key == WXK_RETURN ||
          key == WXK_DELETE ||


@@ -976,7 +1015,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
     {
         wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
         event1.SetEventObject( this );
     {
         wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
         event1.SetEventObject( this );

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

     }
 }
 
     }
 }
 


@@ -1012,9 +1051,10 @@ void wxTextCtrl::OnRedo(wxCommandEvent& WXUNUSED(event))
 void wxTextCtrl::OnDelete(wxCommandEvent& WXUNUSED(event))
 {
     long from, to;
 void wxTextCtrl::OnDelete(wxCommandEvent& WXUNUSED(event))
 {
     long from, to;

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

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

-        Remove(from, to);
+        Remove( from, to );

 }
 
 void wxTextCtrl::OnSelectAll(wxCommandEvent& WXUNUSED(event))
 }
 
 void wxTextCtrl::OnSelectAll(wxCommandEvent& WXUNUSED(event))


@@ -1050,8 +1090,9 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
 void wxTextCtrl::OnUpdateDelete(wxUpdateUIEvent& event)
 {
     long from, to;
 void wxTextCtrl::OnUpdateDelete(wxUpdateUIEvent& event)
 {
     long from, to;

-    GetSelection(& from, & to);
-    event.Enable(from != -1 && to != -1 && from != to && IsEditable()) ;
+
+    GetSelection( &from, &to );
+    event.Enable( from != -1 && to != -1 && from != to && IsEditable() ) ;

 }
 
 void wxTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event)
 }
 
 void wxTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event)


@@ -1059,10 +1100,16 @@ void wxTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event)
     event.Enable(GetLastPosition() > 0);
 }
 
     event.Enable(GetLastPosition() > 0);
 }
 

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

 
 void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event)
 {
 
 void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event)
 {

+    if ( GetPeer()->HasOwnContextMenu() )
+    {
+        event.Skip() ;
+        return ;
+    }
+

     if (m_privateContextMenu == NULL)
     {
         m_privateContextMenu = new wxMenu;
     if (m_privateContextMenu == NULL)
     {
         m_privateContextMenu = new wxMenu;


@@ -1083,11 +1130,12 @@ void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event)
 
 bool wxTextCtrl::MacSetupCursor( const wxPoint& pt )
 {
 
 bool wxTextCtrl::MacSetupCursor( const wxPoint& pt )
 {

-    if ( !GetPeer()->SetupCursor(pt) )
+    if ( !GetPeer()->SetupCursor( pt ) )

         return wxWindow::MacSetupCursor( pt ) ;
     else
         return true ;
 }
         return wxWindow::MacSetupCursor( pt ) ;
     else
         return true ;
 }

+

 #if !TARGET_API_MAC_OSX
 
 // user pane implementation
 #if !TARGET_API_MAC_OSX
 
 // user pane implementation


@@ -1133,6 +1181,7 @@ void wxTextCtrl::MacControlUserPaneBackgroundProc(void* info)
 }
 
 #endif
 }
 
 #endif

+

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


@@ -1173,11 +1222,19 @@ void wxMacTextControl::SetEditable(bool editable)
 
 wxTextPos wxMacTextControl::GetLastPosition() const
 {
 
 wxTextPos wxMacTextControl::GetLastPosition() const
 {

-    return GetStringValue().Length() ;
+    return GetStringValue().length() ;
+}
+
+void wxMacTextControl::Replace( long from , long to , const wxString &val )
+{
+    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()


@@ -1190,7 +1247,9 @@ bool wxMacTextControl::CanUndo() const
     return false ;
 }
 
     return false ;
 }
 

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

 
 bool wxMacTextControl::CanRedo()  const
 {
 
 bool wxMacTextControl::CanRedo()  const
 {


@@ -1220,28 +1279,31 @@ 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() ;
 
     // Find line first
     int count = 0;
     wxString content = GetStringValue() ;
 
     // Find line first
     int count = 0;

-    for (size_t i = 0; i < content.Length() ; i++)
+    for (size_t i = 0; i < content.length() ; i++)

     {
         if (count == lineNo)
         {
             // Add chars in line then
             wxString tmp;
 
     {
         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;


@@ -1251,34 +1313,41 @@ wxString wxMacTextControl::GetLineText(long lineNo) const
 
             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() ;
 
     // Find line first
     int count = 0;
     wxString content = GetStringValue() ;
 
     // Find line first
     int count = 0;

-    for (size_t i = 0; i < content.Length() ; i++)
+    for (size_t i = 0; i < content.length() ; i++)

     {
         if (count == lineNo)
         {
             // Count chars in line then
             count = 0;
     {
         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 ;
 }
 


@@ -1289,9 +1358,10 @@ int  wxMacTextControl::GetLineLength(long lineNo) const
 #if TARGET_API_MAC_OSX
 
 wxMacUnicodeTextControl::wxMacUnicodeTextControl( wxTextCtrl *wxPeer,
 #if TARGET_API_MAC_OSX
 
 wxMacUnicodeTextControl::wxMacUnicodeTextControl( wxTextCtrl *wxPeer,

-                         const wxString& str,
-                         const wxPoint& pos,
-                         const wxSize& size, long style ) : wxMacTextControl( wxPeer )
+    const wxString& str,
+    const wxPoint& pos,
+    const wxSize& size, long style )
+    : wxMacTextControl( wxPeer )

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


@@ -1302,12 +1372,14 @@ wxMacUnicodeTextControl::wxMacUnicodeTextControl( wxTextCtrl *wxPeer,
     CFStringRef cfr = cf ;
     Boolean isPassword = ( m_windowStyle & wxTE_PASSWORD ) != 0 ;
     m_valueTag = isPassword ? kControlEditTextPasswordCFStringTag : kControlEditTextCFStringTag ;
     CFStringRef cfr = cf ;
     Boolean isPassword = ( m_windowStyle & wxTE_PASSWORD ) != 0 ;
     m_valueTag = isPassword ? kControlEditTextPasswordCFStringTag : kControlEditTextCFStringTag ;

-    CreateEditUnicodeTextControl( MAC_WXHWND(wxPeer->MacGetTopLevelWindowRef()), &bounds , cfr , isPassword , NULL , &m_controlRef ) ;
+
+    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 ) ;

-    }

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


@@ -1318,98 +1390,116 @@ 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 ) );
 
         CFRelease( value ) ;
     }
 }
         verify_noerr( SetData<CFStringRef>( 0, m_valueTag, &value ) );
         verify_noerr( SetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &sel ) );
 
         CFRelease( value ) ;
     }
 }

+

 wxString wxMacUnicodeTextControl::GetStringValue() const
 {
     wxString result ;
 wxString wxMacUnicodeTextControl::GetStringValue() const
 {
     wxString result ;

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

     if ( value )
     {
         wxMacCFStringHolder cf(value) ;
         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)
 {
 void wxMacUnicodeTextControl::SetEditable(bool editable)
 {

-    SetData<Boolean>( 0 , kControlEditTextLockedTag , (Boolean) !editable ) ;
-}
-void wxMacUnicodeTextControl::Remove( long from , long to )
-{
+#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 ;
+    verify_noerr( GetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &sel ) ) ;
+    if ( from )
+        *from = sel.selStart ;
+    if ( to )
+        *to = sel.selEnd ;

 }
 
 void wxMacUnicodeTextControl::SetSelection( long from , long to )
 {
     ControlEditTextSelectionRec sel ;
 }
 
 void wxMacUnicodeTextControl::SetSelection( long from , long to )
 {
     ControlEditTextSelectionRec sel ;

+    if ((from == -1) && (to == -1))
+    {
+        from = 0 ;
+        to = 32767 ; // sel has 16 bit signed values, max is 32767
+    }
+

     sel.selStart = from ;
     sel.selEnd = to ;
     sel.selStart = from ;
     sel.selEnd = to ;

-    SetData<ControlEditTextSelectionRec>( 0 , kControlEditTextSelectionTag, &sel ) ;
+    SetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &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

         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

         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
 }
 
 #endif


@@ -1418,7 +1508,7 @@ void wxMacUnicodeTextControl::WriteText(const wxString& str)
 // MLTE control implementation (common part)
 // ----------------------------------------------------------------------------
 
 // MLTE control implementation (common part)
 // ----------------------------------------------------------------------------
 

-// if mlte is on read only , no changes at all are allowed, not even from
+// if MTLE is read only, no changes at all are allowed, not even from

 // procedural API, in order to allow changes via API all the same we must undo
 // the readonly status while we are executing, this class helps to do so
 
 // 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
 


@@ -1436,20 +1526,21 @@ public :
             TXNSetTXNObjectControls( m_txn , false , 1 , tag , data ) ;
         }
     }
             TXNSetTXNObjectControls( m_txn , false , 1 , tag , data ) ;
         }
     }

+

     ~wxMacEditHelper()
     {
         TXNControlTag tag[] = { kTXNIOPrivilegesTag } ;
         if ( m_data[0].uValue == kTXNReadOnly )
     ~wxMacEditHelper()
     {
         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] ;

 } ;
 
 } ;
 

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

 {
     SetNeedsFocusRect( true ) ;
 }
 {
     SetNeedsFocusRect( true ) ;
 }


@@ -1459,47 +1550,55 @@ 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
 #if SIZEOF_WCHAR_T == 2

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

 #else
 #else

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

                 HLock( theText ) ;
                 (((UniChar*)*theText)[actualSize]) = 0 ;
                 wxMBConvUTF16 converter ;
                 size_t noChars = converter.MB2WC( NULL , (const char*)*theText , 0 ) ;
                 HLock( theText ) ;
                 (((UniChar*)*theText)[actualSize]) = 0 ;
                 wxMBConvUTF16 converter ;
                 size_t noChars = converter.MB2WC( NULL , (const char*)*theText , 0 ) ;

+                wxASSERT_MSG( noChars != wxCONV_FAILED, _T("Unable to count the number of characters in this string!") );

                 ptr = new wxChar[noChars + 1] ;
 
                 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 ;
         }


@@ -1512,68 +1611,72 @@ 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 ) ;

     {
     {

-        wxMacWindowClipper c( m_peer ) ;
+        wxMacWindowClipper c( m_peer );
+

         {
         {

-            wxMacEditHelper help(m_txn) ;
-            SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ;
+            wxMacEditHelper help( m_txn );
+            SetTXNData( st, kTXNStartOffset, kTXNEndOffset );

         }
         }

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

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

-    TXNFrameOptions frameOptions =
-        kTXNDontDrawCaretWhenInactiveMask
+    TXNFrameOptions frameOptions = kTXNDontDrawCaretWhenInactiveMask;
+

 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3

-        | kTXNDoFontSubstitutionMask
+    frameOptions |= kTXNDoFontSubstitutionMask;

 #endif
 #endif

-        ;

 
 

-    if ( ! ( wxStyle & wxTE_NOHIDESEL ) )
+    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 ;

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

         }
     }
     else
         }
     }
     else

+    {

         frameOptions |= kTXNSingleLineOnlyMask ;
         frameOptions |= kTXNSingleLineOnlyMask ;

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

 
     return frameOptions ;
 }
 
     return frameOptions ;
 }


@@ -1587,23 +1690,24 @@ void wxMacMLTEControl::AdjustCreationAttributes( const wxColour &background, boo
         };
     TXNControlData iControlData[] =
         {
         };
     TXNControlData iControlData[] =
         {

-            {true},
-            {kTXNNoAutoWrap},
+            { true },
+            { kTXNNoAutoWrap },

         };
 
     int toptag = WXSIZEOF( iControlTags ) ;
 
     if ( m_windowStyle & wxTE_MULTILINE )
     {
         };
 
     int toptag = WXSIZEOF( iControlTags ) ;
 
     if ( m_windowStyle & wxTE_MULTILINE )
     {

-        if (m_windowStyle & wxTE_DONTWRAP)
-            iControlData[1].uValue = kTXNNoAutoWrap ;
-        else
-            iControlData[1].uValue = kTXNAutoWrap ;
+        iControlData[1].uValue =
+            (m_windowStyle & wxTE_DONTWRAP)
+            ? kTXNNoAutoWrap
+            : kTXNAutoWrap;

     }
     }

-    verify_noerr( TXNSetTXNObjectControls( m_txn, false, toptag,
-                                        iControlTags, iControlData )) ;

 
 

-    // setting the default font
+    OSStatus err = TXNSetTXNObjectControls( m_txn, false, toptag, iControlTags, iControlData ) ;
+    verify_noerr( err );
+
+    // setting the default font:

     // under 10.2 this causes a visible caret, therefore we avoid it
 
     if ( UMAGetSystemVersion() >= 0x1030 )
     // under 10.2 this causes a visible caret, therefore we avoid it
 
     if ( UMAGetSystemVersion() >= 0x1030 )


@@ -1612,49 +1716,72 @@ void wxMacMLTEControl::AdjustCreationAttributes( const wxColour &background, boo
         SInt16 fontSize ;
         Style fontStyle ;
 
         SInt16 fontSize ;
         Style fontStyle ;
 

-        GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+        GetThemeFont( kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;

 
         TXNTypeAttributes typeAttr[] =
         {
 
         TXNTypeAttributes typeAttr[] =
         {

-            {   kTXNQDFontNameAttribute , kTXNQDFontNameAttributeSize , { (void*) fontName } } ,
-            {   kTXNQDFontSizeAttribute , kTXNFontSizeAttributeSize , { (void*) (fontSize << 16) } } ,
-            {   kTXNQDFontStyleAttribute , kTXNQDFontStyleAttributeSize , {  (void*) normal } } ,
+            { 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 )
 {
     // currently only solid background are supported
     TXNBackground tback;
 }
 
 void wxMacMLTEControl::SetBackground( const wxBrush &brush )
 {
     // currently only solid background are supported
     TXNBackground tback;

+

     tback.bgType = kTXNBackgroundTypeRGB;
     tback.bg.color = MAC_WXCOLORREF( brush.GetColour().GetPixel() );
     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 ;
     RGBColor color ;
 {
     TXNTypeAttributes typeAttr[4] ;
     Str255 fontName = "\pMonaco" ;
     SInt16 fontSize = 12 ;
     Style fontStyle = normal ;
     RGBColor color ;

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

     if ( style.HasFont() )
     {
         const wxFont &font = style.GetFont() ;
     if ( style.HasFont() )
     {
         const wxFont &font = style.GetFont() ;


@@ -1667,60 +1794,68 @@ 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++ ;

     }
     }

+

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

     }
 }
 
 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 ) ;
+    wxMacEditHelper help( m_txn ) ;
+    TXNSetAttribute( wxTextAttr( foreground, wxNullColour, font ), kTXNStartOffset, kTXNEndOffset ) ;

 }
 }

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

 {
 {

-    wxMacEditHelper help(m_txn) ;
-    TXNSetAttribute( style , start,end ) ;
+    wxMacEditHelper help( m_txn ) ;
+    TXNSetAttribute( style, start, end ) ;

 }
 
 void wxMacMLTEControl::Copy()
 {
     ClearCurrentScrap();
 }
 
 void wxMacMLTEControl::Copy()
 {
     ClearCurrentScrap();

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

     TXNConvertToPublicScrap();
 }
 
 void wxMacMLTEControl::Cut()
 {
     ClearCurrentScrap();
     TXNConvertToPublicScrap();
 }
 
 void wxMacMLTEControl::Cut()
 {
     ClearCurrentScrap();

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

     TXNConvertToPublicScrap();
 }
 
 void wxMacMLTEControl::Paste()
 {
     TXNConvertFromPublicScrap();
     TXNConvertToPublicScrap();
 }
 
 void wxMacMLTEControl::Paste()
 {
     TXNConvertFromPublicScrap();

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

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


@@ -1732,7 +1867,7 @@ 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 , WXSIZEOF(tag) , tag , data ) ;
+    TXNSetTXNObjectControls( m_txn, false, WXSIZEOF(tag), tag, data ) ;

 }
 
 wxTextPos wxMacMLTEControl::GetLastPosition() const
 }
 
 wxTextPos wxMacMLTEControl::GetLastPosition() const


@@ -1740,22 +1875,23 @@ wxTextPos wxMacMLTEControl::GetLastPosition() const
     wxTextPos actualsize = 0 ;
 
     Handle theText ;
     wxTextPos actualsize = 0 ;
 
     Handle theText ;

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

     {
     {

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

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


@@ -1763,16 +1899,16 @@ void wxMacMLTEControl::Replace( long from , long to , const wxString str )
     wxMacEditHelper help( m_txn ) ;
     wxMacWindowClipper c( m_peer ) ;
 
     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 )
 {
     wxMacWindowClipper c( m_peer ) ;
     wxMacEditHelper help( m_txn ) ;
 }
 
 void wxMacMLTEControl::Remove( long from , long to )
 {
     wxMacWindowClipper c( m_peer ) ;
     wxMacEditHelper help( m_txn ) ;

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

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


@@ -1784,36 +1920,42 @@ void wxMacMLTEControl::GetSelection( long* from, long* to) const
 void wxMacMLTEControl::SetSelection( long from , long to )
 {
     wxMacWindowClipper c( m_peer ) ;
 void wxMacMLTEControl::SetSelection( long from , long to )
 {
     wxMacWindowClipper c( m_peer ) ;

-    /* change the selection */
+
+    // 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 )

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

+

     GetSelection( &start , &dummy ) ;
     wxMacWindowClipper c( m_peer ) ;
     GetSelection( &start , &dummy ) ;
     wxMacWindowClipper c( m_peer ) ;

+

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

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

     }
     }

-    GetSelection( &dummy , &end ) ;
-    // TODO SetStyle( start , end , GetDefaultStyle() ) ;
+
+    GetSelection( &dummy, &end ) ;
+
+    // TODO: SetStyle( start , end , GetDefaultStyle() ) ;

 }
 
 void wxMacMLTEControl::Clear()
 {
     wxMacWindowClipper c( m_peer ) ;
 }
 
 void wxMacMLTEControl::Clear()
 {
     wxMacWindowClipper c( m_peer ) ;

-    wxMacEditHelper st(m_txn) ;
+    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


@@ -1826,7 +1968,7 @@ 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 ) ;
 }


@@ -1839,81 +1981,88 @@ void wxMacMLTEControl::Redo()
 int wxMacMLTEControl::GetNumberOfLines() const
 {
     ItemCount lines = 0 ;
 int wxMacMLTEControl::GetNumberOfLines() const
 {
     ItemCount lines = 0 ;

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

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

+    wxTextPos lastpos ;

 
 

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

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

+    wxTextPos lastpos ;

 
 

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

 
 

+    lastpos = GetLastPosition() ;

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


@@ -1923,21 +2072,23 @@ 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 );
-            // there will be an error returned for classic mlte implementation when the control is
+            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!") );
         }
             // invisible, but HITextView works correctly, so we don't assert that one
             // wxASSERT_MSG( theErr == noErr, _T("TXNScroll returned an error!") );
         }


@@ -1945,48 +2096,43 @@ void wxMacMLTEControl::ShowPosition( long pos )
 #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
     size_t len = st.Len() ;
 {
 #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);
+    TXNSetData( m_txn, kTXNUnicodeTextData, (void*)st.wc_str(), len * 2, start, end );

 #else
     wxMBConvUTF16 converter ;
 #else
     wxMBConvUTF16 converter ;

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

     free( unibuf ) ;
 #endif
 #else
     free( unibuf ) ;
 #endif
 #else

-    wxCharBuffer text =  st.mb_str(wxConvLocal)  ;
-    TXNSetData( m_txn , kTXNTextData,  (void*)text.data(), strlen( text ) ,
-      start, end);
+    wxCharBuffer text = st.mb_str( wxConvLocal ) ;
+    TXNSetData( m_txn, kTXNTextData, (void*)text.data(), strlen( text ), start, end ) ;

 #endif
 }
 
 #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;
+        Point firstPoint;
+        Fixed lineWidth, lineHeight, currentHeight;
+        long ypos ;

 
         // get the first possible position in the control
 
         // get the first possible position in the control

-        Point firstPoint;

         TXNOffsetToPoint(m_txn, 0, &firstPoint);
 
         // Iterate through the lines until we reach the one we want,
         // adding to our current y pixel point position
         TXNOffsetToPoint(m_txn, 0, &firstPoint);
 
         // Iterate through the lines until we reach the one we want,
         // adding to our current y pixel point position

+        ypos = 0 ;
+        currentHeight = 0;

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


@@ -1999,33 +2145,33 @@ wxString wxMacMLTEControl::GetLineText(long lineNo) const
 
         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;
+        Point firstPoint;
+        Fixed lineWidth, lineHeight, currentHeight;
+        long ypos;

 
         // get the first possible position in the control
 
         // get the first possible position in the control

-        Point firstPoint;

         TXNOffsetToPoint(m_txn, 0, &firstPoint);
 
         // Iterate through the lines until we reach the one we want,
         // adding to our current y pixel point position
         TXNOffsetToPoint(m_txn, 0, &firstPoint);
 
         // Iterate through the lines until we reach the one we want,
         // adding to our current y pixel point position

+        ypos = 0;
+        currentHeight = 0;

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


@@ -2038,16 +2184,16 @@ int  wxMacMLTEControl::GetLineLength(long lineNo) const
 
         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)
 // ----------------------------------------------------------------------------


@@ -2063,8 +2209,9 @@ int  wxMacMLTEControl::GetLineLength(long lineNo) const
 TXNScrollInfoUPP gTXNScrollInfoProc = NULL ;
 ControlActionUPP gTXNScrollActionProc = NULL ;
 
 TXNScrollInfoUPP gTXNScrollInfoProc = NULL ;
 ControlActionUPP gTXNScrollActionProc = NULL ;
 

-pascal void wxMacMLTEClassicControl::TXNScrollInfoProc (SInt32 iValue, SInt32 iMaximumValue, TXNScrollBarOrientation
-    iScrollBarOrientation, SInt32 iRefCon)
+pascal void wxMacMLTEClassicControl::TXNScrollInfoProc(
+    SInt32 iValue, SInt32 iMaximumValue,
+    TXNScrollBarOrientation iScrollBarOrientation, SInt32 iRefCon )

 {
     wxMacMLTEClassicControl* mlte = (wxMacMLTEClassicControl*) iRefCon ;
     SInt32 value =  wxMax( iValue , 0 ) ;
 {
     wxMacMLTEClassicControl* mlte = (wxMacMLTEClassicControl*) iRefCon ;
     SInt32 value =  wxMax( iValue , 0 ) ;


@@ -2092,7 +2239,6 @@ pascal void wxMacMLTEClassicControl::TXNScrollInfoProc (SInt32 iValue, SInt32 iM
 
 pascal void wxMacMLTEClassicControl::TXNScrollActionProc( ControlRef controlRef , ControlPartCode partCode )
 {
 
 pascal void wxMacMLTEClassicControl::TXNScrollActionProc( ControlRef controlRef , ControlPartCode partCode )
 {

-    OSStatus err ;

     wxMacMLTEClassicControl* mlte = (wxMacMLTEClassicControl*) GetControlReference( controlRef ) ;
     if ( mlte == NULL )
         return ;
     wxMacMLTEClassicControl* mlte = (wxMacMLTEClassicControl*) GetControlReference( controlRef ) ;
     if ( mlte == NULL )
         return ;


@@ -2100,40 +2246,47 @@ pascal void wxMacMLTEClassicControl::TXNScrollActionProc( ControlRef controlRef
     if ( controlRef != mlte->m_sbVertical && controlRef != mlte->m_sbHorizontal )
         return ;
 
     if ( controlRef != mlte->m_sbVertical && controlRef != mlte->m_sbHorizontal )
         return ;
 

+    OSStatus err ;

     bool isHorizontal = ( controlRef == mlte->m_sbHorizontal ) ;
 
     SInt32 minimum = 0 ;
     SInt32 maximum = GetControl32BitMaximum( controlRef ) ;
     SInt32 value = GetControl32BitValue( controlRef ) ;
     SInt32 delta = 0;
     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 ;
     switch ( partCode )
     {
         case kControlDownButtonPart :
             delta = 10 ;
             break ;

+

         case kControlUpButtonPart :
             delta = -10 ;
             break ;
         case kControlUpButtonPart :
             delta = -10 ;
             break ;

+

         case kControlPageDownPart :
             delta = GetControlViewSize( controlRef ) ;
             break ;
         case kControlPageDownPart :
             delta = GetControlViewSize( controlRef ) ;
             break ;

+

         case kControlPageUpPart :
         case kControlPageUpPart :

-            delta = -GetControlViewSize( controlRef )  ;
+            delta = -GetControlViewSize( controlRef ) ;

             break ;
             break ;

+

         case kControlIndicatorPart :
         case kControlIndicatorPart :

-            delta = value -
-                ( isHorizontal ? mlte->m_lastHorizontalValue : mlte->m_lastVerticalValue ) ;
+            delta = value - (isHorizontal ? mlte->m_lastHorizontalValue : mlte->m_lastVerticalValue) ;

             break ;
             break ;

+

         default :
             break ;
     }
         default :
             break ;
     }

+

     if ( delta != 0 )
     {
         SInt32 newValue = value ;
 
         if ( partCode != kControlIndicatorPart )
         {
     if ( delta != 0 )
     {
         SInt32 newValue = value ;
 
         if ( partCode != kControlIndicatorPart )
         {

-            if( value + delta < minimum )
+            if ( value + delta < minimum )

                 delta = minimum - value ;
             if ( value + delta > maximum )
                 delta = maximum - value ;
                 delta = minimum - value ;
             if ( value + delta > maximum )
                 delta = maximum - value ;


@@ -2145,8 +2298,10 @@ pascal void wxMacMLTEClassicControl::TXNScrollActionProc( ControlRef controlRef
         SInt32 verticalDelta = isHorizontal ? 0 : delta ;
         SInt32 horizontalDelta = isHorizontal ? delta : 0 ;
 
         SInt32 verticalDelta = isHorizontal ? 0 : delta ;
         SInt32 horizontalDelta = isHorizontal ? delta : 0 ;
 

-        err = TXNScroll( mlte->m_txn , kTXNScrollUnitsInPixels, kTXNScrollUnitsInPixels,
-                                    &verticalDelta , &horizontalDelta  );
+        err = TXNScroll(
+            mlte->m_txn, kTXNScrollUnitsInPixels, kTXNScrollUnitsInPixels,
+            &verticalDelta, &horizontalDelta );
+        verify_noerr( err );

 
         if ( isHorizontal )
             mlte->m_lastHorizontalValue = newValue ;
 
         if ( isHorizontal )
             mlte->m_lastHorizontalValue = newValue ;


@@ -2157,63 +2312,59 @@ pascal void wxMacMLTEClassicControl::TXNScrollActionProc( ControlRef controlRef
 #endif
 
 // make correct activations
 #endif
 
 // make correct activations

-void wxMacMLTEClassicControl::MacActivatePaneText(Boolean setActive)
+void wxMacMLTEClassicControl::MacActivatePaneText(bool setActive)

 {
     wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
 
     wxMacWindowClipper clipper( textctrl ) ;
 {
     wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
 
     wxMacWindowClipper clipper( textctrl ) ;

-    TXNActivate(m_txn, m_txnFrameID, setActive);
+    TXNActivate( m_txn, m_txnFrameID, setActive );

 
     ControlRef controlFocus = 0 ;
     GetKeyboardFocus( m_txnWindow , &controlFocus ) ;
     if ( controlFocus == m_controlRef )
 
     ControlRef controlFocus = 0 ;
     GetKeyboardFocus( m_txnWindow , &controlFocus ) ;
     if ( controlFocus == m_controlRef )

-        TXNFocus( m_txn, setActive);
+        TXNFocus( m_txn, setActive );

 }
 
 }
 

-void wxMacMLTEClassicControl::MacFocusPaneText(Boolean setFocus)
+void wxMacMLTEClassicControl::MacFocusPaneText(bool setFocus)

 {
 {

-    TXNFocus( m_txn, setFocus);
+    TXNFocus( m_txn, setFocus );

 }
 
 // guards against inappropriate redraw (hidden objects drawing onto window)
 
 }
 
 // guards against inappropriate redraw (hidden objects drawing onto window)
 

-void wxMacMLTEClassicControl::MacSetObjectVisibility(Boolean vis)
+void wxMacMLTEClassicControl::MacSetObjectVisibility(bool vis)

 {
     ControlRef controlFocus = 0 ;
     GetKeyboardFocus( m_txnWindow , &controlFocus ) ;
 
 {
     ControlRef controlFocus = 0 ;
     GetKeyboardFocus( m_txnWindow , &controlFocus ) ;
 

-    if ( controlFocus == m_controlRef && vis == false )
-    {
+    if ( !vis && (controlFocus == m_controlRef ) )

         SetKeyboardFocus( m_txnWindow , m_controlRef , kControlFocusNoPart ) ;
         SetKeyboardFocus( m_txnWindow , m_controlRef , kControlFocusNoPart ) ;

-    }

 
     TXNControlTag iControlTags[1] = { kTXNVisibilityTag };
 
     TXNControlTag iControlTags[1] = { kTXNVisibilityTag };

-    TXNControlData iControlData[1] = { {(UInt32) false } };
+    TXNControlData iControlData[1] = { { (UInt32)false } };

 
 

-    verify_noerr( TXNGetTXNObjectControls( m_txn , 1,
-                                        iControlTags, iControlData ) ) ;
+    verify_noerr( TXNGetTXNObjectControls( m_txn , 1, iControlTags, iControlData ) ) ;

 
     if ( iControlData[0].uValue != vis )
     {
         iControlData[0].uValue = vis ;
 
     if ( iControlData[0].uValue != vis )
     {
         iControlData[0].uValue = vis ;

-        verify_noerr( TXNSetTXNObjectControls( m_txn, false , 1,
-                                        iControlTags, iControlData )) ;
+        verify_noerr( TXNSetTXNObjectControls( m_txn, false , 1, iControlTags, iControlData ) ) ;

     }
     }

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

 }
 
 // make sure that the TXNObject is at the right position
 
 void wxMacMLTEClassicControl::MacUpdatePosition()
 {
 }
 
 // make sure that the TXNObject is at the right position
 
 void wxMacMLTEClassicControl::MacUpdatePosition()
 {

-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
+    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );

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

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

 
     wxRect visRect = textctrl->MacGetClippedClientRect() ;
     Rect visBounds = { visRect.y , visRect.x , visRect.y + visRect.height , visRect.x + visRect.width } ;
 
     wxRect visRect = textctrl->MacGetClippedClientRect() ;
     Rect visBounds = { visRect.y , visRect.x , visRect.y + visRect.height , visRect.x + visRect.width } ;


@@ -2222,11 +2373,11 @@ void wxMacMLTEClassicControl::MacUpdatePosition()
     textctrl->MacWindowToRootWindow( &x , &y ) ;
     OffsetRect( &visBounds , x , y ) ;
 
     textctrl->MacWindowToRootWindow( &x , &y ) ;
     OffsetRect( &visBounds , x , y ) ;
 

-    if ( !EqualRect( &bounds , &m_txnControlBounds ) || !EqualRect( &visBounds , &m_txnVisBounds) )
+    if ( !EqualRect( &bounds, &m_txnControlBounds ) || !EqualRect( &visBounds, &m_txnVisBounds ) )

     {
         m_txnControlBounds = bounds ;
         m_txnVisBounds = visBounds ;
     {
         m_txnControlBounds = bounds ;
         m_txnVisBounds = visBounds ;

-        wxMacWindowClipper cl(textctrl) ;
+        wxMacWindowClipper cl( textctrl ) ;

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


@@ -2250,6 +2401,7 @@ void wxMacMLTEClassicControl::MacUpdatePosition()
                 SetControlBounds( m_sbHorizontal , &sbBounds ) ;
                 SetControlViewSize( m_sbHorizontal , w ) ;
             }
                 SetControlBounds( m_sbHorizontal , &sbBounds ) ;
                 SetControlViewSize( m_sbHorizontal , w ) ;
             }

+

             if ( m_sbVertical )
             {
                 Rect sbBounds ;
             if ( m_sbVertical )
             {
                 Rect sbBounds ;


@@ -2257,7 +2409,7 @@ void wxMacMLTEClassicControl::MacUpdatePosition()
                 sbBounds.left = w - 14 ;
                 sbBounds.top = -1 ;
                 sbBounds.right = w + 1 ;
                 sbBounds.left = w - 14 ;
                 sbBounds.top = -1 ;
                 sbBounds.right = w + 1 ;

-                sbBounds.bottom = m_sbHorizontal ? h - 14 : h + 1  ;
+                sbBounds.bottom = m_sbHorizontal ? h - 14 : h + 1 ;

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


@@ -2272,9 +2424,11 @@ void wxMacMLTEClassicControl::MacUpdatePosition()
         TXNGetRectBounds( m_txn , &oldviewRect , &olddestRect , NULL ) ;
 
         Rect viewRect = { m_txnControlBounds.top, m_txnControlBounds.left,
         TXNGetRectBounds( m_txn , &oldviewRect , &olddestRect , NULL ) ;
 
         Rect viewRect = { m_txnControlBounds.top, m_txnControlBounds.left,

-            m_txnControlBounds.bottom - ( m_sbHorizontal ? 14 : 0 ) , m_txnControlBounds.right - ( m_sbVertical ? 14 : 0 ) } ;
+            m_txnControlBounds.bottom - ( m_sbHorizontal ? 14 : 0 ) ,
+            m_txnControlBounds.right - ( m_sbVertical ? 14 : 0 ) } ;

         TXNLongRect destRect = { m_txnControlBounds.top, m_txnControlBounds.left,
         TXNLongRect destRect = { m_txnControlBounds.top, m_txnControlBounds.left,

-            m_txnControlBounds.bottom - ( m_sbHorizontal ? 14 : 0 ) , m_txnControlBounds.right - ( m_sbVertical ? 14 : 0 ) } ;
+            m_txnControlBounds.bottom - ( m_sbHorizontal ? 14 : 0 ) ,
+            m_txnControlBounds.right - ( m_sbVertical ? 14 : 0 ) } ;

 
         if ( olddestRect.right >= 10000 )
             destRect.right = destRect.left + 32000 ;
 
         if ( olddestRect.right >= 10000 )
             destRect.right = destRect.left + 32000 ;


@@ -2284,27 +2438,33 @@ void wxMacMLTEClassicControl::MacUpdatePosition()
 
         SectRect( &viewRect , &visBounds , &viewRect ) ;
         TXNSetRectBounds( m_txn , &viewRect , &destRect , true ) ;
 
         SectRect( &viewRect , &visBounds , &viewRect ) ;
         TXNSetRectBounds( m_txn , &viewRect , &destRect , true ) ;

-/*
-        TXNSetFrameBounds( m_txn, m_txnControlBounds.top, m_txnControlBounds.left,
-            m_txnControlBounds.bottom - ( m_sbHorizontal ? 14 : 0 ) , m_txnControlBounds.right - ( m_sbVertical ? 14 : 0 ), m_txnFrameID);
-*/
+
+#if 0
+        TXNSetFrameBounds(
+            m_txn,
+            m_txnControlBounds.top,
+            m_txnControlBounds.left,
+            m_txnControlBounds.bottom - (m_sbHorizontal ? 14 : 0),
+            m_txnControlBounds.right - (m_sbVertical ? 14 : 0),
+            m_txnFrameID );
+#endif

 #else
 
 #else
 

-        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);
+        TXNSetFrameBounds(
+            m_txn, m_txnControlBounds.top, m_txnControlBounds.left,
+            wxMax( m_txnControlBounds.bottom, m_txnControlBounds.top ),
+            wxMax( m_txnControlBounds.right, m_txnControlBounds.left ), m_txnFrameID );

 #endif
 #endif

-        // the SetFrameBounds method unter classic sometimes does not correctly scroll a selection into sight after a
+
+        // the SetFrameBounds method under Classic sometimes does not correctly scroll a selection into sight after a

         // movement, therefore we have to force it
 
         // movement, therefore we have to force it
 

-        // according to David Surovell this problem also sometimes occurs under OSX, so we use this as well
-        
+        // this problem has been reported in OSX as well, so we use this here once again
+

         TXNLongRect textRect ;
         TXNGetRectBounds( m_txn , NULL , NULL , &textRect ) ;
         if ( textRect.left < m_txnControlBounds.left )
         TXNLongRect textRect ;
         TXNGetRectBounds( m_txn , NULL , NULL , &textRect ) ;
         if ( textRect.left < m_txnControlBounds.left )

-        {
-            TXNShowSelection( m_txn , false ) ;
-        }
+            TXNShowSelection( m_txn , kTXNShowStart ) ;

     }
 }
 
     }
 }
 


@@ -2316,7 +2476,7 @@ void wxMacMLTEClassicControl::SetRect( Rect *r )
 
 void wxMacMLTEClassicControl::MacControlUserPaneDrawProc(wxInt16 thePart)
 {
 
 void wxMacMLTEClassicControl::MacControlUserPaneDrawProc(wxInt16 thePart)
 {

-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
+    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );

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


@@ -2330,17 +2490,15 @@ void wxMacMLTEClassicControl::MacControlUserPaneDrawProc(wxInt16 thePart)
 wxInt16 wxMacMLTEClassicControl::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y)
 {
     Point where = { y , x } ;
 wxInt16 wxMacMLTEClassicControl::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y)
 {
     Point where = { y , x } ;

-    ControlPartCode result;
+    ControlPartCode result = kControlNoPart;

 
 

-    result = 0;
-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
-    if ( textctrl == NULL )
-        return 0 ;
-
-    if (textctrl->MacIsReallyShown() )
+    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference( m_controlRef );
+    if ( (textctrl != NULL) && textctrl->MacIsReallyShown() )

     {
     {

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

             result = kControlEditTextPart ;
             result = kControlEditTextPart ;

+        }

         else
         {
             // sometimes we get the coords also in control local coordinates, therefore test again
         else
         {
             // sometimes we get the coords also in control local coordinates, therefore test again


@@ -2351,26 +2509,23 @@ wxInt16 wxMacMLTEClassicControl::MacControlUserPaneHitTestProc(wxInt16 x, wxInt1
                 where.h += x ;
                 where.v += y ;
             }
                 where.h += x ;
                 where.v += y ;
             }

-            if (PtInRect(where, &m_txnControlBounds))
+
+            if (PtInRect( where, &m_txnControlBounds ))

                 result = kControlEditTextPart ;
                 result = kControlEditTextPart ;

-            else
-                result = 0;

         }
     }
         }
     }

+

     return result;
 }
 
 wxInt16 wxMacMLTEClassicControl::MacControlUserPaneTrackingProc( wxInt16 x, wxInt16 y, void* actionProc )
 {
     return result;
 }
 
 wxInt16 wxMacMLTEClassicControl::MacControlUserPaneTrackingProc( wxInt16 x, wxInt16 y, void* actionProc )
 {

-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
-    if ( textctrl == NULL )
-        return 0;
+    ControlPartCode result = kControlNoPart;

 
 

-    ControlPartCode partCodeResult = 0;
-
-    if (textctrl->MacIsReallyShown() )
+    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference( m_controlRef );
+    if ( (textctrl != NULL) && textctrl->MacIsReallyShown() )

     {
     {

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

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


@@ -2385,21 +2540,24 @@ wxInt16 wxMacMLTEClassicControl::MacControlUserPaneTrackingProc( wxInt16 x, wxIn
             case kControlEditTextPart :
             {
                 wxMacWindowClipper clipper( textctrl ) ;
             case kControlEditTextPart :
             {
                 wxMacWindowClipper clipper( textctrl ) ;

-

                 EventRecord rec ;
                 EventRecord rec ;

+

                 ConvertEventRefToEventRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) ;
                 TXNClick( m_txn, &rec );
                 ConvertEventRefToEventRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) ;
                 TXNClick( m_txn, &rec );

-

             }
             }

-            break;
+                break;
+
+            default :
+                break;

         }
     }
         }
     }

-    return partCodeResult;
+
+    return result;

 }
 
 void wxMacMLTEClassicControl::MacControlUserPaneIdleProc()
 {
 }
 
 void wxMacMLTEClassicControl::MacControlUserPaneIdleProc()
 {

-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
+    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );

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


@@ -2416,8 +2574,8 @@ void wxMacMLTEClassicControl::MacControlUserPaneIdleProc()
 
             if (PtInRect(mousep, &m_txnControlBounds))
             {
 
             if (PtInRect(mousep, &m_txnControlBounds))
             {

-                RgnHandle theRgn;
-                RectRgn((theRgn = NewRgn()), &m_txnControlBounds);
+                RgnHandle theRgn = NewRgn();
+                RectRgn(theRgn, &m_txnControlBounds);

                 TXNAdjustCursor(m_txn, theRgn);
                 DisposeRgn(theRgn);
             }
                 TXNAdjustCursor(m_txn, theRgn);
                 DisposeRgn(theRgn);
             }


@@ -2427,9 +2585,9 @@ void wxMacMLTEClassicControl::MacControlUserPaneIdleProc()
 
 wxInt16 wxMacMLTEClassicControl::MacControlUserPaneKeyDownProc (wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers)
 {
 
 wxInt16 wxMacMLTEClassicControl::MacControlUserPaneKeyDownProc (wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers)
 {

-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
+    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );

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

-        return 0;
+        return kControlNoPart;

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


@@ -2437,29 +2595,28 @@ wxInt16 wxMacMLTEClassicControl::MacControlUserPaneKeyDownProc (wxInt16 keyCode,
     memset( &ev , 0 , sizeof( ev ) ) ;
     ev.what = keyDown ;
     ev.modifiers = modifiers ;
     memset( &ev , 0 , sizeof( ev ) ) ;
     ev.what = keyDown ;
     ev.modifiers = modifiers ;

-    ev.message = (( keyCode << 8 ) & keyCodeMask ) + ( charCode & charCodeMask ) ;
-    TXNKeyDown( m_txn , &ev);
+    ev.message = ((keyCode << 8) & keyCodeMask) | (charCode & charCodeMask);
+    TXNKeyDown( m_txn , &ev );

 
     return kControlEntireControl;
 }
 
 
     return kControlEntireControl;
 }
 

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

 {
     MacActivatePaneText( activating );
 }
 
 wxInt16 wxMacMLTEClassicControl::MacControlUserPaneFocusProc(wxInt16 action)
 {
 {
     MacActivatePaneText( activating );
 }
 
 wxInt16 wxMacMLTEClassicControl::MacControlUserPaneFocusProc(wxInt16 action)
 {

-    ControlPartCode focusResult;
+    ControlPartCode focusResult = kControlFocusNoPart;

 
 

-    focusResult = kControlFocusNoPart;
-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
+    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );

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

-        return 0;
+        return focusResult;

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

-    ControlRef controlFocus = 0 ;
+    ControlRef controlFocus = NULL ;

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


@@ -2467,13 +2624,13 @@ wxInt16 wxMacMLTEClassicControl::MacControlUserPaneFocusProc(wxInt16 action)
     {
         case kControlFocusPrevPart:
         case kControlFocusNextPart:
     {
         case kControlFocusPrevPart:
         case kControlFocusNextPart:

-            MacFocusPaneText( ( !wasFocused));
-            focusResult = (!wasFocused) ? (ControlPartCode) kControlEditTextPart : (ControlPartCode) kControlFocusNoPart;
+            MacFocusPaneText( !wasFocused );
+            focusResult = (!wasFocused ? (ControlPartCode) kControlEditTextPart : (ControlPartCode) kControlFocusNoPart);

             break;
 
         case kControlFocusNoPart:
         default:
             break;
 
         case kControlFocusNoPart:
         default:

-            MacFocusPaneText( false);
+            MacFocusPaneText( false );

             focusResult = kControlFocusNoPart;
             break;
     }
             focusResult = kControlFocusNoPart;
             break;
     }


@@ -2486,25 +2643,29 @@ void wxMacMLTEClassicControl::MacControlUserPaneBackgroundProc( void *info )
 }
 
 wxMacMLTEClassicControl::wxMacMLTEClassicControl( wxTextCtrl *wxPeer,
 }
 
 wxMacMLTEClassicControl::wxMacMLTEClassicControl( wxTextCtrl *wxPeer,

-                         const wxString& str,
-                         const wxPoint& pos,
-                         const wxSize& size, long style ) : wxMacMLTEControl( wxPeer )
+    const wxString& str,
+    const wxPoint& pos,
+    const wxSize& size, long style )
+    : wxMacMLTEControl( wxPeer )

 {
     m_font = wxPeer->GetFont() ;
     m_windowStyle = style ;
     Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ;
 
 {
     m_font = wxPeer->GetFont() ;
     m_windowStyle = style ;
     Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ;
 

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

 
 

-    verify_noerr( ::CreateUserPaneControl( MAC_WXHWND(wxPeer->GetParent()->MacGetTopLevelWindowRef()), &bounds, featurSet, &m_controlRef ) );
+   OSStatus err = ::CreateUserPaneControl(
+        MAC_WXHWND(wxPeer->GetParent()->MacGetTopLevelWindowRef()),
+        &bounds, featureSet, &m_controlRef );
+    verify_noerr( err );

 
     DoCreate();
 
 
     DoCreate();
 

-    AdjustCreationAttributes( *wxWHITE , true) ;
+    AdjustCreationAttributes( *wxWHITE , true ) ;

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


@@ -2513,13 +2674,13 @@ wxMacMLTEClassicControl::wxMacMLTEClassicControl( wxTextCtrl *wxPeer,
         wxMacConvertNewlines10To13( &st ) ;
         wxMacWindowClipper clipper( m_peer ) ;
         SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ;
         wxMacConvertNewlines10To13( &st ) ;
         wxMacWindowClipper clipper( m_peer ) ;
         SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ;

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

     }
 }
 
 wxMacMLTEClassicControl::~wxMacMLTEClassicControl()
 {
     }
 }
 
 wxMacMLTEClassicControl::~wxMacMLTEClassicControl()
 {

-    TXNDeleteObject(m_txn);
+    TXNDeleteObject( m_txn );

     m_txn = NULL ;
 }
 
     m_txn = NULL ;
 }
 


@@ -2550,7 +2711,7 @@ static pascal void wxMacControlUserPaneDrawProc(ControlRef control, SInt16 part)
     wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
     wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
     if ( win )
     wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
     wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
     if ( win )

-        win->MacControlUserPaneDrawProc(part) ;
+        win->MacControlUserPaneDrawProc( part ) ;

 }
 
 static pascal ControlPartCode wxMacControlUserPaneHitTestProc(ControlRef control, Point where)
 }
 
 static pascal ControlPartCode wxMacControlUserPaneHitTestProc(ControlRef control, Point where)


@@ -2558,7 +2719,7 @@ static pascal ControlPartCode wxMacControlUserPaneHitTestProc(ControlRef control
     wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
     wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
     if ( win )
     wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
     wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
     if ( win )

-        return win->MacControlUserPaneHitTestProc(where.h , where.v) ;
+        return win->MacControlUserPaneHitTestProc( where.h , where.v ) ;

     else
         return kControlNoPart ;
 }
     else
         return kControlNoPart ;
 }


@@ -2568,7 +2729,7 @@ static pascal ControlPartCode wxMacControlUserPaneTrackingProc(ControlRef contro
     wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
     wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
     if ( win )
     wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
     wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
     if ( win )

-        return win->MacControlUserPaneTrackingProc( startPt.h , startPt.v , (void*) actionProc) ;
+        return win->MacControlUserPaneTrackingProc( startPt.h , startPt.v , (void*) actionProc ) ;

     else
         return kControlNoPart ;
 }
     else
         return kControlNoPart ;
 }


@@ -2586,7 +2747,7 @@ static pascal ControlPartCode wxMacControlUserPaneKeyDownProc(ControlRef control
     wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
     wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
     if ( win )
     wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
     wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
     if ( win )

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

     else
         return kControlNoPart ;
 }
     else
         return kControlNoPart ;
 }


@@ -2596,7 +2757,7 @@ static pascal void wxMacControlUserPaneActivateProc(ControlRef control, Boolean
     wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
     wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
     if ( win )
     wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
     wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
     if ( win )

-        win->MacControlUserPaneActivateProc(activating) ;
+        win->MacControlUserPaneActivateProc( activating ) ;

 }
 
 static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control, ControlFocusPart action)
 }
 
 static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control, ControlFocusPart action)


@@ -2604,12 +2765,12 @@ static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control,
     wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
     wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
     if ( win )
     wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
     wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
     if ( win )

-        return win->MacControlUserPaneFocusProc(action) ;
+        return win->MacControlUserPaneFocusProc( action ) ;

     else
         return kControlNoPart ;
 }
 
     else
         return kControlNoPart ;
 }
 

-/*
+#if 0

 static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, ControlBackgroundPtr info)
 {
     wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
 static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, ControlBackgroundPtr info)
 {
     wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;


@@ -2617,18 +2778,18 @@ static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, Contro
     if ( win )
         win->MacControlUserPaneBackgroundProc(info) ;
 }
     if ( win )
         win->MacControlUserPaneBackgroundProc(info) ;
 }

-*/

 #endif
 
 #endif
 

+#endif // __WXMAC_OSX__
+

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

-

     OSStatus err = noErr ;
 
     OSStatus err = noErr ;
 

-    /* set up our globals */
+    // set up our globals

 #ifdef __WXMAC_OSX__
     if (gTPDrawProc == NULL) gTPDrawProc = NewControlUserPaneDrawUPP(wxMacControlUserPaneDrawProc);
     if (gTPHitProc == NULL) gTPHitProc = NewControlUserPaneHitTestUPP(wxMacControlUserPaneHitTestProc);
 #ifdef __WXMAC_OSX__
     if (gTPDrawProc == NULL) gTPDrawProc = NewControlUserPaneDrawUPP(wxMacControlUserPaneDrawProc);
     if (gTPHitProc == NULL) gTPHitProc = NewControlUserPaneHitTestUPP(wxMacControlUserPaneHitTestProc);


@@ -2642,13 +2803,13 @@ OSStatus wxMacMLTEClassicControl::DoCreate()
     if (gTXNScrollActionProc == NULL ) gTXNScrollActionProc = NewControlActionUPP(TXNScrollActionProc) ;
 #endif
 
     if (gTXNScrollActionProc == NULL ) gTXNScrollActionProc = NewControlActionUPP(TXNScrollActionProc) ;
 #endif
 

-    /* set the initial settings for our private data */
+    // set the initial settings for our private data

 
 

-    m_txnWindow =GetControlOwner(m_controlRef);
+    m_txnWindow = GetControlOwner(m_controlRef);

     m_txnPort = (GrafPtr) GetWindowPort(m_txnWindow);
 
 #ifdef __WXMAC_OSX__
     m_txnPort = (GrafPtr) GetWindowPort(m_txnWindow);
 
 #ifdef __WXMAC_OSX__

-    /* set up the user pane procedures */
+    // set up the user pane procedures

     SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneDrawProcTag, sizeof(gTPDrawProc), &gTPDrawProc);
     SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneHitTestProcTag, sizeof(gTPHitProc), &gTPHitProc);
     SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneTrackingProcTag, sizeof(gTPTrackProc), &gTPTrackProc);
     SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneDrawProcTag, sizeof(gTPDrawProc), &gTPDrawProc);
     SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneHitTestProcTag, sizeof(gTPHitProc), &gTPHitProc);
     SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneTrackingProcTag, sizeof(gTPTrackProc), &gTPTrackProc);


@@ -2657,26 +2818,25 @@ OSStatus wxMacMLTEClassicControl::DoCreate()
     SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneActivateProcTag, sizeof(gTPActivateProc), &gTPActivateProc);
     SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneFocusProcTag, sizeof(gTPFocusProc), &gTPFocusProc);
 #endif
     SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneActivateProcTag, sizeof(gTPActivateProc), &gTPActivateProc);
     SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneFocusProcTag, sizeof(gTPFocusProc), &gTPFocusProc);
 #endif

-    /* calculate the rectangles used by the control */
-    UMAGetControlBoundsInWindowCoords(m_controlRef, &bounds);
+
+    // calculate the rectangles used by the control
+    UMAGetControlBoundsInWindowCoords( m_controlRef, &bounds );

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

-    CGrafPtr        origPort = NULL ;
-    GDHandle        origDev = NULL ;
-    GetGWorld( &origPort , &origDev ) ;
-    SetPort(m_txnPort);
+    CGrafPtr origPort ;
+    GDHandle origDev ;

 
 

-    /* create the new edit field */
+    GetGWorld( &origPort, &origDev ) ;
+    SetPort( m_txnPort );

 
 

-    TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( m_windowStyle ) ;
+    // create the new edit field
+    TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( m_windowStyle );

 
 #ifdef __WXMAC_OSX__
 
 #ifdef __WXMAC_OSX__

-
-    // the scrollbars are not correctly embedded but are inserted at the root
-    // this gives us problems as we have erratic redraws even over the structure
-    // area
+    // the scrollbars are not correctly embedded but are inserted at the root:
+    // this gives us problems as we have erratic redraws even over the structure area

 
     m_sbHorizontal = 0 ;
     m_sbVertical = 0 ;
 
     m_sbHorizontal = 0 ;
     m_sbVertical = 0 ;


@@ -2686,59 +2846,51 @@ OSStatus wxMacMLTEClassicControl::DoCreate()
     Rect sb = { 0 , 0 , 0 , 0 } ;
     if ( frameOptions & kTXNWantVScrollBarMask )
     {
     Rect sb = { 0 , 0 , 0 , 0 } ;
     if ( frameOptions & kTXNWantVScrollBarMask )
     {

-        CreateScrollBarControl( m_txnWindow , &sb , 0 , 0 , 100 , 1 , true , gTXNScrollActionProc , &m_sbVertical ) ;
-        SetControlReference( m_sbVertical , (SInt32) this ) ;
+        CreateScrollBarControl( m_txnWindow, &sb, 0, 0, 100, 1, true, gTXNScrollActionProc, &m_sbVertical );
+        SetControlReference( m_sbVertical, (SInt32)this );

         SetControlAction( m_sbVertical, gTXNScrollActionProc );
         SetControlAction( m_sbVertical, gTXNScrollActionProc );

-        ShowControl( m_sbVertical ) ;
-        EmbedControl( m_sbVertical , m_controlRef ) ;
-        frameOptions &= ~kTXNWantVScrollBarMask ;
+        ShowControl( m_sbVertical );
+        EmbedControl( m_sbVertical , m_controlRef );
+        frameOptions &= ~kTXNWantVScrollBarMask;

     }
     }

+

     if ( frameOptions & kTXNWantHScrollBarMask )
     {
     if ( frameOptions & kTXNWantHScrollBarMask )
     {

-        CreateScrollBarControl( m_txnWindow , &sb , 0 , 0 , 100 , 1 , true , gTXNScrollActionProc , &m_sbHorizontal ) ;
-        SetControlReference( m_sbHorizontal , (SInt32) this ) ;
+        CreateScrollBarControl( m_txnWindow, &sb, 0, 0, 100, 1, true, gTXNScrollActionProc, &m_sbHorizontal );
+        SetControlReference( m_sbHorizontal, (SInt32)this );

         SetControlAction( m_sbHorizontal, gTXNScrollActionProc );
         SetControlAction( m_sbHorizontal, gTXNScrollActionProc );

-        ShowControl( m_sbHorizontal ) ;
-        EmbedControl( m_sbHorizontal , m_controlRef ) ;
+        ShowControl( m_sbHorizontal );
+        EmbedControl( m_sbHorizontal, m_controlRef );

         frameOptions &= ~(kTXNWantHScrollBarMask | kTXNDrawGrowIconMask);
     }
 
 #endif
 
         frameOptions &= ~(kTXNWantHScrollBarMask | kTXNDrawGrowIconMask);
     }
 
 #endif
 

-    verify_noerr(TXNNewObject(NULL, m_txnWindow , &bounds,
-                              frameOptions ,
-                              kTXNTextEditStyleFrameType,
-                              kTXNTextensionFile,
-                              kTXNSystemDefaultEncoding,
-                              &m_txn, &m_txnFrameID, NULL ) );
-/*
-    TXNCarbonEventInfo cInfo ;
+    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 ;
 
     cInfo.useCarbonEvents = false ;
     cInfo.filler = 0 ;
     cInfo.flags = 0 ;
     cInfo.fDictionary = NULL ;
 

-    TXNControlTag iControlTags[] =
-        {
-            kTXNUseCarbonEvents ,
-        };
-    TXNControlData iControlData[] =
-        {
-            {(UInt32) &cInfo },
-        };
-
-    int toptag = WXSIZEOF( iControlTags ) ;
-
-    verify_noerr( TXNSetTXNObjectControls( m_txn, false , toptag,
-                                        iControlTags, iControlData )) ;
+    verify_noerr( TXNSetTXNObjectControls( m_txn, false, toptag, iControlTags, iControlData ) );
+#endif

 
 

-*/

 #ifdef __WXMAC_OSX__
 #ifdef __WXMAC_OSX__

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

 #endif
 
     SetGWorld( origPort , origDev ) ;
 #endif
 
     SetGWorld( origPort , origDev ) ;

+

     return err;
 }
 
     return err;
 }
 


@@ -2751,9 +2903,9 @@ OSStatus wxMacMLTEClassicControl::DoCreate()
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
 
 wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer,
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
 
 wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer,

-                         const wxString& str,
-                         const wxPoint& pos,
-                         const wxSize& size, long style ) : wxMacMLTEControl( wxPeer )
+    const wxString& str,
+    const wxPoint& pos,
+    const wxSize& size, long style ) : wxMacMLTEControl( wxPeer )

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


@@ -2761,14 +2913,18 @@ wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer,
     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 ) ;
+        HIScrollViewCreate(
+            (frameOptions & kTXNWantHScrollBarMask ? kHIScrollViewOptionsHorizScroll : 0)
+            | (frameOptions & kTXNWantVScrollBarMask ? kHIScrollViewOptionsVertScroll : 0) ,
+            &m_scrollView ) ;

 
         HIViewSetFrame( m_scrollView, &hr );
         HIViewSetVisible( m_scrollView, true );
 
         HIViewSetFrame( m_scrollView, &hr );
         HIViewSetVisible( m_scrollView, true );


@@ -2776,13 +2932,13 @@ wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer,
 
     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
     {


@@ -2795,15 +2951,13 @@ wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer,
     wxMacWindowClipper c( m_peer ) ;
     SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ;
 
     wxMacWindowClipper c( m_peer ) ;
     SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ;
 

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

 }
 
 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


@@ -2813,6 +2967,26 @@ bool wxMacMLTEHIViewControl::HasFocus() const
     return control == m_textView ;
 }
 
     return control == m_textView ;
 }
 

+void wxMacMLTEHIViewControl::SetBackground( const wxBrush &brush )
+{
+    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