added 3-state checkboxes (patch 813790)

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

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 7f26d486852f5de4d4cde1e0298359274caeec4f..97588b198bd278b53e401f175020ea5ce605bbfe 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        textctrl.cpp
 // Purpose:     wxTextCtrl
 /////////////////////////////////////////////////////////////////////////////
 // Name:        textctrl.cpp
 // Purpose:     wxTextCtrl

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

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

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

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


@@ -23,7 +23,14 @@
 #else
   #include <stat.h>
 #endif
 #else
   #include <stat.h>
 #endif

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

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


@@ -53,7 +60,7 @@
 
 #define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL
 
 
 #define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL
 

-extern wxApp *wxTheApp ;
+extern wxControl *wxFindControlFromMacControl(ControlHandle inControl ) ;

 
 // CS:TODO we still have a problem getting properly at the text events of a control because under Carbon
 // the MLTE engine registers itself for the key events thus the normal flow never occurs, the only measure for the
 
 // CS:TODO we still have a problem getting properly at the text events of a control because under Carbon
 // the MLTE engine registers itself for the key events thus the normal flow never occurs, the only measure for the


@@ -77,7 +84,7 @@ extern wxApp *wxTheApp ;
     These routines are useful for cases where you would like to use an
     existing user pane control in, say, a dialog window as a scrolling
     text edit field.*/
     These routines are useful for cases where you would like to use an
     existing user pane control in, say, a dialog window as a scrolling
     text edit field.*/

-    
+

 /* mUPOpenControl initializes a user pane control so it will be drawn
     and will behave as a scrolling text edit field inside of a window.
     This routine performs all of the initialization steps necessary,
 /* mUPOpenControl initializes a user pane control so it will be drawn
     and will behave as a scrolling text edit field inside of a window.
     This routine performs all of the initialization steps necessary,


@@ -122,8 +129,8 @@ typedef struct {
         /* flags */
     Boolean fInFocus; /* true while the focus rect is drawn around the control */
     Boolean fIsActive; /* true while the control is drawn in the active state */
         /* flags */
     Boolean fInFocus; /* true while the focus rect is drawn around the control */
     Boolean fIsActive; /* true while the control is drawn in the active state */

-    Boolean fTEActive; /* reflects the activation state of the text edit record */ 
-    Boolean fInDialogWindow; /* true if displayed in a dialog window */ 
+    Boolean fTEActive; /* reflects the activation state of the text edit record */
+    Boolean fInDialogWindow; /* true if displayed in a dialog window */

         /* calculated locations */
     Rect fRTextArea; /* area where the text is drawn */
     Rect fRFocusOutline;  /* rectangle used to draw the focus box */
         /* calculated locations */
     Rect fRTextArea; /* area where the text is drawn */
     Rect fRFocusOutline;  /* rectangle used to draw the focus box */


