deleted unused variable

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

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 0f6f9e9ab7c5e6398ab6bf3f9084e5bbcbf9d936..b79f2fc5d377c050a9007b55084167f8aee4b619 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -60,7 +60,6 @@
 
 #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
 extern wxControl *wxFindControlFromMacControl(ControlHandle inControl ) ;
 
 // CS:TODO we still have a problem getting properly at the text events of a control because under Carbon


@@ -85,7 +84,7 @@ extern wxControl *wxFindControlFromMacControl(ControlHandle inControl ) ;
     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,


@@ -130,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 */


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


@@ -195,13 +194,13 @@ 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);
            /* verify our boundary */
             /* save the drawing state */
         SetPort((**tpvars).fDrawingEnvironment);
            /* verify our boundary */


@@ -212,14 +211,14 @@ static pascal void TPPaneDrawProc(ControlRef theControl, ControlPartCode thePart
             // scrollbar is on the border, we add one
             Rect oldbounds = varsp->fRFocusOutline ;
             InsetRect( &oldbounds , -1 , -1 ) ;
             // scrollbar is on the border, we add one
             Rect oldbounds = varsp->fRFocusOutline ;
             InsetRect( &oldbounds , -1 , -1 ) ;

-            
+

             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);
             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->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, 
+            TXNSetFrameBounds(  varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left,

                 varsp->fRTextArea.bottom, varsp->fRTextArea.right, varsp->fTXNFrame);
         }
 
                 varsp->fRTextArea.bottom, varsp->fRTextArea.right, varsp->fTXNFrame);
         }
 


@@ -291,12 +290,12 @@ 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);
                     wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ;
                 /* handle clicks in the text part */
             case kmUPTextPart:
                 {   SetPort((**tpvars).fDrawingEnvironment);
                     wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ;

-#if !TARGET_CARBON 
+#if !TARGET_CARBON

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


@@ -305,9 +304,9 @@ static pascal ControlPartCode TPPaneTrackingProc(ControlHandle theControl, Point
 #endif
                 }
                 break;
 #endif
                 }
                 break;

-            
+

         }
         }

-        
+

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


@@ -345,8 +344,8 @@ 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 
+                 }
+                 else

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


@@ -358,7 +357,7 @@ static pascal void TPPaneIdleProc(ControlHandle theControl) {
                 //    SetThemeCursor(kThemeArrowCursor);
                 }
             }
                 //    SetThemeCursor(kThemeArrowCursor);
                 }
             }

-            
+

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


@@ -487,7 +486,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;


@@ -495,7 +494,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);


@@ -504,7 +503,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);


@@ -533,7 +532,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


@@ -544,12 +543,12 @@ 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 ) )
         frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ;
         kTXNDontDrawCaretWhenInactiveMask ;
     if ( ! ( wxStyle & wxTE_NOHIDESEL ) )
         frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ;

-    
+

     if ( wxStyle & wxTE_MULTILINE )
     {
         if ( ! ( wxStyle & wxTE_DONTWRAP ) )
     if ( wxStyle & wxTE_MULTILINE )
     {
         if ( ! ( wxStyle & wxTE_DONTWRAP ) )


@@ -559,27 +558,34 @@ OSStatus mUPOpenControl(ControlHandle theControl, long wxStyle )
             frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
             frameOptions |= kTXNWantHScrollBarMask ;
         }
             frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
             frameOptions |= kTXNWantHScrollBarMask ;
         }

-            
+

         if ( !(wxStyle & wxTE_NO_VSCROLL ) )
             frameOptions |= kTXNWantVScrollBarMask ;
     }
     else
         frameOptions |= kTXNSingleLineOnlyMask ;
         if ( !(wxStyle & wxTE_NO_VSCROLL ) )
             frameOptions |= kTXNWantVScrollBarMask ;
     }
     else
         frameOptions |= kTXNSingleLineOnlyMask ;

-        
+

     if ( wxStyle & wxTE_READONLY )
         frameOptions |= kTXNReadOnlyMask ;
     if ( wxStyle & wxTE_READONLY )
         frameOptions |= kTXNReadOnlyMask ;

-  
+

     TXNNewObject(NULL, varsp->fOwner, &varsp->fRTextArea,
         frameOptions ,
         kTXNTextEditStyleFrameType,
         kTXNTextensionFile,
     TXNNewObject(NULL, varsp->fOwner, &varsp->fRTextArea,
         frameOptions ,
         kTXNTextEditStyleFrameType,
         kTXNTextensionFile,

-        kTXNSystemDefaultEncoding, 
+        kTXNSystemDefaultEncoding,

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

+    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[] =


@@ -597,7 +603,7 @@ OSStatus mUPOpenControl(ControlHandle theControl, long wxStyle )
     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,


@@ -668,11 +674,11 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
     m_macTXNvars = NULL ;
     m_macUsesTXN = false ;
     m_editable = true ;
     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
     if ( !CreateBase(parent, id, pos, size, style, validator, name) )
         return FALSE;
     // base initialization
     if ( !CreateBase(parent, id, pos, size, style, validator, name) )
         return FALSE;


@@ -698,7 +704,7 @@ 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 ;
     }
     */


@@ -719,10 +725,10 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
 
     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" , true , 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


@@ -764,7 +770,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
         TXNSetSelection( (TXNObject) m_macTXN, 0, 0);
         TXNShowSelection( (TXNObject) m_macTXN, kTXNShowStart);
     }
         TXNSetSelection( (TXNObject) m_macTXN, 0, 0);
         TXNShowSelection( (TXNObject) m_macTXN, kTXNShowStart);
     }

-  
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -777,15 +783,15 @@ wxString wxTextCtrl::GetValue() const
     {
         err = ::GetControlDataSize((ControlHandle) m_macControl, 0,
             ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag, &actualSize ) ;
     {
         err = ::GetControlDataSize((ControlHandle) m_macControl, 0,
             ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag, &actualSize ) ;

-       
+

        if ( err )
            return wxEmptyString ;
        if ( err )
            return wxEmptyString ;

-       
+

        if ( actualSize > 0 )
        {
        if ( actualSize > 0 )
        {

-                       wxCharBuffer buf(actualSize) ;            
+                       wxCharBuffer buf(actualSize) ;

             ::GetControlData( (ControlHandle) m_macControl, 0,
             ::GetControlData( (ControlHandle) m_macControl, 0,

-                ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag, 
+                ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag,

                 actualSize , buf.data() , &actualSize ) ;
             result = wxMacMakeStringFromCString( buf ) ;
         }
                 actualSize , buf.data() , &actualSize ) ;
             result = wxMacMakeStringFromCString( buf ) ;
         }


@@ -833,7 +839,7 @@ wxString wxTextCtrl::GetValue() const
         }
 #endif
     }
         }
 #endif
     }

-    
+

     return result ;
 }
 
     return result ;
 }
 


@@ -859,7 +865,7 @@ void wxTextCtrl::SetValue(const wxString& st)
     }
     else
     {
     }
     else
     {

-        bool formerEditable = IsEditable() ;
+        bool formerEditable = m_editable ;

         if ( !formerEditable )
             SetEditable(true) ;
 #if wxUSE_UNICODE
         if ( !formerEditable )
             SetEditable(true) ;
 #if wxUSE_UNICODE


@@ -878,7 +884,7 @@ void wxTextCtrl::SetValue(const wxString& st)
     MacRedrawControl() ;
 }
 
     MacRedrawControl() ;
 }
 

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

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


@@ -887,7 +893,7 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
 {
     if ( m_macUsesTXN )
     {
 {
     if ( m_macUsesTXN )
     {

-        bool formerEditable = IsEditable() ;
+        bool formerEditable = m_editable ;

         if ( !formerEditable )
             SetEditable(true) ;
         TXNTypeAttributes typeAttr[4] ;
         if ( !formerEditable )
             SetEditable(true) ;
         TXNTypeAttributes typeAttr[4] ;


@@ -907,7 +913,7 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
                 fontStyle |= bold ;
             if ( font.GetStyle() == wxITALIC )
                 fontStyle |= italic ;
                 fontStyle |= bold ;
             if ( font.GetStyle() == wxITALIC )
                 fontStyle |= italic ;

-                
+

             typeAttr[attrCounter].tag = kTXNQDFontNameAttribute ;
             typeAttr[attrCounter].size = kTXNQDFontNameAttributeSize ;
             typeAttr[attrCounter].data.dataPtr = (void*) fontName ;
             typeAttr[attrCounter].tag = kTXNQDFontNameAttribute ;
             typeAttr[attrCounter].size = kTXNQDFontNameAttributeSize ;
             typeAttr[attrCounter].data.dataPtr = (void*) fontName ;


@@ -918,7 +924,7 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
             typeAttr[attrCounter+2].size = kTXNQDFontStyleAttributeSize ;
             typeAttr[attrCounter+2].data.dataValue = fontStyle ;
             attrCounter += 3 ;
             typeAttr[attrCounter+2].size = kTXNQDFontStyleAttributeSize ;
             typeAttr[attrCounter+2].data.dataValue = fontStyle ;
             attrCounter += 3 ;

-            
+

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


@@ -928,11 +934,13 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
             color = MAC_WXCOLORREF(style.GetTextColour().GetPixel()) ;
             attrCounter += 1 ;
         }
             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 )
             wxASSERT_MSG( status == noErr , wxT("Couldn't set text attributes") ) ;
         }
         if ( !formerEditable )


@@ -963,7 +971,7 @@ void wxTextCtrl::Copy()
         else
         {
             ClearCurrentScrap();
         else
         {
             ClearCurrentScrap();

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

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


@@ -983,7 +991,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);


@@ -1006,7 +1014,7 @@ 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);
             SetStyle( kTXNUseCurrentSelection , kTXNUseCurrentSelection , GetDefaultStyle() ) ;
         }
         wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);