@@ -156,9 +163,9 @@ static void TPActivatePaneText(STPTextPaneVars **tpvars, Boolean setActive) {
     STPTextPaneVars *varsp;
     varsp = *tpvars;
     if (varsp->fTEActive != setActive) {
     STPTextPaneVars *varsp;
     varsp = *tpvars;
     if (varsp->fTEActive != setActive) {

-    
+

         varsp->fTEActive = setActive;
         varsp->fTEActive = setActive;

-        
+

         TXNActivate(varsp->fTXNRec, varsp->fTXNFrame, varsp->fTEActive);
 
         if (varsp->fInFocus)
         TXNActivate(varsp->fTXNRec, varsp->fTXNFrame, varsp->fTEActive);
 
         if (varsp->fInFocus)


@@ -187,43 +194,55 @@ static pascal void TPPaneDrawProc(ControlRef theControl, ControlPartCode thePart
     char state;
     Rect bounds;
         /* set up our globals */
     char state;
     Rect bounds;
         /* set up our globals */

-        
+

     tpvars = (STPTextPaneVars **) GetControlReference(theControl);
     if (tpvars != NULL) {
         state = HGetState((Handle) tpvars);
         HLock((Handle) tpvars);
         varsp = *tpvars;
     tpvars = (STPTextPaneVars **) GetControlReference(theControl);
     if (tpvars != NULL) {
         state = HGetState((Handle) tpvars);
         HLock((Handle) tpvars);
         varsp = *tpvars;

-            
+

             /* save the drawing state */
         SetPort((**tpvars).fDrawingEnvironment);
             /* save the drawing state */
         SetPort((**tpvars).fDrawingEnvironment);

-            /* verify our boundary */
+           /* verify our boundary */

         GetControlBounds(theControl, &bounds);
         GetControlBounds(theControl, &bounds);

+
+        wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ;

         if ( ! EqualRect(&bounds, &varsp->fRFocusOutline) ) {
             // scrollbar is on the border, we add one
             Rect oldbounds = varsp->fRFocusOutline ;
             InsetRect( &oldbounds , -1 , -1 ) ;
         if ( ! EqualRect(&bounds, &varsp->fRFocusOutline) ) {
             // scrollbar is on the border, we add one
             Rect oldbounds = varsp->fRFocusOutline ;
             InsetRect( &oldbounds , -1 , -1 ) ;

-            
-            InvalWindowRect( GetControlOwner( theControl ) , &oldbounds ) ;
+
+            if ( IsControlVisible( theControl ) )
+                InvalWindowRect( GetControlOwner( theControl ) , &oldbounds ) ;

             SetRect(&varsp->fRFocusOutline, bounds.left, bounds.top, bounds.right, bounds.bottom);
             SetRect(&varsp->fRTextOutline, bounds.left, bounds.top, bounds.right, bounds.bottom);
             SetRect(&varsp->fRFocusOutline, bounds.left, bounds.top, bounds.right, bounds.bottom);
             SetRect(&varsp->fRTextOutline, bounds.left, bounds.top, bounds.right, bounds.bottom);

-            SetRect(&varsp->fRTextArea, bounds.left + 2 , bounds.top + (varsp->fMultiline ? 0 : 2) , 
+            SetRect(&varsp->fRTextArea, bounds.left + 2 , bounds.top + (varsp->fMultiline ? 0 : 2) ,

                 bounds.right - (varsp->fMultiline ? 0 : 2), bounds.bottom - (varsp->fMultiline ? 0 : 2));
             RectRgn(varsp->fTextBackgroundRgn, &varsp->fRTextOutline);
                 bounds.right - (varsp->fMultiline ? 0 : 2), bounds.bottom - (varsp->fMultiline ? 0 : 2));
             RectRgn(varsp->fTextBackgroundRgn, &varsp->fRTextOutline);

-            TXNSetFrameBounds(  varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left, 
-                varsp->fRTextArea.bottom, varsp->fRTextArea.right, varsp->fTXNFrame);
+            if ( IsControlVisible( theControl ) )
+                TXNSetFrameBounds(  varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left,
+                    varsp->fRTextArea.bottom, varsp->fRTextArea.right, varsp->fTXNFrame);
+            else
+                TXNSetFrameBounds(  varsp->fTXNRec, varsp->fRTextArea.top + 30000 , varsp->fRTextArea.left + 30000 ,
+                    varsp->fRTextArea.bottom + 30000 , varsp->fRTextArea.right + 30000 , varsp->fTXNFrame);
+            

         }
 
         }
 

+        if ( IsControlVisible( theControl ) )
+        {

             /* update the text region */
             /* update the text region */

-        RGBColor white = { 65535 , 65535 , 65535 } ;
-        RGBBackColor( &white ) ;
-        EraseRgn(varsp->fTextBackgroundRgn);
-        TXNDraw(varsp->fTXNRec, NULL);
-            /* restore the drawing environment */
-            /* draw the text frame and focus frame (if necessary) */
-        DrawThemeEditTextFrame(&varsp->fRTextOutline, varsp->fIsActive ? kThemeStateActive: kThemeStateInactive);
-        if ((**tpvars).fIsActive && varsp->fInFocus) DrawThemeFocusRect(&varsp->fRFocusOutline, true);
-            /* release our globals */
-        HSetState((Handle) tpvars, state);
+            RGBColor white = { 65535 , 65535 , 65535 } ;
+            RGBBackColor( &white ) ;
+            EraseRgn(varsp->fTextBackgroundRgn);
+            TXNDraw(varsp->fTXNRec, NULL);
+                /* restore the drawing environment */
+                /* draw the text frame and focus frame (if necessary) */
+            DrawThemeEditTextFrame(&varsp->fRTextOutline, varsp->fIsActive ? kThemeStateActive: kThemeStateInactive);
+            if ((**tpvars).fIsActive && varsp->fInFocus) 
+                DrawThemeFocusRect(&varsp->fRFocusOutline, true);
+                /* release our globals */
+            HSetState((Handle) tpvars, state);
+        }

     }
 }
 
     }
 }
 


@@ -239,7 +258,7 @@ static pascal ControlPartCode TPPaneHitTestProc(ControlHandle theControl, Point
         /* set up our locals and lock down our globals*/
     result = 0;
     tpvars = (STPTextPaneVars **) GetControlReference(theControl);
         /* set up our locals and lock down our globals*/
     result = 0;
     tpvars = (STPTextPaneVars **) GetControlReference(theControl);

-    if (tpvars != NULL) {
+    if (tpvars != NULL && IsControlVisible( theControl) ) {

         state = HGetState((Handle) tpvars);
         HLock((Handle) tpvars);
             /* find the region where we clicked */
         state = HGetState((Handle) tpvars);
         HLock((Handle) tpvars);
             /* find the region where we clicked */


@@ -266,7 +285,7 @@ static pascal ControlPartCode TPPaneTrackingProc(ControlHandle theControl, Point
         /* make sure we have some variables... */
     partCodeResult = 0;
     tpvars = (STPTextPaneVars **) GetControlReference(theControl);
         /* make sure we have some variables... */
     partCodeResult = 0;
     tpvars = (STPTextPaneVars **) GetControlReference(theControl);

-    if (tpvars != NULL) {
+    if (tpvars != NULL && IsControlVisible( theControl ) ) {

             /* lock 'em down */
         state = HGetState((Handle) tpvars);
         HLock((Handle) tpvars);
             /* lock 'em down */
         state = HGetState((Handle) tpvars);
         HLock((Handle) tpvars);


@@ -280,16 +299,23 @@ static pascal ControlPartCode TPPaneTrackingProc(ControlHandle theControl, Point
         }
             /* find the location for the click */
         switch (TPPaneHitTestProc(theControl, startPt)) {
         }
             /* find the location for the click */
         switch (TPPaneHitTestProc(theControl, startPt)) {

-                
+

                 /* handle clicks in the text part */
             case kmUPTextPart:
                 {   SetPort((**tpvars).fDrawingEnvironment);
                 /* handle clicks in the text part */
             case kmUPTextPart:
                 {   SetPort((**tpvars).fDrawingEnvironment);

+                    wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ;
+#if !TARGET_CARBON

                     TXNClick( varsp->fTXNRec, (const EventRecord*) wxTheApp->MacGetCurrentEvent());
                     TXNClick( varsp->fTXNRec, (const EventRecord*) wxTheApp->MacGetCurrentEvent());

+#else
+                    EventRecord rec ;
+                    ConvertEventRefToEventRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) ;
+                    TXNClick( varsp->fTXNRec, &rec );
+#endif

                 }
                 break;
                 }
                 break;

-            
+

         }
         }

-        
+

         HSetState((Handle) tpvars, state);
     }
     return partCodeResult;
         HSetState((Handle) tpvars, state);
     }
     return partCodeResult;


@@ -302,7 +328,7 @@ static pascal void TPPaneIdleProc(ControlHandle theControl) {
     STPTextPaneVars **tpvars, *varsp;
         /* set up locals */
     tpvars = (STPTextPaneVars **) GetControlReference(theControl);
     STPTextPaneVars **tpvars, *varsp;
         /* set up locals */
     tpvars = (STPTextPaneVars **) GetControlReference(theControl);

-    if (tpvars != NULL) {
+    if (tpvars != NULL && IsControlVisible( theControl ) ) {

             /* if we're not active, then we have nothing to say about the cursor */
         if ((**tpvars).fIsActive) {
             char state;
             /* if we're not active, then we have nothing to say about the cursor */
         if ((**tpvars).fIsActive) {
             char state;


@@ -314,6 +340,7 @@ static pascal void TPPaneIdleProc(ControlHandle theControl) {
             varsp = *tpvars;
                 /* get the current mouse coordinates (in our window) */
             SetPortWindowPort(GetControlOwner(theControl));
             varsp = *tpvars;
                 /* get the current mouse coordinates (in our window) */
             SetPortWindowPort(GetControlOwner(theControl));

+            wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ;

             GetMouse(&mousep);
                 /* there's a 'focus thing' and an 'unfocused thing' */
             if (varsp->fInFocus) {
             GetMouse(&mousep);
                 /* there's a 'focus thing' and an 'unfocused thing' */
             if (varsp->fInFocus) {


@@ -326,14 +353,20 @@ static pascal void TPPaneIdleProc(ControlHandle theControl) {
                     RectRgn((theRgn = NewRgn()), &varsp->fRTextArea);
                     TXNAdjustCursor(varsp->fTXNRec, theRgn);
                     DisposeRgn(theRgn);
                     RectRgn((theRgn = NewRgn()), &varsp->fRTextArea);
                     TXNAdjustCursor(varsp->fTXNRec, theRgn);
                     DisposeRgn(theRgn);

-                 } else SetThemeCursor(kThemeArrowCursor);
+                 }
+                 else
+                 {
+                 // SetThemeCursor(kThemeArrowCursor);
+                 }

             } else {
                 /* if it's in our bounds, set the cursor */
                 GetControlBounds(theControl, &bounds);
                 if (PtInRect(mousep, &bounds))
             } else {
                 /* if it's in our bounds, set the cursor */
                 GetControlBounds(theControl, &bounds);
                 if (PtInRect(mousep, &bounds))

-                    SetThemeCursor(kThemeArrowCursor);
+                {
+                //    SetThemeCursor(kThemeArrowCursor);
+                }

             }
             }

-            
+

             HSetState((Handle) tpvars, state);
         }
     }
             HSetState((Handle) tpvars, state);
         }
     }


@@ -351,6 +384,7 @@ static pascal ControlPartCode TPPaneKeyDownProc(ControlHandle theControl,
         if ((**tpvars).fInFocus) {
                 /* turn autoscrolling on and send the key event to text edit */
             SetPort((**tpvars).fDrawingEnvironment);
         if ((**tpvars).fInFocus) {
                 /* turn autoscrolling on and send the key event to text edit */
             SetPort((**tpvars).fDrawingEnvironment);

+            wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ;

             EventRecord ev ;
             memset( &ev , 0 , sizeof( ev ) ) ;
             ev.what = keyDown ;
             EventRecord ev ;
             memset( &ev , 0 , sizeof( ev ) ) ;
             ev.what = keyDown ;


@@ -378,12 +412,17 @@ static pascal void TPPaneActivateProc(ControlHandle theControl, Boolean activati
         varsp = *tpvars;
             /* de/activate the text edit record */
         SetPort((**tpvars).fDrawingEnvironment);
         varsp = *tpvars;
             /* de/activate the text edit record */
         SetPort((**tpvars).fDrawingEnvironment);

-            GetControlBounds(theControl, &bounds);
-            varsp->fIsActive = activating;
-            TPActivatePaneText(tpvars, varsp->fIsActive && varsp->fInFocus);
+        wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ;
+        GetControlBounds(theControl, &bounds);
+        varsp->fIsActive = activating;
+        TPActivatePaneText(tpvars, varsp->fIsActive && varsp->fInFocus);

             /* redraw the frame */
             /* redraw the frame */

-        DrawThemeEditTextFrame(&varsp->fRTextOutline, varsp->fIsActive ? kThemeStateActive: kThemeStateInactive);
-        if (varsp->fInFocus) DrawThemeFocusRect(&varsp->fRFocusOutline, varsp->fIsActive);
+        if ( IsControlVisible( theControl ) )
+        {
+            DrawThemeEditTextFrame(&varsp->fRTextOutline, varsp->fIsActive ? kThemeStateActive: kThemeStateInactive);
+            if (varsp->fInFocus) 
+                DrawThemeFocusRect(&varsp->fRFocusOutline, varsp->fIsActive);
+        }

         HSetState((Handle) tpvars, state);
     }
 }
         HSetState((Handle) tpvars, state);
     }
 }


@@ -400,7 +439,7 @@ static pascal ControlPartCode TPPaneFocusProc(ControlHandle theControl, ControlF
         /* set up locals */
     focusResult = kControlFocusNoPart;
     tpvars = (STPTextPaneVars **) GetControlReference(theControl);
         /* set up locals */
     focusResult = kControlFocusNoPart;
     tpvars = (STPTextPaneVars **) GetControlReference(theControl);

-    if (tpvars != NULL) {
+    if (tpvars != NULL ) {

         state = HGetState((Handle) tpvars);
         HLock((Handle) tpvars);
         varsp = *tpvars;
         state = HGetState((Handle) tpvars);
         HLock((Handle) tpvars);
         varsp = *tpvars;


@@ -421,9 +460,7 @@ static pascal ControlPartCode TPPaneFocusProc(ControlHandle theControl, ControlF
                 kControlFocusNoPart, otherwise return a non-zero part code.
             kUserClickedToFocusPart - is a constant defined for this example.  You should
                 define your own value for handling click-to-focus type events. */
                 kControlFocusNoPart, otherwise return a non-zero part code.
             kUserClickedToFocusPart - is a constant defined for this example.  You should
                 define your own value for handling click-to-focus type events. */

-            /* save the drawing state */
-        SetPort((**tpvars).fDrawingEnvironment);
-            /* calculate the next highlight state */
+             /* calculate the next highlight state */

         switch (action) {
             default:
             case kControlFocusNoPart:
         switch (action) {
             default:
             case kControlFocusNoPart:


@@ -440,11 +477,17 @@ static pascal ControlPartCode TPPaneFocusProc(ControlHandle theControl, ControlF
                 focusResult = varsp->fInFocus ? 1 : kControlFocusNoPart;
                 break;
         }
                 focusResult = varsp->fInFocus ? 1 : kControlFocusNoPart;
                 break;
         }

-            TPActivatePaneText(tpvars, varsp->fIsActive && varsp->fInFocus);
-            /* redraw the text fram and focus rectangle to indicate the
-            new focus state */
-        DrawThemeEditTextFrame(&varsp->fRTextOutline, varsp->fIsActive ? kThemeStateActive: kThemeStateInactive);
-        DrawThemeFocusRect(&varsp->fRFocusOutline, varsp->fIsActive && varsp->fInFocus);
+        TPActivatePaneText(tpvars, varsp->fIsActive && varsp->fInFocus);
+        /* redraw the text fram and focus rectangle to indicate the
+        new focus state */
+        if ( IsControlVisible( theControl ) )
+        {
+           /* save the drawing state */
+               SetPort((**tpvars).fDrawingEnvironment);
+               wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ;
+            DrawThemeEditTextFrame(&varsp->fRTextOutline, varsp->fIsActive ? kThemeStateActive: kThemeStateInactive);
+            DrawThemeFocusRect(&varsp->fRFocusOutline, varsp->fIsActive && varsp->fInFocus);
+        }

             /* done */
         HSetState((Handle) tpvars, state);
     }
             /* done */
         HSetState((Handle) tpvars, state);
     }


@@ -459,7 +502,7 @@ static pascal ControlPartCode TPPaneFocusProc(ControlHandle theControl, ControlF
     should refer to a user pane control that you have either created
     yourself or extracted from a dialog's control heirarchy using
     the GetDialogItemAsControl routine.  */
     should refer to a user pane control that you have either created
     yourself or extracted from a dialog's control heirarchy using
     the GetDialogItemAsControl routine.  */

-OSStatus mUPOpenControl(ControlHandle theControl, long wxStyle ) 
+OSStatus mUPOpenControl(ControlHandle theControl, long wxStyle )

 {
     Rect bounds;
     WindowRef theWindow;
 {
     Rect bounds;
     WindowRef theWindow;


@@ -467,7 +510,7 @@ OSStatus mUPOpenControl(ControlHandle theControl, long wxStyle )
     OSStatus err = noErr ;
     RGBColor rgbWhite = {0xFFFF, 0xFFFF, 0xFFFF};
     TXNBackground tback;
     OSStatus err = noErr ;
     RGBColor rgbWhite = {0xFFFF, 0xFFFF, 0xFFFF};
     TXNBackground tback;

-    
+

         /* set up our globals */
     if (gTPDrawProc == NULL) gTPDrawProc = NewControlUserPaneDrawUPP(TPPaneDrawProc);
     if (gTPHitProc == NULL) gTPHitProc = NewControlUserPaneHitTestUPP(TPPaneHitTestProc);
         /* set up our globals */
     if (gTPDrawProc == NULL) gTPDrawProc = NewControlUserPaneDrawUPP(TPPaneDrawProc);
     if (gTPHitProc == NULL) gTPHitProc = NewControlUserPaneHitTestUPP(TPPaneHitTestProc);


@@ -476,7 +519,7 @@ OSStatus mUPOpenControl(ControlHandle theControl, long wxStyle )
     if (gTPKeyProc == NULL) gTPKeyProc = NewControlUserPaneKeyDownUPP(TPPaneKeyDownProc);
     if (gTPActivateProc == NULL) gTPActivateProc = NewControlUserPaneActivateUPP(TPPaneActivateProc);
     if (gTPFocusProc == NULL) gTPFocusProc = NewControlUserPaneFocusUPP(TPPaneFocusProc);
     if (gTPKeyProc == NULL) gTPKeyProc = NewControlUserPaneKeyDownUPP(TPPaneKeyDownProc);
     if (gTPActivateProc == NULL) gTPActivateProc = NewControlUserPaneActivateUPP(TPPaneActivateProc);
     if (gTPFocusProc == NULL) gTPFocusProc = NewControlUserPaneFocusUPP(TPPaneFocusProc);

-        
+

         /* allocate our private storage */
     tpvars = (STPTextPaneVars **) NewHandleClear(sizeof(STPTextPaneVars));
     SetControlReference(theControl, (long) tpvars);
         /* allocate our private storage */
     tpvars = (STPTextPaneVars **) NewHandleClear(sizeof(STPTextPaneVars));
     SetControlReference(theControl, (long) tpvars);


@@ -505,7 +548,7 @@ OSStatus mUPOpenControl(ControlHandle theControl, long wxStyle )
     GetControlBounds(theControl, &bounds);
     SetRect(&varsp->fRFocusOutline, bounds.left, bounds.top, bounds.right, bounds.bottom);
     SetRect(&varsp->fRTextOutline, bounds.left, bounds.top, bounds.right, bounds.bottom);
     GetControlBounds(theControl, &bounds);
     SetRect(&varsp->fRFocusOutline, bounds.left, bounds.top, bounds.right, bounds.bottom);
     SetRect(&varsp->fRTextOutline, bounds.left, bounds.top, bounds.right, bounds.bottom);

-    SetRect(&varsp->fRTextArea, bounds.left + 2 , bounds.top + (varsp->fMultiline ? 0 : 2) , 
+    SetRect(&varsp->fRTextArea, bounds.left + 2 , bounds.top + (varsp->fMultiline ? 0 : 2) ,

         bounds.right - (varsp->fMultiline ? 0 : 2), bounds.bottom - (varsp->fMultiline ? 0 : 2));
         /* calculate the background region for the text.  In this case, it's kindof
         and irregular region because we're setting the scroll bar a little ways inside
         bounds.right - (varsp->fMultiline ? 0 : 2), bounds.bottom - (varsp->fMultiline ? 0 : 2));
         /* calculate the background region for the text.  In this case, it's kindof
         and irregular region because we're setting the scroll bar a little ways inside


@@ -516,42 +559,54 @@ OSStatus mUPOpenControl(ControlHandle theControl, long wxStyle )
     SetPort(varsp->fDrawingEnvironment);
 
         /* create the new edit field */
     SetPort(varsp->fDrawingEnvironment);
 
         /* create the new edit field */

-        
-    TXNFrameOptions frameOptions = 
+
+    TXNFrameOptions frameOptions =

         kTXNDontDrawCaretWhenInactiveMask ;
     if ( ! ( wxStyle & wxTE_NOHIDESEL ) )
         kTXNDontDrawCaretWhenInactiveMask ;
     if ( ! ( wxStyle & wxTE_NOHIDESEL ) )

-           frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ;
-       
-       if ( wxStyle & wxTE_MULTILINE )
-       {
-           if ( ! ( wxStyle & wxTE_DONTWRAP ) )
-               frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
-           else
-           {
-               frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
-               frameOptions |= kTXNWantHScrollBarMask ;
-           }
-               
-           if ( !(wxStyle & wxTE_NO_VSCROLL ) )
-               frameOptions |= kTXNWantVScrollBarMask ;
-       }
-       else
-           frameOptions |= kTXNSingleLineOnlyMask ;
-           
-       if ( wxStyle & wxTE_READONLY )
-           frameOptions |= kTXNReadOnlyMask ;
-  
+        frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ;
+
+    if ( wxStyle & wxTE_MULTILINE )
+    {
+        if ( ! ( wxStyle & wxTE_DONTWRAP ) )
+            frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
+        else
+        {
+            frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
+            frameOptions |= kTXNWantHScrollBarMask ;
+        }
+
+        if ( !(wxStyle & wxTE_NO_VSCROLL ) )
+            frameOptions |= kTXNWantVScrollBarMask ;
+    }
+    else
+        frameOptions |= kTXNSingleLineOnlyMask ;
+
+    if ( wxStyle & wxTE_READONLY )
+        frameOptions |= kTXNReadOnlyMask ;
+

     TXNNewObject(NULL, varsp->fOwner, &varsp->fRTextArea,
     TXNNewObject(NULL, varsp->fOwner, &varsp->fRTextArea,

-           frameOptions ,
+        frameOptions ,

         kTXNTextEditStyleFrameType,
         kTXNTextensionFile,
         kTXNTextEditStyleFrameType,
         kTXNTextensionFile,

-        kTXNSystemDefaultEncoding, 
+        kTXNSystemDefaultEncoding,

         &varsp->fTXNRec, &varsp->fTXNFrame, (TXNObjectRefcon) tpvars);
 
         &varsp->fTXNRec, &varsp->fTXNFrame, (TXNObjectRefcon) tpvars);
 

+    if ( !IsControlVisible( theControl ) )
+        TXNSetFrameBounds(  varsp->fTXNRec, varsp->fRTextArea.top + 30000 , varsp->fRTextArea.left + 30000 ,
+            varsp->fRTextArea.bottom + 30000 , varsp->fRTextArea.right + 30000 , varsp->fTXNFrame);
+
+
+    if ( (wxStyle & wxTE_MULTILINE) && (wxStyle & wxTE_DONTWRAP) )
+    {
+        TXNControlTag tag = kTXNWordWrapStateTag ;
+        TXNControlData dat ;
+        dat.uValue = kTXNNoAutoWrap ;
+        TXNSetTXNObjectControls( varsp->fTXNRec , false , 1 , &tag , &dat ) ;
+    }

         Str255 fontName ;
         SInt16 fontSize ;
         Style fontStyle ;
         Str255 fontName ;
         SInt16 fontSize ;
         Style fontStyle ;

-        
+

         GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
 
         TXNTypeAttributes typeAttr[] =
         GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
 
         TXNTypeAttributes typeAttr[] =


@@ -565,10 +620,11 @@ OSStatus mUPOpenControl(ControlHandle theControl, long wxStyle )
           kTXNStartOffset,
           kTXNEndOffset);
         /* set the field's background */
           kTXNStartOffset,
           kTXNEndOffset);
         /* set the field's background */

+

     tback.bgType = kTXNBackgroundTypeRGB;
     tback.bg.color = rgbWhite;
     TXNSetBackground( varsp->fTXNRec, &tback);
     tback.bgType = kTXNBackgroundTypeRGB;
     tback.bg.color = rgbWhite;
     TXNSetBackground( varsp->fTXNRec, &tback);

-        
+

         /* unlock our storage */
     HUnlock((Handle) tpvars);
         /* perform final activations and setup for our text field.  Here,
         /* unlock our storage */
     HUnlock((Handle) tpvars);
         /* perform final activations and setup for our text field.  Here,


@@ -602,13 +658,16 @@ END_EVENT_TABLE()
 #endif
 
 // Text item
 #endif
 
 // Text item

-wxTextCtrl::wxTextCtrl()
+void wxTextCtrl::Init()

 {
   m_macTE = NULL ;
   m_macTXN = NULL ;
   m_macTXNvars = NULL ;
   m_macUsesTXN = false ;
 {
   m_macTE = NULL ;
   m_macTXN = NULL ;
   m_macTXNvars = NULL ;
   m_macUsesTXN = false ;

+

   m_editable = true ;
   m_editable = true ;

+  m_dirty = false;
+

   m_maxLength = TE_UNLIMITED_LENGTH ;
 }
 
   m_maxLength = TE_UNLIMITED_LENGTH ;
 }
 


@@ -628,24 +687,24 @@ const short kVerticalMargin = 2 ;
 const short kHorizontalMargin = 2 ;
 
 bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
 const short kHorizontalMargin = 2 ;
 
 bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,

-           const wxString& st,
+           const wxString& str,

            const wxPoint& pos,
            const wxSize& size, long style,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxPoint& pos,
            const wxSize& size, long style,
            const wxValidator& validator,
            const wxString& name)
 {

-  m_macTE = NULL ;
-  m_macTXN = NULL ;
-  m_macTXNvars = NULL ;
-  m_macUsesTXN = false ;
-  m_editable = true ;
+    m_macTE = NULL ;
+    m_macTXN = NULL ;
+    m_macTXNvars = NULL ;
+    m_macUsesTXN = false ;
+    m_editable = true ;

 
 

-  m_macUsesTXN = ! (style & wxTE_PASSWORD ) ; 
+    m_macUsesTXN = ! (style & wxTE_PASSWORD ) ;
+
+    m_macUsesTXN &= (TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress) ;

 
 

-  m_macUsesTXN &= (TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress) ;
-    

     // base initialization
     // base initialization

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

         return FALSE;
 
     wxSize mySize = size ;
         return FALSE;
 
     wxSize mySize = size ;


@@ -669,11 +728,11 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
         mySize.y = 13 ;
         if ( m_windowStyle & wxTE_MULTILINE )
             mySize.y *= 5 ;
         mySize.y = 13 ;
         if ( m_windowStyle & wxTE_MULTILINE )
             mySize.y *= 5 ;

-        
+

         mySize.y += 2 * m_macVerticalBorder ;
     }
     */
         mySize.y += 2 * m_macVerticalBorder ;
     }
     */

-    MacPreControlCreate( parent , id ,  "" , pos , mySize ,style, validator , name , &bounds , title ) ;
+    MacPreControlCreate( parent , id ,  wxEmptyString , pos , mySize ,style, validator , name , &bounds , title ) ;

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


@@ -688,12 +747,14 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
         m_editable = FALSE ;
     }
 
         m_editable = FALSE ;
     }
 

+    wxString st = str ;
+    st.Replace(wxT("\n"), wxT("\r"));

     if ( !m_macUsesTXN )
     {
     if ( !m_macUsesTXN )
     {

-        m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , "\p" , true , 0 , 0 , 1, 
+        m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , "\p" , false , 0 , 0 , 1,

             (style & wxTE_PASSWORD) ? kControlEditTextPasswordProc : kControlEditTextProc , (long) this ) ;
         long size ;
             (style & wxTE_PASSWORD) ? kControlEditTextPasswordProc : kControlEditTextProc , (long) this ) ;
         long size ;

-        ::GetControlData((ControlHandle)  m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &((TEHandle) m_macTE) , &size ) ;
+        ::GetControlData((ControlHandle)  m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*)((TEHandle *)&m_macTE) , &size ) ;

 
     }
     else
 
     }
     else


@@ -704,26 +765,16 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
                 | kControlWantsActivate | kControlHandlesTracking | kControlHasSpecialBackground
                 | kControlGetsFocusOnClick | kControlSupportsLiveFeedback;
             /* create the control */
                 | kControlWantsActivate | kControlHandlesTracking | kControlHasSpecialBackground
                 | kControlGetsFocusOnClick | kControlSupportsLiveFeedback;
             /* create the control */

-        m_macControl = NewControl(MAC_WXHWND(parent->MacGetRootWindow()), &bounds, "\p", true, featurSet, 0, featurSet, kControlUserPaneProc, 0);
+        m_macControl = NewControl(MAC_WXHWND(parent->MacGetRootWindow()), &bounds, "\p", false , featurSet, 0, featurSet, kControlUserPaneProc, 0);

             /* set up the mUP specific features and data */
             /* set up the mUP specific features and data */

-       mUPOpenControl((ControlHandle) m_macControl, m_windowStyle );
-        if ( parent )
-        {
-            parent->MacGetTopLevelWindow()->MacInstallEventHandler() ;
-        }
+        mUPOpenControl((ControlHandle) m_macControl, m_windowStyle );

     }
     MacPostControlCreate() ;
 
     }
     MacPostControlCreate() ;
 

-    wxString value ;
-    
-    if( wxApp::s_macDefaultEncodingIsPC )
-        value = wxMacMakeMacStringFromPC( st ) ;
-    else
-        value = st ;
-        

     if ( !m_macUsesTXN )
     {
     if ( !m_macUsesTXN )
     {

-        ::SetControlData( (ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , value.Length() , (char*) ((const char*)value) ) ;
+       wxCharBuffer text = st.mb_str(wxConvLocal) ;
+        ::SetControlData( (ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , strlen(text) , text ) ;

     }
     else
     {
     }
     else
     {


@@ -731,56 +782,91 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
             /* set up locals */
         tpvars = (STPTextPaneVars **) GetControlReference((ControlHandle) m_macControl);
             /* set the text in the record */
             /* set up locals */
         tpvars = (STPTextPaneVars **) GetControlReference((ControlHandle) m_macControl);
             /* set the text in the record */

-        TXNSetData( (**tpvars).fTXNRec, kTXNTextData,  (void*)value.c_str(), value.Length(),
-          kTXNStartOffset, kTXNEndOffset);

         m_macTXN =  (**tpvars).fTXNRec ;
         m_macTXN =  (**tpvars).fTXNRec ;

+#if wxUSE_UNICODE
+        TXNSetData( ((TXNObject) m_macTXN) , kTXNUnicodeTextData,  (void*)st.wc_str(), st.Length() * 2,
+          kTXNStartOffset, kTXNEndOffset);
+#else
+       wxCharBuffer text =  st.mb_str(wxConvLocal)  ;
+        TXNSetData( ((TXNObject) m_macTXN) , kTXNTextData,  (void*)text.data(), strlen( text ) ,
+          kTXNStartOffset, kTXNEndOffset);
+#endif

         m_macTXNvars = tpvars ;
         m_macUsesTXN = true ;
         m_macTXNvars = tpvars ;
         m_macUsesTXN = true ;

+        TXNSetSelection( (TXNObject) m_macTXN, 0, 0);
+        TXNShowSelection( (TXNObject) m_macTXN, kTXNShowStart);

     }
     }

-  
-  return TRUE;
+
+    return TRUE;

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

-    Size actualsize;
-    
+    Size actualSize = 0;
+    wxString result ;
+    OSStatus err ;

     if ( !m_macUsesTXN )
     {
     if ( !m_macUsesTXN )
     {

-        ::GetControlData( (ControlHandle) m_macControl, 0,
-            ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag, 
-            32767 , wxBuffer , &actualsize ) ;
+        err = ::GetControlDataSize((ControlHandle) m_macControl, 0,
+            ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag, &actualSize ) ;
+
+       if ( err )
+           return wxEmptyString ;
+
+       if ( actualSize > 0 )
+       {
+                       wxCharBuffer buf(actualSize) ;
+            ::GetControlData( (ControlHandle) m_macControl, 0,
+                ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag,
+                actualSize , buf.data() , &actualSize ) ;
+            result = wxString( buf , wxConvLocal) ;
+        }

     }
     else
     {
     }
     else
     {

+#if wxUSE_UNICODE

         Handle theText ;
         Handle theText ;

-        OSStatus err = TXNGetDataEncoded( ((TXNObject) m_macTXN), kTXNStartOffset, kTXNEndOffset, &theText , kTXNTextData );
+        err = TXNGetDataEncoded( ((TXNObject) m_macTXN), kTXNStartOffset, kTXNEndOffset, &theText , kTXNUnicodeTextData );

         // all done
         if ( err )
         {
         // all done
         if ( err )
         {

-            actualsize = 0 ;
+            actualSize = 0 ;

         }
         else
         {
         }
         else
         {

-            actualsize = GetHandleSize( theText ) ;
-            if (actualsize != 0)
-              strncpy( wxBuffer , *theText , actualsize ) ;
+            actualSize = GetHandleSize( theText ) ;
+            if ( actualSize > 0 )
+            {
+                wxChar *ptr = result.GetWriteBuf(actualSize*sizeof(wxChar)) ;
+                wxStrncpy( ptr , (wxChar*) *theText , actualSize ) ;
+                ptr[actualSize] = 0 ;
+                result.UngetWriteBuf( actualSize ) ;
+            }
+            DisposeHandle( theText ) ;
+        }
+#else
+        Handle theText ;
+        err = TXNGetDataEncoded( ((TXNObject) m_macTXN), kTXNStartOffset, kTXNEndOffset, &theText , kTXNTextData );
+        // all done
+        if ( err )
+        {
+            actualSize = 0 ;
+        }
+        else
+        {
+            actualSize = GetHandleSize( theText ) ;
+            if ( actualSize > 0 )
+            {
+                HLock( theText ) ;
+                result = wxString( *theText , wxConvLocal , actualSize ) ;
+                HUnlock( theText ) ;
+            }

             DisposeHandle( theText ) ;
         }
             DisposeHandle( theText ) ;
         }

+#endif

     }
     }

-    
-    wxBuffer[actualsize] = 0 ;
-    
-    wxString value;
-
-    if( wxApp::s_macDefaultEncodingIsPC )
-        value = wxMacMakePCStringFromMac( wxBuffer ) ;
-    else
-        value = wxBuffer;
-        
-    value.Replace( "\r", "\n" );
-    
-    return value;
+    result.Replace(wxT("\r"),wxT("\n")) ;
+    return result ;

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


@@ -796,30 +882,37 @@ void wxTextCtrl::GetSelection(long* from, long* to) const
    }
 }
 
    }
 }
 

-void wxTextCtrl::SetValue(const wxString& st)
+void wxTextCtrl::SetValue(const wxString& str)

 {
 {

-    wxString value;
-    
-    if( wxApp::s_macDefaultEncodingIsPC )
-        value = wxMacMakeMacStringFromPC( st ) ;
-    else
-        value = st;
-        
-    value.Replace( "\n", "\r" );
-        
+    wxString st = str ;
+    st.Replace(wxT("\n"), wxT("\r"));

     if ( !m_macUsesTXN )
     {
     if ( !m_macUsesTXN )
     {

-        ::SetControlData((ControlHandle)  m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , value.Length() , (char*) ((const char*)value) ) ;
+       wxCharBuffer text =  st.mb_str(wxConvLocal) ;
+        ::SetControlData( (ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , strlen(text) , text ) ;

     }
     else
     {
     }
     else
     {

-        TXNSetData( ((TXNObject) m_macTXN), kTXNTextData,  (void*)value.c_str(), value.Length(),
-                    kTXNStartOffset, kTXNEndOffset);
+        bool formerEditable = m_editable ;
+        if ( !formerEditable )
+            SetEditable(true) ;
+#if wxUSE_UNICODE
+        TXNSetData( ((TXNObject) m_macTXN), kTXNUnicodeTextData,  (void*)st.wc_str(), st.Length() * 2 ,
+          kTXNStartOffset, kTXNEndOffset);
+#else
+       wxCharBuffer text =  st.mb_str(wxConvLocal) ;
+        TXNSetData( ((TXNObject) m_macTXN), kTXNTextData,  (void*)text.data(), strlen( text ) ,
+          kTXNStartOffset, kTXNEndOffset);
+#endif
+        TXNSetSelection( (TXNObject) m_macTXN, 0, 0);
+        TXNShowSelection( (TXNObject) m_macTXN, kTXNShowStart);
+        if ( !formerEditable )
+            SetEditable(formerEditable) ;

     }
     MacRedrawControl() ;
 }
 
     }
     MacRedrawControl() ;
 }
 

-void wxTextCtrl::SetMaxLength(unsigned long len) 
+void wxTextCtrl::SetMaxLength(unsigned long len)

 {
     m_maxLength = len ;
 }
 {
     m_maxLength = len ;
 }


@@ -828,50 +921,58 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
 {
     if ( m_macUsesTXN )
     {
 {
     if ( m_macUsesTXN )
     {

-               TXNTypeAttributes typeAttr[4] ;
-               Str255 fontName = "\pMonaco" ;
-               SInt16 fontSize = 12 ;
-               Style fontStyle = normal ;
-               RGBColor color ;
-               int attrCounter = 0 ;
-               if ( style.HasFont() )
-               {
-                   const wxFont &font = style.GetFont() ;
-                   CopyCStringToPascal( font.GetFaceName().c_str() , fontName ) ;
-                   fontSize = font.GetPointSize() ;
-                   if ( font.GetUnderlined() )
-                       fontStyle |= underline ;
-                   if ( font.GetWeight() == wxBOLD )
-                       fontStyle |= bold ;
-                   if ( font.GetStyle() == wxITALIC )
-                       fontStyle |= italic ;
-                       
-                   typeAttr[attrCounter].tag = kTXNQDFontNameAttribute ;
-                   typeAttr[attrCounter].size = kTXNQDFontNameAttributeSize ;
-                   typeAttr[attrCounter].data.dataPtr = (void*) fontName ;
-                   typeAttr[attrCounter+1].tag = kTXNQDFontSizeAttribute ;
-                   typeAttr[attrCounter+1].size = kTXNFontSizeAttributeSize ;
-                   typeAttr[attrCounter+1].data.dataValue =  (fontSize << 16) ;
-                   typeAttr[attrCounter+2].tag = kTXNQDFontStyleAttribute ;
-                   typeAttr[attrCounter+2].size = kTXNQDFontStyleAttributeSize ;
-                   typeAttr[attrCounter+2].data.dataValue = fontStyle ;
-                   attrCounter += 3 ;
-                   
-               }
-               if ( style.HasTextColour() )
-               {
-                   typeAttr[attrCounter].tag = kTXNQDFontColorAttribute ;
-                   typeAttr[attrCounter].size = kTXNQDFontColorAttributeSize ;
-                   typeAttr[attrCounter].data.dataPtr = (void*) &color ;
-                   color = MAC_WXCOLORREF(style.GetTextColour().GetPixel()) ;
-                   attrCounter += 1 ;
-               }
-           
+        bool formerEditable = m_editable ;
+        if ( !formerEditable )
+            SetEditable(true) ;
+        TXNTypeAttributes typeAttr[4] ;
+        Str255 fontName = "\pMonaco" ;
+        SInt16 fontSize = 12 ;
+        Style fontStyle = normal ;
+        RGBColor color ;
+        int attrCounter = 0 ;
+        if ( style.HasFont() )
+        {
+            const wxFont &font = style.GetFont() ;
+            wxMacStringToPascal( font.GetFaceName() , fontName ) ;
+            fontSize = font.GetPointSize() ;
+            if ( font.GetUnderlined() )
+                fontStyle |= underline ;
+            if ( font.GetWeight() == wxBOLD )
+                fontStyle |= bold ;
+            if ( font.GetStyle() == wxITALIC )
+                fontStyle |= italic ;
+
+            typeAttr[attrCounter].tag = kTXNQDFontNameAttribute ;
+            typeAttr[attrCounter].size = kTXNQDFontNameAttributeSize ;
+            typeAttr[attrCounter].data.dataPtr = (void*) fontName ;
+            typeAttr[attrCounter+1].tag = kTXNQDFontSizeAttribute ;
+            typeAttr[attrCounter+1].size = kTXNFontSizeAttributeSize ;
+            typeAttr[attrCounter+1].data.dataValue =  (fontSize << 16) ;
+            typeAttr[attrCounter+2].tag = kTXNQDFontStyleAttribute ;
+            typeAttr[attrCounter+2].size = kTXNQDFontStyleAttributeSize ;
+            typeAttr[attrCounter+2].data.dataValue = fontStyle ;
+            attrCounter += 3 ;
+
+        }
+        if ( style.HasTextColour() )
+        {
+            typeAttr[attrCounter].tag = kTXNQDFontColorAttribute ;
+            typeAttr[attrCounter].size = kTXNQDFontColorAttributeSize ;
+            typeAttr[attrCounter].data.dataPtr = (void*) &color ;
+            color = MAC_WXCOLORREF(style.GetTextColour().GetPixel()) ;
+            attrCounter += 1 ;
+        }
+

         if ( attrCounter > 0 )
         {
         if ( attrCounter > 0 )
         {

-            OSStatus status = TXNSetTypeAttributes ((TXNObject)m_macTXN, attrCounter , typeAttr,
-                start,end);
+#ifdef __WXDEBUG__
+            OSStatus status =
+#endif // __WXDEBUG__
+                TXNSetTypeAttributes ((TXNObject)m_macTXN, attrCounter , typeAttr, start,end);
+            wxASSERT_MSG( status == noErr , wxT("Couldn't set text attributes") ) ;

         }
         }

+        if ( !formerEditable )
+            SetEditable(formerEditable) ;

     }
     return TRUE ;
 }
     }
     return TRUE ;
 }


@@ -898,7 +999,7 @@ void wxTextCtrl::Copy()
         else
         {
             ClearCurrentScrap();
         else
         {
             ClearCurrentScrap();

-            TXNCopy((TXNObject)m_macTXN); 
+            TXNCopy((TXNObject)m_macTXN);

             TXNConvertToPublicScrap();
         }
     }
             TXNConvertToPublicScrap();
         }
     }