@@ -1044,13 +1052,13 @@ bool wxTextCtrl::CanPaste() const
 #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)


@@ -1060,7 +1068,7 @@ bool wxTextCtrl::CanPaste() const
         }
     }
     return FALSE;
         }
     }
     return FALSE;

-    
+

 #else
     long offset ;
     if ( GetScrap( NULL , 'TEXT' , &offset ) > 0 )
 #else
     long offset ;
     if ( GetScrap( NULL , 'TEXT' , &offset ) > 0 )


@@ -1140,7 +1148,7 @@ void wxTextCtrl::Replace(long from, long to, const wxString& value)
     if ( !m_macUsesTXN )
     {
         ControlEditTextSelectionRec selection ;
     if ( !m_macUsesTXN )
     {
         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 ) ;


@@ -1150,7 +1158,7 @@ void wxTextCtrl::Replace(long from, long to, const wxString& value)
     }
     else
     {
     }
     else
     {

-        bool formerEditable = IsEditable() ;
+        bool formerEditable = m_editable ;

         if ( !formerEditable )
             SetEditable(true) ;
         TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
         if ( !formerEditable )
             SetEditable(true) ;
         TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;


@@ -1173,7 +1181,7 @@ void wxTextCtrl::Remove(long from, long to)
     if ( !m_macUsesTXN )
     {
         ControlEditTextSelectionRec selection ;
     if ( !m_macUsesTXN )
     {
         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 ) ;


@@ -1181,11 +1189,11 @@ void wxTextCtrl::Remove(long from, long to)
     }
     else
     {
     }
     else
     {

-        bool formerEditable = IsEditable() ;
+        bool formerEditable = m_editable ;

         if ( !formerEditable )
             SetEditable(true) ;
         if ( !formerEditable )
             SetEditable(true) ;

-        TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ; 
-        TXNClear( ((TXNObject) m_macTXN) ) ; 
+        TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
+        TXNClear( ((TXNObject) m_macTXN) ) ;

         if ( !formerEditable )
             SetEditable( formerEditable ) ;
     }
         if ( !formerEditable )
             SetEditable( formerEditable ) ;
     }


@@ -1194,13 +1202,18 @@ void wxTextCtrl::Remove(long from, long to)
 
 void wxTextCtrl::SetSelection(long from, long to)
 {
 
 void wxTextCtrl::SetSelection(long from, long to)
 {

-    
+    if ( from == -1 )
+        from = 0;
+
+    if ( to == -1 )
+        to = GetLastPosition();
+

     if ( !m_macUsesTXN )
     {
         ControlEditTextSelectionRec selection ;
         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 ) ;
     }
         TESetSelect( selection.selStart , selection.selEnd , ((TEHandle) m_macTE) ) ;
         ::SetControlData((ControlHandle)  m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ;
     }


@@ -1229,7 +1242,7 @@ bool wxTextCtrl::LoadFile(const wxString& file)
 }
 
 void wxTextCtrl::WriteText(const wxString& st)
 }
 
 void wxTextCtrl::WriteText(const wxString& st)

-{        
+{

     if ( !m_macUsesTXN )
     {
        wxCharBuffer text = wxMacStringToCString( st ) ;
     if ( !m_macUsesTXN )
     {
        wxCharBuffer text = wxMacStringToCString( st ) ;


@@ -1237,7 +1250,7 @@ void wxTextCtrl::WriteText(const wxString& st)
     }
     else
     {
     }
     else
     {

-        bool formerEditable = IsEditable() ;
+        bool formerEditable = m_editable ;

         if ( !formerEditable )
             SetEditable(true) ;
         long start , end , dummy ;
         if ( !formerEditable )
             SetEditable(true) ;
         long start , end , dummy ;


@@ -1277,7 +1290,7 @@ void wxTextCtrl::Clear()
     else
     {
         TXNSetSelection( (TXNObject)m_macTXN , kTXNStartOffset , kTXNEndOffset ) ;
     else
     {
         TXNSetSelection( (TXNObject)m_macTXN , kTXNStartOffset , kTXNEndOffset ) ;

-        TXNClear((TXNObject)m_macTXN); 
+        TXNClear((TXNObject)m_macTXN);

     }
     Refresh() ;
 }
     }
     Refresh() ;
 }


@@ -1301,7 +1314,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 )
     {


@@ -1339,6 +1352,10 @@ void wxTextCtrl::Undo()
 {
     if (CanUndo())
     {
 {
     if (CanUndo())
     {

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

     }
 }
 
     }
 }
 


@@ -1346,16 +1363,36 @@ 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 ;
 }
 


@@ -1369,13 +1406,13 @@ 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;
     for (size_t i = 0; i < content.Length() ; i++)
     {
         if (content[i] == '\r') count++;
     }
     int count = 1;
     for (size_t i = 0; i < content.Length() ; i++)
     {
         if (content[i] == '\r') count++;
     }

-    
+

     return count;
 }
 
     return count;
 }
 


@@ -1399,7 +1436,7 @@ 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;
     for (size_t i = 0; i < content.Length() ; i++)
     // Find line first
     int count = 0;
     for (size_t i = 0; i < content.Length() ; i++)


@@ -1413,7 +1450,7 @@ int wxTextCtrl::GetLineLength(long lineNo) const
                 count++;
                 if (content[j] == '\r') return count;
             }
                 count++;
                 if (content[j] == '\r') return count;
             }

-            
+

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


@@ -1434,15 +1471,15 @@ wxString wxTextCtrl::GetLineText(long lineNo) const
         {
             // Add chars in line then
             wxString tmp;
         {
             // Add chars in line then
             wxString tmp;

-            
+

             for (size_t j = i; j < content.Length(); j++)
             {
                 if (content[j] == '\r')
                     return tmp;
             for (size_t j = i; j < content.Length(); j++)
             {
                 if (content[j] == '\r')
                     return tmp;

-                    
+

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

-            
+

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


@@ -1453,7 +1490,7 @@ wxString wxTextCtrl::GetLineText(long lineNo) const
 /*
  * Text item
  */
 /*
  * Text item
  */

- 
+

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


@@ -1473,16 +1510,16 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
 {
     int key = event.GetKeyCode() ;
     bool eat_key = false ;
 {
     int key = event.GetKeyCode() ;
     bool eat_key = false ;

-    
+

     if ( key == 'c' && event.MetaDown() )
     {
         if ( CanCopy() )
             Copy() ;
         return ;
     }
     if ( key == 'c' && event.MetaDown() )
     {
         if ( CanCopy() )
             Copy() ;
         return ;
     }

-    
-    if ( !IsEditable() && key != WXK_LEFT && key != WXK_RIGHT && key != WXK_DOWN && key != WXK_UP && key != WXK_TAB && 
-        !( key == WXK_RETURN && ( (m_windowStyle & wxPROCESS_ENTER) || (m_windowStyle & wxTE_MULTILINE) ) ) 
+
+    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_PRIOR && key != WXK_NEXT && key != WXK_HOME && key != WXK_END */
         )
     {


@@ -1511,7 +1548,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();


@@ -1530,7 +1567,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


@@ -1558,15 +1595,32 @@ 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 
+#endif
+        {
+            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 ) ;
+            }
+        }

     }
     if ( ( key >= 0x20 && key < WXK_START ) ||
          key == WXK_RETURN ||
     }
     if ( ( key >= 0x20 && key < WXK_START ) ||
          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);


@@ -1576,37 +1630,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 && m_macUsesTXN )
     {
         if ( m_macControlIsShown )
     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);
     }

-    
+

     return retval ;
 }
 
     return retval ;
 }