@@ -918,7 +1019,7 @@ void wxTextCtrl::Cut()
         else
         {
             ClearCurrentScrap();
         else
         {
             ClearCurrentScrap();

-            TXNCut((TXNObject)m_macTXN); 
+            TXNCut((TXNObject)m_macTXN);

             TXNConvertToPublicScrap();
         }
         wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
             TXNConvertToPublicScrap();
         }
         wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);


@@ -941,7 +1042,8 @@ void wxTextCtrl::Paste()
         else
         {
             TXNConvertFromPublicScrap();
         else
         {
             TXNConvertFromPublicScrap();

-            TXNPaste((TXNObject)m_macTXN); 
+            TXNPaste((TXNObject)m_macTXN);
+            SetStyle( kTXNUseCurrentSelection , kTXNUseCurrentSelection , GetDefaultStyle() ) ;

         }
         wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
         event.SetString( GetValue() ) ;
         }
         wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
         event.SetString( GetValue() ) ;


@@ -975,17 +1077,16 @@ bool wxTextCtrl::CanPaste() const
     if (!IsEditable())
         return FALSE;
 
     if (!IsEditable())
         return FALSE;
 

-    long offset ;

 #if TARGET_CARBON
     OSStatus err = noErr;
     ScrapRef scrapRef;
 #if TARGET_CARBON
     OSStatus err = noErr;
     ScrapRef scrapRef;

-    
+

     err = GetCurrentScrap( &scrapRef );
     err = GetCurrentScrap( &scrapRef );

-    if ( err != noTypeErr && err != memFullErr )    
+    if ( err != noTypeErr && err != memFullErr )

     {
         ScrapFlavorFlags    flavorFlags;
         Size                byteCount;
     {
         ScrapFlavorFlags    flavorFlags;
         Size                byteCount;

-        
+

         if (( err = GetScrapFlavorFlags( scrapRef, 'TEXT', &flavorFlags )) == noErr)
         {
             if (( err = GetScrapFlavorSize( scrapRef, 'TEXT', &byteCount )) == noErr)
         if (( err = GetScrapFlavorFlags( scrapRef, 'TEXT', &flavorFlags )) == noErr)
         {
             if (( err = GetScrapFlavorSize( scrapRef, 'TEXT', &byteCount )) == noErr)


@@ -995,8 +1096,9 @@ bool wxTextCtrl::CanPaste() const
         }
     }
     return FALSE;
         }
     }
     return FALSE;

-    
+

 #else
 #else

+    long offset ;

     if ( GetScrap( NULL , 'TEXT' , &offset ) > 0 )
     {
         return TRUE ;
     if ( GetScrap( NULL , 'TEXT' , &offset ) > 0 )
     {
         return TRUE ;


@@ -1010,10 +1112,19 @@ void wxTextCtrl::SetEditable(bool editable)
     if ( editable != m_editable )
     {
         m_editable = editable ;
     if ( editable != m_editable )
     {
         m_editable = editable ;

-    if ( editable )
-            UMAActivateControl( (ControlHandle) m_macControl ) ;
+        if ( !m_macUsesTXN )
+        {
+            if ( editable )
+                UMAActivateControl( (ControlHandle) m_macControl ) ;
+            else
+                UMADeactivateControl((ControlHandle)  m_macControl ) ;
+        }

         else
         else

-            UMADeactivateControl((ControlHandle)  m_macControl ) ;
+        {
+            TXNControlTag tag[] = { kTXNIOPrivilegesTag } ;
+            TXNControlData data[] = { { editable ? kTXNReadWrite : kTXNReadOnly } } ;
+            TXNSetTXNObjectControls( (TXNObject) m_macTXN , false , sizeof(tag) / sizeof (TXNControlTag) , tag , data ) ;
+        }

     }
 }
 
     }
 }
 


@@ -1030,42 +1141,44 @@ void wxTextCtrl::SetInsertionPointEnd()
 
 long wxTextCtrl::GetInsertionPoint() const
 {
 
 long wxTextCtrl::GetInsertionPoint() const
 {

-  long begin,end ;
-  GetSelection( &begin , &end ) ;
-  return begin ;
+    long begin,end ;
+    GetSelection( &begin , &end ) ;
+    return begin ;

 }
 
 long wxTextCtrl::GetLastPosition() const
 {
     if ( !m_macUsesTXN )
 }
 
 long wxTextCtrl::GetLastPosition() const
 {
     if ( !m_macUsesTXN )

-  {
-    return (**((TEHandle) m_macTE)).teLength ;
-  }
-  else
-  {
-    Handle theText ;
-    long actualsize ;
-    OSErr err = TXNGetDataEncoded( (TXNObject) m_macTXN, kTXNStartOffset, kTXNEndOffset, &theText , kTXNTextData );
-        /* all done */
-    if ( err )

     {
     {

-      actualsize = 0 ;
+        return (**((TEHandle) m_macTE)).teLength ;

     }
     else
     {
     }
     else
     {

-      actualsize = GetHandleSize( theText ) ;
-      DisposeHandle( theText ) ;
+        Handle theText ;
+        long actualsize ;
+        OSErr err = TXNGetDataEncoded( (TXNObject) m_macTXN, kTXNStartOffset, kTXNEndOffset, &theText , kTXNTextData );
+        /* all done */
+        if ( err )
+        {
+            actualsize = 0 ;
+        }
+        else
+        {
+            actualsize = GetHandleSize( theText ) ;
+            DisposeHandle( theText ) ;
+        }
+        return actualsize ;

     }
     }

-    return actualsize ;
-  }

 }
 
 }
 

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

 {
 {

-  if ( !m_macUsesTXN )
-  {
+    wxString value = str ;
+    value.Replace(wxT("\n"), wxT("\r"));
+    if ( !m_macUsesTXN )
+    {

         ControlEditTextSelectionRec selection ;
         ControlEditTextSelectionRec selection ;

-   
+

         selection.selStart = from ;
         selection.selEnd = to ;
         ::SetControlData((ControlHandle)  m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ;
         selection.selStart = from ;
         selection.selEnd = to ;
         ::SetControlData((ControlHandle)  m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ;


@@ -1075,56 +1188,82 @@ void wxTextCtrl::Replace(long from, long to, const wxString& value)
     }
     else
     {
     }
     else
     {

-      TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
-      TXNClear( ((TXNObject) m_macTXN) ) ;
-      TXNSetData( ((TXNObject) m_macTXN), kTXNTextData,  (void*)value.c_str(), value.Length(),
-        kTXNUseCurrentSelection, kTXNUseCurrentSelection);
+        bool formerEditable = m_editable ;
+        if ( !formerEditable )
+            SetEditable(true) ;
+        TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
+        TXNClear( ((TXNObject) m_macTXN) ) ;
+#if wxUSE_UNICODE
+        TXNSetData( ((TXNObject) m_macTXN), kTXNUnicodeTextData,  (void*)value.wc_str(), value.Length() * 2 ,
+          kTXNUseCurrentSelection, kTXNUseCurrentSelection);
+#else
+        TXNSetData( ((TXNObject) m_macTXN), kTXNTextData,  (void*)value.c_str(), value.Length(),
+            kTXNUseCurrentSelection, kTXNUseCurrentSelection);
+#endif
+        if ( !formerEditable )
+            SetEditable( formerEditable ) ;

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

-  if ( !m_macUsesTXN )
-  {
-    ControlEditTextSelectionRec selection ;
-   
-    selection.selStart = from ;
-    selection.selEnd = to ;
-    ::SetControlData( (ControlHandle) m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ;
-    TEDelete( ((TEHandle) m_macTE) ) ;
-  }
-  else
-  {
-    TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ; 
-    TXNClear( ((TXNObject) m_macTXN) ) ; 
-  }
+    if ( !m_macUsesTXN )
+    {
+        ControlEditTextSelectionRec selection ;
+
+        selection.selStart = from ;
+        selection.selEnd = to ;
+        ::SetControlData( (ControlHandle) m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ;
+        TEDelete( ((TEHandle) m_macTE) ) ;
+    }
+    else
+    {
+        bool formerEditable = m_editable ;
+        if ( !formerEditable )
+            SetEditable(true) ;
+        TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
+        TXNClear( ((TXNObject) m_macTXN) ) ;
+        if ( !formerEditable )
+            SetEditable( formerEditable ) ;
+    }

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

+    if ( !m_macUsesTXN )
+    {
+        ControlEditTextSelectionRec selection ;
+        if ((from == -1) && (to == -1))
+        {
+               selection.selStart = 0 ;
+               selection.selEnd = 32767 ;
+        } 
+        else
+        {
+               selection.selStart = from ;
+               selection.selEnd = to ;
+       }

 
 

-  if ( !m_macUsesTXN )
-  {
-   ControlEditTextSelectionRec selection ;
-   selection.selStart = from ;
-   selection.selEnd = to ;
-   
-   TESetSelect( selection.selStart , selection.selEnd , ((TEHandle) m_macTE) ) ;
-   ::SetControlData((ControlHandle)  m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ;
-  }
-  else
-  {
-    STPTextPaneVars **tpvars;
+        TESetSelect( selection.selStart , selection.selEnd , ((TEHandle) m_macTE) ) ;
+        ::SetControlData((ControlHandle)  m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ;
+    }
+    else
+    {
+        STPTextPaneVars **tpvars;

         /* set up our locals */
         /* set up our locals */

-    tpvars = (STPTextPaneVars **) GetControlReference((ControlHandle) m_macControl);
+        tpvars = (STPTextPaneVars **) GetControlReference((ControlHandle) m_macControl);

         /* and our drawing environment as the operation
         may force a redraw in the text area. */
         /* and our drawing environment as the operation
         may force a redraw in the text area. */

-    SetPort((**tpvars).fDrawingEnvironment);
+        SetPort((**tpvars).fDrawingEnvironment);

         /* change the selection */
         /* change the selection */

-    TXNSetSelection( (**tpvars).fTXNRec, from, to);
-  }
+        if ((from == -1) && (to == -1))
+               TXNSelectAll((TXNObject) m_macTXN);
+        else
+               TXNSetSelection( (**tpvars).fTXNRec, from, to);
+        TXNShowSelection( (TXNObject) m_macTXN, kTXNShowStart);
+    }

 }
 
 bool wxTextCtrl::LoadFile(const wxString& file)
 }
 
 bool wxTextCtrl::LoadFile(const wxString& file)


@@ -1137,25 +1276,34 @@ bool wxTextCtrl::LoadFile(const wxString& file)
     return FALSE;
 }
 
     return FALSE;
 }
 

-void wxTextCtrl::WriteText(const wxString& text)
+void wxTextCtrl::WriteText(const wxString& str)

 {
 {

-    wxString value ;
-    if( wxApp::s_macDefaultEncodingIsPC )
-        value = wxMacMakeMacStringFromPC( text ) ;
-    else
-        value = text ;
+    wxString st = str ;
+    st.Replace(wxT("\n"), wxT("\r"));

     if ( !m_macUsesTXN )
     {
     if ( !m_macUsesTXN )
     {

-        TEInsert( value , value.Length() , ((TEHandle) m_macTE) ) ;
+       wxCharBuffer text =  st.mb_str(wxConvLocal) ;
+        TEInsert( text , strlen(text) , ((TEHandle) m_macTE) ) ;

     }
     else
     {
     }
     else
     {

-           long start , end , dummy ;
-           GetSelection( &start , &dummy ) ;
-        TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*) (const char*)value, value.Length(),
+        bool formerEditable = m_editable ;
+        if ( !formerEditable )
+            SetEditable(true) ;
+        long start , end , dummy ;
+        GetSelection( &start , &dummy ) ;
+#if wxUSE_UNICODE
+        TXNSetData( ((TXNObject) m_macTXN), kTXNUnicodeTextData,  (void*)st.wc_str(), st.Length() * 2 ,
+          kTXNUseCurrentSelection, kTXNUseCurrentSelection);
+#else
+       wxCharBuffer text =  st.mb_str(wxConvLocal) ;
+        TXNSetData( ((TXNObject) m_macTXN), kTXNTextData,  (void*)text.data(), strlen( text ) ,

           kTXNUseCurrentSelection, kTXNUseCurrentSelection);
           kTXNUseCurrentSelection, kTXNUseCurrentSelection);

-       GetSelection( &dummy , &end ) ;
+#endif
+        GetSelection( &dummy , &end ) ;

         SetStyle( start , end , GetDefaultStyle() ) ;
         SetStyle( start , end , GetDefaultStyle() ) ;

+        if ( !formerEditable )
+            SetEditable( formerEditable ) ;

     }
     MacRedrawControl() ;
 }
     }
     MacRedrawControl() ;
 }


@@ -1172,21 +1320,21 @@ void wxTextCtrl::Clear()
     {
         return ;
     }
     {
         return ;
     }

-  if ( !m_macUsesTXN )
-  {
-    ::SetControlData((ControlHandle)  m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 0 , (char*) ((const char*)NULL) ) ;
-  }
-  else
-  {
-            ClearCurrentScrap();
-            TXNClear((TXNObject)m_macTXN); 
-  }
+    if ( !m_macUsesTXN )
+    {
+        ::SetControlData((ControlHandle)  m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 0 , (char*) ((const char*)NULL) ) ;
+    }
+    else
+    {
+        TXNSetSelection( (TXNObject)m_macTXN , kTXNStartOffset , kTXNEndOffset ) ;
+        TXNClear((TXNObject)m_macTXN);
+    }

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

-    return TRUE;
+    return m_dirty;

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


@@ -1203,7 +1351,7 @@ bool wxTextCtrl::AcceptsFocus() const
 wxSize wxTextCtrl::DoGetBestSize() const
 {
     int wText = 100 ;
 wxSize wxTextCtrl::DoGetBestSize() const
 {
     int wText = 100 ;

-    
+

     int hText;
     if ( m_macUsesTXN )
     {
     int hText;
     if ( m_macUsesTXN )
     {


@@ -1241,6 +1389,10 @@ void wxTextCtrl::Undo()
 {
     if (CanUndo())
     {
 {
     if (CanUndo())
     {

+        if ( m_macUsesTXN ) 
+        {
+            TXNUndo((TXNObject)m_macTXN); 
+        }

     }
 }
 
     }
 }
 


@@ -1248,36 +1400,61 @@ void wxTextCtrl::Redo()
 {
     if (CanRedo())
     {
 {
     if (CanRedo())
     {

+        if ( m_macUsesTXN ) 
+        {
+            TXNRedo((TXNObject)m_macTXN); 
+        }

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

+    if ( !IsEditable() ) 
+    {
+        return false ; 
+    }
+    if ( m_macUsesTXN ) 
+    {
+        return TXNCanUndo((TXNObject)m_macTXN,NULL); 
+    }

     return FALSE ;
 }
 
 bool wxTextCtrl::CanRedo() const
 {
     return FALSE ;
 }
 
 bool wxTextCtrl::CanRedo() const
 {

+    if ( !IsEditable() ) 
+    {
+        return false ; 
+    }
+    if ( m_macUsesTXN ) 
+    {
+        return TXNCanRedo((TXNObject)m_macTXN,NULL); 
+    }

     return FALSE ;
 }
 
     return FALSE ;
 }
 

-// Makes 'unmodified'
+// Makes modifie or unmodified
+void wxTextCtrl::MarkDirty()
+{
+    m_dirty = true;
+}
+

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

-    // TODO
+    m_dirty = false;

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

-  // TODO change this if possible to reflect real lines
-  wxString content = GetValue() ;
-    
+    // TODO change this if possible to reflect real lines
+    wxString content = GetValue() ;
+

     int count = 1;
     int count = 1;

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

     {
         if (content[i] == '\r') count++;
     }
     {
         if (content[i] == '\r') count++;
     }

-    
+

     return count;
 }
 
     return count;
 }
 


@@ -1299,63 +1476,63 @@ void wxTextCtrl::ShowPosition(long pos)
 
 int wxTextCtrl::GetLineLength(long lineNo) const
 {
 
 int wxTextCtrl::GetLineLength(long lineNo) const
 {

-  // TODO change this if possible to reflect real lines
-  wxString content = GetValue() ;
-    
+    // TODO change this if possible to reflect real lines
+    wxString content = GetValue() ;
+

     // Find line first
     int count = 0;
     // Find line first
     int count = 0;

-    for (int 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 (int j = i; j < content.Length(); j++)
+            for (size_t j = i; j < content.Length(); j++)

             {
                 count++;
             {
                 count++;

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

             }
             }

-            
+

             return count;
         }
             return count;
         }

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

     }
     return 0;
 }
 
 wxString wxTextCtrl::GetLineText(long lineNo) const
 {
     }
     return 0;
 }
 
 wxString wxTextCtrl::GetLineText(long lineNo) const
 {

-  // TODO change this if possible to reflect real lines
-  wxString content = GetValue() ;
+    // TODO change this if possible to reflect real lines
+    wxString content = GetValue() ;

 
     // Find line first
     int count = 0;
 
     // Find line first
     int count = 0;

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

     {
         if (count == lineNo)
         {
             // Add chars in line then
     {
         if (count == lineNo)
         {
             // Add chars in line then

-            wxString tmp("");
-            
-            for (int j = i; j < content.Length(); j++)
+            wxString tmp;
+
+            for (size_t j = i; j < content.Length(); j++)

             {
             {

-                if (content[j] == '\r')
+                if (content[j] == '\n')

                     return tmp;
                     return tmp;

-                    
+

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

-            
+

             return tmp;
         }
             return tmp;
         }

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

     }
     }

-    return "" ;
+    return wxEmptyString ;

 }
 
 /*
  * Text item
  */
 }
 
 /*
  * Text item
  */

- 
+

 void wxTextCtrl::Command(wxCommandEvent & event)
 {
     SetValue (event.GetString());
 void wxTextCtrl::Command(wxCommandEvent & event)
 {
     SetValue (event.GetString());


@@ -1375,15 +1552,38 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
 {
     int key = event.GetKeyCode() ;
     bool eat_key = false ;
 {
     int key = event.GetKeyCode() ;
     bool eat_key = false ;

-    
-    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) ) ) 
+
+    if ( key == 'c' && event.MetaDown() )
+    {
+        if ( CanCopy() )
+            Copy() ;
+        return ;
+    }
+
+    if ( !IsEditable() && key != WXK_LEFT && key != WXK_RIGHT && key != WXK_DOWN && key != WXK_UP && key != WXK_TAB &&
+        !( key == WXK_RETURN && ( (m_windowStyle & wxPROCESS_ENTER) || (m_windowStyle & wxTE_MULTILINE) ) )

 /*        && key != WXK_PRIOR && key != WXK_NEXT && key != WXK_HOME && key != WXK_END */
         )
     {
         // eat it
         return ;
     }
 /*        && key != WXK_PRIOR && key != WXK_NEXT && key != WXK_HOME && key != WXK_END */
         )
     {
         // eat it
         return ;
     }

+
+    // assume that any key not processed yet is going to modify the control
+    m_dirty = true;
+
+    if ( key == 'v' && event.MetaDown() )
+    {
+        if ( CanPaste() )
+            Paste() ;
+        return ;
+    }
+    if ( key == 'x' && event.MetaDown() )
+    {
+        if ( CanCut() )
+            Cut() ;
+        return ;
+    }

     switch ( key )
     {
         case WXK_RETURN:
     switch ( key )
     {
         case WXK_RETURN:


@@ -1394,7 +1594,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
                 event.SetString( GetValue() );
                 if ( GetEventHandler()->ProcessEvent(event) )
                     return;
                 event.SetString( GetValue() );
                 if ( GetEventHandler()->ProcessEvent(event) )
                     return;

-            } 
+            }

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


@@ -1413,7 +1613,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
                         return ;
                    }
                 }
                         return ;
                    }
                 }

-               
+

                 // this will make wxWindows eat the ENTER key so that
                 // we actually prevent line wrapping in a single line
                 // text control
                 // this will make wxWindows eat the ENTER key so that
                 // we actually prevent line wrapping in a single line
                 // text control


@@ -1441,15 +1641,40 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
             }
             break;
     }
             }
             break;
     }

-    
+

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

-        // default handling
-        event.Skip() ;
+        // perform keystroke handling
+#if TARGET_CARBON
+        if ( m_macUsesTXN && 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 ;
+
+                ::HandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers ) ;
+            }
+        }
+#else
+        EventRecord *ev = (EventRecord*) wxTheApp->MacGetCurrentEvent() ;
+        short keycode ;
+        short keychar ;
+        keychar = short(ev->message & charCodeMask);
+        keycode = short(ev->message & keyCodeMask) >> 8 ;
+
+        ::HandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers ) ;
+#endif

     }
     }

-    if ( key >= 0x20 ||
+    if ( ( key >= 0x20 && key < WXK_START ) ||

          key == WXK_RETURN ||
          key == WXK_RETURN ||

-         key == WXK_DELETE || 
+         key == WXK_DELETE ||

          key == WXK_BACK)
     {
         wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
          key == WXK_BACK)
     {
         wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);


@@ -1459,37 +1684,37 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
     }
 }
 
     }
 }
 

-void  wxTextCtrl::MacSuperShown( bool show ) 
+void  wxTextCtrl::MacSuperShown( bool show )

 {
     bool former = m_macControlIsShown ;
     wxControl::MacSuperShown( show ) ;
     if ( (former != m_macControlIsShown) && m_macUsesTXN )
     {
         if ( m_macControlIsShown )
 {
     bool former = m_macControlIsShown ;
     wxControl::MacSuperShown( show ) ;
     if ( (former != m_macControlIsShown) && m_macUsesTXN )
     {
         if ( m_macControlIsShown )

-            TXNSetFrameBounds( (TXNObject) m_macTXN, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.top, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.left, 
+            TXNSetFrameBounds( (TXNObject) m_macTXN, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.top, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.left,

                 (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.bottom,(**(STPTextPaneVars **)m_macTXNvars).fRTextArea.right, (**(STPTextPaneVars **)m_macTXNvars).fTXNFrame);
         else
                 (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.bottom,(**(STPTextPaneVars **)m_macTXNvars).fRTextArea.right, (**(STPTextPaneVars **)m_macTXNvars).fTXNFrame);
         else

-            TXNSetFrameBounds( (TXNObject) m_macTXN, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.top + 30000, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.left, 
+            TXNSetFrameBounds( (TXNObject) m_macTXN, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.top + 30000, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.left,

                (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.bottom + 30000, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.right, (**(STPTextPaneVars **)m_macTXNvars).fTXNFrame);
     }
 }
 
                (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.bottom + 30000, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.right, (**(STPTextPaneVars **)m_macTXNvars).fTXNFrame);
     }
 }
 

-bool  wxTextCtrl::Show(bool show) 
+bool  wxTextCtrl::Show(bool show)

 {
     bool former = m_macControlIsShown ;
 {
     bool former = m_macControlIsShown ;

-    
+

     bool retval = wxControl::Show( show ) ;
     bool retval = wxControl::Show( show ) ;

-    
-    if ( former != m_macControlIsShown )
+
+    if ( former != m_macControlIsShown && m_macUsesTXN )

     {
         if ( m_macControlIsShown )
     {
         if ( m_macControlIsShown )

-            TXNSetFrameBounds( (TXNObject) m_macTXN, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.top, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.left, 
+            TXNSetFrameBounds( (TXNObject) m_macTXN, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.top, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.left,

                 (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.bottom,(**(STPTextPaneVars **)m_macTXNvars).fRTextArea.right, (**(STPTextPaneVars **)m_macTXNvars).fTXNFrame);
         else
                 (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.bottom,(**(STPTextPaneVars **)m_macTXNvars).fRTextArea.right, (**(STPTextPaneVars **)m_macTXNvars).fTXNFrame);
         else

-            TXNSetFrameBounds( (TXNObject) m_macTXN, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.top + 30000, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.left, 
+            TXNSetFrameBounds( (TXNObject) m_macTXN, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.top + 30000, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.left,

                (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.bottom + 30000, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.right, (**(STPTextPaneVars **)m_macTXNvars).fTXNFrame);
     }
                (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.bottom + 30000, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.right, (**(STPTextPaneVars **)m_macTXNvars).fTXNFrame);
     }

-    
+

     return retval ;
 }
 
     return retval ;
 }
 


@@ -1497,27 +1722,27 @@ bool  wxTextCtrl::Show(bool show)
 // standard handlers for standard edit menu events
 // ----------------------------------------------------------------------------
 
 // standard handlers for standard edit menu events
 // ----------------------------------------------------------------------------
 

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

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

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

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

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

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

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

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

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

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


@@ -1547,7 +1772,13 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
     event.Enable( CanRedo() );
 }
 
     event.Enable( CanRedo() );
 }
 

-
+bool wxTextCtrl::MacSetupCursor( const wxPoint& pt )
+{
+    if ( m_macUsesTXN )
+        return true ;
+    else
+        return wxWindow::MacSetupCursor( pt ) ;
+}

 
 #endif
     // wxUSE_TEXTCTRL
 
 #endif
     // wxUSE_TEXTCTRL