X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fedad417ce939cbb0ddb519e9777145c76712cb8..f0d5e7a25aef93d3a907d005c572bc8cca4f41a1:/src/mac/textctrl.cpp diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp index c6a6d86e09..f69d2f0e9e 100644 --- a/src/mac/textctrl.cpp +++ b/src/mac/textctrl.cpp @@ -6,7 +6,7 @@ // Created: ??/??/98 // RCS-ID: $Id$ // Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -28,7 +28,7 @@ #include "wx/app.h" #include "wx/dc.h" #include "wx/button.h" -#include "wx/panel.h" +#include "wx/toplevel.h" #include "wx/textctrl.h" #include "wx/notebook.h" #include "wx/tabctrl.h" @@ -42,14 +42,527 @@ #include #endif +#ifndef __DARWIN__ +#include +#endif +#include +#include "ATSUnicode.h" +#include "TextCommon.h" +#include "TextEncodingConverter.h" #include "wx/mac/uma.h" +extern wxApp *wxTheApp ; + +// CS:TODO we still have a problem getting properly at the text events of a control because under Carbon +// the MLTE engine registers itself for the key events thus the normal flow never occurs, the only measure for the +// moment is to avoid setting the true focus on the control, the proper solution at the end would be to have +// an alternate path for carbon key events that routes automatically into the same wx flow of events + +#include "MacTextEditor.h" + +/* part codes */ + +/* kmUPTextPart is the part code we return to indicate the user has clicked + in the text area of our control */ +#define kmUPTextPart 1 + +/* kmUPScrollPart is the part code we return to indicate the user has clicked + in the scroll bar part of the control. */ +#define kmUPScrollPart 2 + + +/* routines for using existing user pane controls. + These routines are useful for cases where you would like to use an + existing user pane control in, say, a dialog window as a scrolling + text edit field.*/ + +/* 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, + except it does not create the user pane control itself. theControl + 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, bool multiline); + +/* Utility Routines */ + +enum { + kShiftKeyCode = 56 +}; + +/* kUserClickedToFocusPart is a part code we pass to the SetKeyboardFocus + routine. In our focus switching routine this part code is understood + as meaning 'the user has clicked in the control and we need to switch + the current focus to ourselves before we can continue'. */ +#define kUserClickedToFocusPart 100 + + +/* kmUPClickScrollDelayTicks is a time measurement in ticks used to + slow the speed of 'auto scrolling' inside of our clickloop routine. + This value prevents the text from wizzzzzing by while the mouse + is being held down inside of the text area. */ +#define kmUPClickScrollDelayTicks 3 + + +/* STPTextPaneVars is a structure used for storing the the mUP Control's + internal variables and state information. A handle to this record is + stored in the pane control's reference value field using the + SetControlReference routine. */ + +typedef struct { + /* OS records referenced */ + TXNObject fTXNRec; /* the txn record */ + TXNFrameID fTXNFrame; /* the txn frame ID */ + ControlHandle fUserPaneRec; /* handle to the user pane control */ + WindowPtr fOwner; /* window containing control */ + GrafPtr fDrawingEnvironment; /* grafport where control is drawn */ + /* flags */ + Boolean fInFocus; /* true while the focus rect is drawn around the control */ + Boolean fIsActive; /* true while the control is drawn in the active state */ + Boolean 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 */ + Rect fRTextOutline; /* rectangle used to draw the border */ + RgnHandle fTextBackgroundRgn; /* background region for the text, erased before calling TEUpdate */ + /* our focus advance override routine */ + EventHandlerUPP handlerUPP; + EventHandlerRef handlerRef; + bool fMultiline ; +} STPTextPaneVars; + + + + +/* Univerals Procedure Pointer variables used by the + mUP Control. These variables are set up + the first time that mUPOpenControl is called. */ +ControlUserPaneDrawUPP gTPDrawProc = NULL; +ControlUserPaneHitTestUPP gTPHitProc = NULL; +ControlUserPaneTrackingUPP gTPTrackProc = NULL; +ControlUserPaneIdleUPP gTPIdleProc = NULL; +ControlUserPaneKeyDownUPP gTPKeyProc = NULL; +ControlUserPaneActivateUPP gTPActivateProc = NULL; +ControlUserPaneFocusUPP gTPFocusProc = NULL; + +/* TPActivatePaneText activates or deactivates the text edit record + according to the value of setActive. The primary purpose of this + routine is to ensure each call is only made once. */ +static void TPActivatePaneText(STPTextPaneVars **tpvars, Boolean setActive) { + STPTextPaneVars *varsp; + varsp = *tpvars; + if (varsp->fTEActive != setActive) { + + varsp->fTEActive = setActive; + + TXNActivate(varsp->fTXNRec, varsp->fTXNFrame, varsp->fTEActive); + + if (varsp->fInFocus) + TXNFocus( varsp->fTXNRec, varsp->fTEActive); + } +} + + +/* TPFocusPaneText set the focus state for the text record. */ +static void TPFocusPaneText(STPTextPaneVars **tpvars, Boolean setFocus) { + STPTextPaneVars *varsp; + varsp = *tpvars; + if (varsp->fInFocus != setFocus) { + varsp->fInFocus = setFocus; + TXNFocus( varsp->fTXNRec, varsp->fInFocus); + } +} + + +/* TPPaneDrawProc is called to redraw the control and for update events + referring to the control. This routine erases the text area's background, + and redraws the text. This routine assumes the scroll bar has been + redrawn by a call to DrawControls. */ +static pascal void TPPaneDrawProc(ControlRef theControl, ControlPartCode thePart) { + STPTextPaneVars **tpvars, *varsp; + char state; + Rect bounds; + /* set up our globals */ + + 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 */ + GetControlBounds(theControl, &bounds); + 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 ) ; + 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) , + 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); + } + + /* 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); + } +} + + +/* TPPaneHitTestProc is called when the control manager would + like to determine what part of the control the mouse resides over. + We also call this routine from our tracking proc to determine how + to handle mouse clicks. */ +static pascal ControlPartCode TPPaneHitTestProc(ControlHandle theControl, Point where) { + STPTextPaneVars **tpvars; + ControlPartCode result; + char state; + /* set up our locals and lock down our globals*/ + result = 0; + tpvars = (STPTextPaneVars **) GetControlReference(theControl); + if (tpvars != NULL) { + state = HGetState((Handle) tpvars); + HLock((Handle) tpvars); + /* find the region where we clicked */ + if (PtInRect(where, &(**tpvars).fRTextArea)) { + result = kmUPTextPart; + } else result = 0; + /* release oure globals */ + HSetState((Handle) tpvars, state); + } + return result; +} + + + + + +/* TPPaneTrackingProc is called when the mouse is being held down + over our control. This routine handles clicks in the text area + and in the scroll bar. */ +static pascal ControlPartCode TPPaneTrackingProc(ControlHandle theControl, Point startPt, ControlActionUPP actionProc) { + STPTextPaneVars **tpvars, *varsp; + char state; + ControlPartCode partCodeResult; + /* make sure we have some variables... */ + partCodeResult = 0; + tpvars = (STPTextPaneVars **) GetControlReference(theControl); + if (tpvars != NULL) { + /* lock 'em down */ + state = HGetState((Handle) tpvars); + HLock((Handle) tpvars); + varsp = *tpvars; + /* we don't do any of these functions unless we're in focus */ + if ( ! varsp->fInFocus) { + WindowPtr owner; + owner = GetControlOwner(theControl); + ClearKeyboardFocus(owner); + SetKeyboardFocus(owner, theControl, kUserClickedToFocusPart); + } + /* find the location for the click */ + switch (TPPaneHitTestProc(theControl, startPt)) { + + /* handle clicks in the text part */ + case kmUPTextPart: + { SetPort((**tpvars).fDrawingEnvironment); + TXNClick( varsp->fTXNRec, (const EventRecord*) wxTheApp->MacGetCurrentEvent()); + } + break; + + } + + HSetState((Handle) tpvars, state); + } + return partCodeResult; +} + + +/* TPPaneIdleProc is our user pane idle routine. When our text field + is active and in focus, we use this routine to set the cursor. */ +static pascal void TPPaneIdleProc(ControlHandle theControl) { + STPTextPaneVars **tpvars, *varsp; + /* set up locals */ + tpvars = (STPTextPaneVars **) GetControlReference(theControl); + if (tpvars != NULL) { + /* if we're not active, then we have nothing to say about the cursor */ + if ((**tpvars).fIsActive) { + char state; + Rect bounds; + Point mousep; + /* lock down the globals */ + state = HGetState((Handle) tpvars); + HLock((Handle) tpvars); + varsp = *tpvars; + /* get the current mouse coordinates (in our window) */ + SetPortWindowPort(GetControlOwner(theControl)); + GetMouse(&mousep); + /* there's a 'focus thing' and an 'unfocused thing' */ + if (varsp->fInFocus) { + /* flash the cursor */ + SetPort((**tpvars).fDrawingEnvironment); + TXNIdle(varsp->fTXNRec); + /* set the cursor */ + if (PtInRect(mousep, &varsp->fRTextArea)) { + RgnHandle theRgn; + RectRgn((theRgn = NewRgn()), &varsp->fRTextArea); + TXNAdjustCursor(varsp->fTXNRec, theRgn); + DisposeRgn(theRgn); + } else SetThemeCursor(kThemeArrowCursor); + } else { + /* if it's in our bounds, set the cursor */ + GetControlBounds(theControl, &bounds); + if (PtInRect(mousep, &bounds)) + SetThemeCursor(kThemeArrowCursor); + } + + HSetState((Handle) tpvars, state); + } + } +} + + +/* TPPaneKeyDownProc is called whenever a keydown event is directed + at our control. Here, we direct the keydown event to the text + edit record and redraw the scroll bar and text field as appropriate. */ +static pascal ControlPartCode TPPaneKeyDownProc(ControlHandle theControl, + SInt16 keyCode, SInt16 charCode, SInt16 modifiers) { + STPTextPaneVars **tpvars; + tpvars = (STPTextPaneVars **) GetControlReference(theControl); + if (tpvars != NULL) { + if ((**tpvars).fInFocus) { + /* turn autoscrolling on and send the key event to text edit */ + SetPort((**tpvars).fDrawingEnvironment); + EventRecord ev ; + memset( &ev , 0 , sizeof( ev ) ) ; + ev.what = keyDown ; + ev.modifiers = modifiers ; + ev.message = (( keyCode << 8 ) & keyCodeMask ) + ( charCode & charCodeMask ) ; + TXNKeyDown( (**tpvars).fTXNRec, &ev); + } + } + return kControlEntireControl; +} + + +/* TPPaneActivateProc is called when the window containing + the user pane control receives activate events. Here, we redraw + the control and it's text as necessary for the activation state. */ +static pascal void TPPaneActivateProc(ControlHandle theControl, Boolean activating) { + Rect bounds; + STPTextPaneVars **tpvars, *varsp; + char state; + /* set up locals */ + tpvars = (STPTextPaneVars **) GetControlReference(theControl); + if (tpvars != NULL) { + state = HGetState((Handle) tpvars); + HLock((Handle) tpvars); + varsp = *tpvars; + /* de/activate the text edit record */ + SetPort((**tpvars).fDrawingEnvironment); + GetControlBounds(theControl, &bounds); + varsp->fIsActive = activating; + TPActivatePaneText(tpvars, varsp->fIsActive && varsp->fInFocus); + /* redraw the frame */ + DrawThemeEditTextFrame(&varsp->fRTextOutline, varsp->fIsActive ? kThemeStateActive: kThemeStateInactive); + if (varsp->fInFocus) DrawThemeFocusRect(&varsp->fRFocusOutline, varsp->fIsActive); + HSetState((Handle) tpvars, state); + } +} + + +/* TPPaneFocusProc is called when every the focus changes to or + from our control. Herein, switch the focus appropriately + according to the parameters and redraw the control as + necessary. */ +static pascal ControlPartCode TPPaneFocusProc(ControlHandle theControl, ControlFocusPart action) { + ControlPartCode focusResult; + STPTextPaneVars **tpvars, *varsp; + char state; + /* set up locals */ + focusResult = kControlFocusNoPart; + tpvars = (STPTextPaneVars **) GetControlReference(theControl); + if (tpvars != NULL) { + state = HGetState((Handle) tpvars); + HLock((Handle) tpvars); + varsp = *tpvars; + /* if kControlFocusPrevPart and kControlFocusNextPart are received when the user is + tabbing forwards (or shift tabbing backwards) through the items in the dialog, + and kControlFocusNextPart will be received. When the user clicks in our field + and it is not the current focus, then the constant kUserClickedToFocusPart will + be received. The constant kControlFocusNoPart will be received when our control + is the current focus and the user clicks in another control. In your focus routine, + you should respond to these codes as follows: + + kControlFocusNoPart - turn off focus and return kControlFocusNoPart. redraw + the control and the focus rectangle as necessary. + + kControlFocusPrevPart or kControlFocusNextPart - toggle focus on or off + depending on its current state. redraw the control and the focus rectangle + as appropriate for the new focus state. If the focus state is 'off', return the constant + kControlFocusNoPart, otherwise return a non-zero part code. + kUserClickedToFocusPart - is a constant defined for this example. You should + define your own value for handling click-to-focus type events. */ + /* save the drawing state */ + SetPort((**tpvars).fDrawingEnvironment); + /* calculate the next highlight state */ + switch (action) { + default: + case kControlFocusNoPart: + TPFocusPaneText(tpvars, false); + focusResult = kControlFocusNoPart; + break; + case kUserClickedToFocusPart: + TPFocusPaneText(tpvars, true); + focusResult = 1; + break; + case kControlFocusPrevPart: + case kControlFocusNextPart: + TPFocusPaneText(tpvars, ( ! varsp->fInFocus)); + 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); + /* done */ + HSetState((Handle) tpvars, state); + } + return focusResult; +} + + +/* 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, + except it does not create the user pane control itself. theControl + 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, bool multiline) +{ + Rect bounds; + WindowRef theWindow; + STPTextPaneVars **tpvars, *varsp; + OSStatus err; + RGBColor rgbWhite = {0xFFFF, 0xFFFF, 0xFFFF}; + TXNBackground tback; + + /* set up our globals */ + if (gTPDrawProc == NULL) gTPDrawProc = NewControlUserPaneDrawUPP(TPPaneDrawProc); + if (gTPHitProc == NULL) gTPHitProc = NewControlUserPaneHitTestUPP(TPPaneHitTestProc); + if (gTPTrackProc == NULL) gTPTrackProc = NewControlUserPaneTrackingUPP(TPPaneTrackingProc); + if (gTPIdleProc == NULL) gTPIdleProc = NewControlUserPaneIdleUPP(TPPaneIdleProc); + if (gTPKeyProc == NULL) gTPKeyProc = NewControlUserPaneKeyDownUPP(TPPaneKeyDownProc); + if (gTPActivateProc == NULL) gTPActivateProc = NewControlUserPaneActivateUPP(TPPaneActivateProc); + if (gTPFocusProc == NULL) gTPFocusProc = NewControlUserPaneFocusUPP(TPPaneFocusProc); + + /* allocate our private storage */ + tpvars = (STPTextPaneVars **) NewHandleClear(sizeof(STPTextPaneVars)); + SetControlReference(theControl, (long) tpvars); + HLock((Handle) tpvars); + varsp = *tpvars; + /* set the initial settings for our private data */ + varsp->fMultiline = multiline ; + varsp->fInFocus = false; + varsp->fIsActive = true; + varsp->fTEActive = true; // in order to get a deactivate + varsp->fUserPaneRec = theControl; + theWindow = varsp->fOwner = GetControlOwner(theControl); + + varsp->fDrawingEnvironment = (GrafPtr) GetWindowPort(theWindow); + + varsp->fInDialogWindow = ( GetWindowKind(varsp->fOwner) == kDialogWindowKind ); + /* set up the user pane procedures */ + SetControlData(theControl, kControlEntireControl, kControlUserPaneDrawProcTag, sizeof(gTPDrawProc), &gTPDrawProc); + SetControlData(theControl, kControlEntireControl, kControlUserPaneHitTestProcTag, sizeof(gTPHitProc), &gTPHitProc); + SetControlData(theControl, kControlEntireControl, kControlUserPaneTrackingProcTag, sizeof(gTPTrackProc), &gTPTrackProc); + SetControlData(theControl, kControlEntireControl, kControlUserPaneIdleProcTag, sizeof(gTPIdleProc), &gTPIdleProc); + SetControlData(theControl, kControlEntireControl, kControlUserPaneKeyDownProcTag, sizeof(gTPKeyProc), &gTPKeyProc); + SetControlData(theControl, kControlEntireControl, kControlUserPaneActivateProcTag, sizeof(gTPActivateProc), &gTPActivateProc); + SetControlData(theControl, kControlEntireControl, kControlUserPaneFocusProcTag, sizeof(gTPFocusProc), &gTPFocusProc); + /* calculate the rectangles used by the control */ + 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) , + 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 + of the text area. */ + RectRgn((varsp->fTextBackgroundRgn = NewRgn()), &varsp->fRTextOutline); + + /* set up the drawing environment */ + SetPort(varsp->fDrawingEnvironment); + + /* create the new edit field */ + TXNNewObject(NULL, varsp->fOwner, &varsp->fRTextArea, + ( multiline ? kTXNWantVScrollBarMask : 0 ) | + kTXNDontDrawCaretWhenInactiveMask | + kTXNDontDrawSelectionWhenInactiveMask | + kTXNAlwaysWrapAtViewEdgeMask , + kTXNTextEditStyleFrameType, + kTXNTextensionFile, + kTXNSystemDefaultEncoding, + &varsp->fTXNRec, &varsp->fTXNFrame, (TXNObjectRefcon) tpvars); + + Str255 fontName ; + SInt16 fontSize ; + Style fontStyle ; + + GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ; + + TXNTypeAttributes typeAttr[] = + { + { kTXNQDFontNameAttribute , kTXNQDFontNameAttributeSize , { (void*) fontName } } , + { kTXNQDFontSizeAttribute , kTXNFontSizeAttributeSize , { (void*) (fontSize << 16) } } , + { kTXNQDFontStyleAttribute , kTXNQDFontStyleAttributeSize , { (void*) normal } } , + } ; + + OSStatus status = TXNSetTypeAttributes (varsp->fTXNRec, sizeof( typeAttr ) / sizeof(TXNTypeAttributes) , typeAttr, + kTXNStartOffset, + kTXNEndOffset); + /* set the field's background */ + 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, + we assume that the window is going to be the 'active' window. */ + TPActivatePaneText(tpvars, varsp->fIsActive && varsp->fInFocus); + /* all done */ + return noErr; +} + + + + #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl) BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) - EVT_DROP_FILES(wxTextCtrl::OnDropFiles) - EVT_CHAR(wxTextCtrl::OnChar) + EVT_DROP_FILES(wxTextCtrl::OnDropFiles) + EVT_CHAR(wxTextCtrl::OnChar) EVT_MENU(wxID_CUT, wxTextCtrl::OnCut) EVT_MENU(wxID_COPY, wxTextCtrl::OnCopy) EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste) @@ -67,49 +580,75 @@ END_EVENT_TABLE() // Text item wxTextCtrl::wxTextCtrl() { + m_macTE = NULL ; + m_macTXN = NULL ; + m_macTXNvars = NULL ; + m_macUsesTXN = false ; + m_editable = true ; +} + +wxTextCtrl::~wxTextCtrl() +{ + if ( m_macUsesTXN ) + { + SetControlReference((ControlHandle)m_macControl, 0) ; + TXNDeleteObject((TXNObject)m_macTXN); + /* delete our private storage */ + DisposeHandle((Handle) m_macTXNvars); + /* zero the control reference */ + } } const short kVerticalMargin = 2 ; const short kHorizontalMargin = 2 ; bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, - const wxString& st, + const wxString& st, 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_macUsesTXN = ! (style & wxTE_PASSWORD ) ; + + m_macUsesTXN &= (TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress) ; + // base initialization if ( !CreateBase(parent, id, pos, size, style, validator, name) ) return FALSE; - wxSize mySize = size ; - if ( UMAHasAppearance() ) + wxSize mySize = size ; + if ( m_macUsesTXN ) { m_macHorizontalBorder = 5 ; // additional pixels around the real control - m_macVerticalBorder = 5 ; + m_macVerticalBorder = 3 ; } else - { - m_macHorizontalBorder = 0 ; // additional pixels around the real control - m_macVerticalBorder = 0 ; - } - + { + m_macHorizontalBorder = 5 ; // additional pixels around the real control + m_macVerticalBorder = 5 ; + } - Rect bounds ; - Str255 title ; - if ( mySize.y == -1 ) - { - if ( UMAHasAppearance() ) - mySize.y = 13 ; - else - mySize.y = 24 ; - - mySize.y += 2 * m_macVerticalBorder ; - } - - MacPreControlCreate( parent , id , "" , pos , mySize ,style, validator , name , &bounds , title ) ; + Rect bounds ; + Str255 title ; + /* + if ( mySize.y == -1 ) + { + mySize.y = 13 ; + if ( m_windowStyle & wxTE_MULTILINE ) + mySize.y *= 5 ; + + mySize.y += 2 * m_macVerticalBorder ; + } + */ + MacPreControlCreate( parent , id , "" , pos , mySize ,style, validator , name , &bounds , title ) ; if ( m_windowStyle & wxTE_MULTILINE ) { @@ -120,95 +659,121 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, } - m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , "\p" , true , 0 , 0 , 1, - ( style & wxTE_PASSWORD ) ? kControlEditTextPasswordProc : kControlEditTextProc , (long) this ) ; - MacPostControlCreate() ; + if ( !m_macUsesTXN ) + { + m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , "\p" , true , 0 , 0 , 1, + (style & wxTE_PASSWORD) ? kControlEditTextPasswordProc : kControlEditTextProc , (long) this ) ; + long size ; + ::GetControlData((ControlHandle) m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &((TEHandle) m_macTE) , &size ) ; - wxString value ; - + } + else { - TEHandle teH ; - long size ; - - UMAGetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - (*teH)->lineHeight = -1 ; + short featurSet; + + featurSet = kControlSupportsEmbedding | kControlSupportsFocus // | kControlWantsIdle + | kControlWantsActivate | kControlHandlesTracking | kControlHasSpecialBackground + | kControlGetsFocusOnClick | kControlSupportsLiveFeedback; + /* create the control */ + m_macControl = NewControl(MAC_WXHWND(parent->MacGetRootWindow()), &bounds, "\p", true, featurSet, 0, featurSet, kControlUserPaneProc, 0); + /* set up the mUP specific features and data */ + mUPOpenControl((ControlHandle) m_macControl, m_windowStyle & wxTE_MULTILINE ); + if ( parent ) + { + parent->MacGetTopLevelWindow()->MacInstallEventHandler() ; + } } - + MacPostControlCreate() ; + + wxString value ; + if( wxApp::s_macDefaultEncodingIsPC ) value = wxMacMakeMacStringFromPC( st ) ; else value = st ; - UMASetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , value.Length() , (char*) ((const char*)value) ) ; - + + if ( !m_macUsesTXN ) + { + ::SetControlData( (ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , value.Length() , (char*) ((const char*)value) ) ; + } + else + { + STPTextPaneVars **tpvars; + /* 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_macTXNvars = tpvars ; + m_macUsesTXN = true ; + } + return TRUE; } wxString wxTextCtrl::GetValue() const { - Size actualsize; - UMAGetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ; - wxBuffer[actualsize] = 0 ; - if( wxApp::s_macDefaultEncodingIsPC ) - return wxMacMakePCStringFromMac( wxBuffer ) ; - else - return wxString(wxBuffer); + Size actualsize; + if ( !m_macUsesTXN ) + { + ::GetControlData( (ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ; + } + else + { + Handle theText ; + OSStatus err = TXNGetDataEncoded( ((TXNObject) m_macTXN), kTXNStartOffset, kTXNEndOffset, &theText , kTXNTextData ); + /* all done */ + if ( err ) + { + actualsize = 0 ; + } + else + { + actualsize = GetHandleSize( theText ) ; + if (actualsize != 0) + strncpy( wxBuffer , *theText , actualsize ) ; + DisposeHandle( theText ) ; + } + } + wxBuffer[actualsize] = 0 ; + if( wxApp::s_macDefaultEncodingIsPC ) + return wxMacMakePCStringFromMac( wxBuffer ) ; + else + return wxString(wxBuffer); } void wxTextCtrl::GetSelection(long* from, long* to) const { - ControlEditTextSelectionRec selection ; - TEHandle teH ; - long size ; - - UMAGetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - - *from = (**teH).selStart; - *to = (**teH).selEnd; + if ( !m_macUsesTXN ) + { + *from = (**((TEHandle) m_macTE)).selStart; + *to = (**((TEHandle) m_macTE)).selEnd; + } + else + { + TXNGetSelection( ((TXNObject) m_macTXN) , (TXNOffset*) from , (TXNOffset*) to ) ; + } } void wxTextCtrl::SetValue(const wxString& st) { - wxString value ; - - if( wxApp::s_macDefaultEncodingIsPC ) - value = wxMacMakeMacStringFromPC( st ) ; - else - value = st ; - UMASetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , value.Length() , (char*) ((const char*)value) ) ; - WindowRef window = GetMacRootWindow() ; - if ( window ) - { - wxWindow* win = wxFindWinFromMacWindow( window ) ; - if ( win ) - { - wxMacDrawingHelper help( win ) ; - // the mac control manager always assumes to have the origin at 0,0 - SetOrigin( 0 , 0 ) ; - - bool hasTabBehind = false ; - wxWindow* parent = GetParent() ; - while ( parent ) - { - if( parent->MacGetWindowData() ) - { - UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ; - break ; - } - - if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) )) - { - if ( ((wxControl*)parent)->GetMacControl() ) - SetUpControlBackground( ((wxControl*)parent)->GetMacControl() , -1 , true ) ; - break ; - } - - parent = parent->GetParent() ; - } - - UMADrawControl( m_macControl ) ; - UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ; - } - } + wxString value ; + + if( wxApp::s_macDefaultEncodingIsPC ) + value = wxMacMakeMacStringFromPC( st ) ; + else + value = st ; + if ( !m_macUsesTXN ) + { + ::SetControlData((ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , value.Length() , (char*) ((const char*)value) ) ; + } + else + { + TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*)value.c_str(), value.Length(), + kTXNStartOffset, kTXNEndOffset); + } + MacRedrawControl() ; } // Clipboard operations @@ -216,88 +781,66 @@ void wxTextCtrl::Copy() { if (CanCopy()) { - TEHandle teH ; - long size ; - - UMAGetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - TECopy( teH ) ; -#if TARGET_CARBON - OSStatus err ; - err = ClearCurrentScrap( ); -#else - OSErr err ; - err = ZeroScrap( ); -#endif - TEToScrap() ; - } + if ( !m_macUsesTXN ) + { + TECopy( ((TEHandle) m_macTE) ) ; + ClearCurrentScrap(); + TEToScrap() ; + MacRedrawControl() ; + } + else + { + ClearCurrentScrap(); + TXNCopy((TXNObject)m_macTXN); + TXNConvertToPublicScrap(); + } + } } void wxTextCtrl::Cut() { if (CanCut()) { - TEHandle teH ; - long size ; - - UMAGetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - TECut( teH ) ; -#if TARGET_CARBON - OSStatus err ; - err = ClearCurrentScrap( ); -#else - OSErr err ; - err = ZeroScrap( ); -#endif - TEToScrap() ; - // MacInvalidateControl() ; - } + if ( !m_macUsesTXN ) + { + TECut( ((TEHandle) m_macTE) ) ; + ClearCurrentScrap(); + TEToScrap() ; + MacRedrawControl() ; + } + else + { + ClearCurrentScrap(); + TXNCut((TXNObject)m_macTXN); + TXNConvertToPublicScrap(); + } + wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId); + event.SetString( GetValue() ) ; + event.SetEventObject( this ); + GetEventHandler()->ProcessEvent(event); + } } void wxTextCtrl::Paste() { if (CanPaste()) { - TEHandle teH ; - long size ; - - UMAGetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - TEFromScrap() ; - TEPaste( teH ) ; - WindowRef window = GetMacRootWindow() ; - if ( window ) - { - wxWindow* win = wxFindWinFromMacWindow( window ) ; - if ( win ) - { - wxMacDrawingHelper help( win ) ; - // the mac control manager always assumes to have the origin at 0,0 - SetOrigin( 0 , 0 ) ; - - bool hasTabBehind = false ; - wxWindow* parent = GetParent() ; - while ( parent ) - { - if( parent->MacGetWindowData() ) - { - UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ; - break ; - } - - if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) )) - { - if ( ((wxControl*)parent)->GetMacControl() ) - SetUpControlBackground( ((wxControl*)parent)->GetMacControl() , -1 , true ) ; - break ; - } - - parent = parent->GetParent() ; - } - - UMADrawControl( m_macControl ) ; - UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ; - } - } - } + if ( !m_macUsesTXN ) + { + TEFromScrap() ; + TEPaste( (TEHandle) m_macTE ) ; + MacRedrawControl() ; + } + else + { + TXNConvertFromPublicScrap(); + TXNPaste((TXNObject)m_macTXN); + } + wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId); + event.SetString( GetValue() ) ; + event.SetEventObject( this ); + GetEventHandler()->ProcessEvent(event); + } } bool wxTextCtrl::CanCopy() const @@ -310,6 +853,10 @@ bool wxTextCtrl::CanCopy() const bool wxTextCtrl::CanCut() const { + if ( !IsEditable() ) + { + return false ; + } // Can cut if there's a selection long from, to; GetSelection(& from, & to); @@ -321,47 +868,51 @@ bool wxTextCtrl::CanPaste() const if (!IsEditable()) return FALSE; - long offset ; + long offset ; #if TARGET_CARBON - OSStatus err = noErr; - ScrapRef scrapRef; - - err = GetCurrentScrap( &scrapRef ); - if ( err != noTypeErr && err != memFullErr ) - { + OSStatus err = noErr; + ScrapRef scrapRef; + + err = GetCurrentScrap( &scrapRef ); + if ( err != noTypeErr && err != memFullErr ) + { ScrapFlavorFlags flavorFlags; Size byteCount; - - if (( err = GetScrapFlavorFlags( scrapRef, 'TEXT', &flavorFlags )) == noErr) - { - if (( err = GetScrapFlavorSize( scrapRef, 'TEXT', &byteCount )) == noErr) - { - return TRUE ; - } - } - } - return FALSE; - + + if (( err = GetScrapFlavorFlags( scrapRef, 'TEXT', &flavorFlags )) == noErr) + { + if (( err = GetScrapFlavorSize( scrapRef, 'TEXT', &byteCount )) == noErr) + { + return TRUE ; + } + } + } + return FALSE; + #else - if ( GetScrap( NULL , 'TEXT' , &offset ) > 0 ) - { - return TRUE ; - } + if ( GetScrap( NULL , 'TEXT' , &offset ) > 0 ) + { + return TRUE ; + } #endif - return FALSE ; + return FALSE ; } void wxTextCtrl::SetEditable(bool editable) { + if ( editable != m_editable ) + { + m_editable = editable ; if ( editable ) - UMAActivateControl( m_macControl ) ; - else - UMADeactivateControl( m_macControl ) ; + UMAActivateControl( (ControlHandle) m_macControl ) ; + else + UMADeactivateControl((ControlHandle) m_macControl ) ; + } } void wxTextCtrl::SetInsertionPoint(long pos) { - SetSelection( pos , pos ) ; + SetSelection( pos , pos ) ; } void wxTextCtrl::SetInsertionPointEnd() @@ -372,72 +923,101 @@ void wxTextCtrl::SetInsertionPointEnd() long wxTextCtrl::GetInsertionPoint() const { - ControlEditTextSelectionRec selection ; - TEHandle teH ; - long size ; - - UMAGetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; -// UMAGetControlData( m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection , &size ) ; - return (**teH).selStart ; + long begin,end ; + GetSelection( &begin , &end ) ; + return begin ; } long wxTextCtrl::GetLastPosition() const { - ControlEditTextSelectionRec selection ; - TEHandle teH ; - long size ; - - UMAGetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - -// UMAGetControlData( m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection , &size ) ; - return (**teH).teLength ; + 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 ; + } + else + { + actualsize = GetHandleSize( theText ) ; + DisposeHandle( theText ) ; + } + return actualsize ; + } } void wxTextCtrl::Replace(long from, long to, const wxString& value) { - TEHandle teH ; - long size ; - - ControlEditTextSelectionRec selection ; + if ( !m_macUsesTXN ) + { + ControlEditTextSelectionRec selection ; - selection.selStart = from ; - selection.selEnd = to ; - UMASetControlData( m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ; - UMAGetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - TESetSelect( from , to , teH ) ; - TEDelete( teH ) ; - TEInsert( value , value.Length() , teH ) ; - Refresh() ; + selection.selStart = from ; + selection.selEnd = to ; + ::SetControlData((ControlHandle) m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ; + TESetSelect( from , to , ((TEHandle) m_macTE) ) ; + TEDelete( ((TEHandle) m_macTE) ) ; + TEInsert( value , value.Length() , ((TEHandle) m_macTE) ) ; + } + else + { + TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ; + TXNClear( ((TXNObject) m_macTXN) ) ; + TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*)value.c_str(), value.Length(), + kTXNUseCurrentSelection, kTXNUseCurrentSelection); + } + Refresh() ; } void wxTextCtrl::Remove(long from, long to) { - TEHandle teH ; - long size ; - + if ( !m_macUsesTXN ) + { ControlEditTextSelectionRec selection ; selection.selStart = from ; selection.selEnd = to ; - UMASetControlData( m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ; - UMAGetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - TEDelete( teH ) ; - Refresh() ; + ::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) ) ; + } + Refresh() ; } void wxTextCtrl::SetSelection(long from, long to) { + + if ( !m_macUsesTXN ) + { ControlEditTextSelectionRec selection ; - TEHandle teH ; - long size ; - - UMAGetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - selection.selStart = from ; selection.selEnd = to ; - UMASetControlData( m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ; - TESetSelect( selection.selStart , selection.selEnd , teH ) ; + 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 */ + tpvars = (STPTextPaneVars **) GetControlReference((ControlHandle) m_macControl); + /* and our drawing environment as the operation + may force a redraw in the text area. */ + SetPort((**tpvars).fDrawingEnvironment); + /* change the selection */ + TXNSetSelection( (**tpvars).fTXNRec, from, to); + } } bool wxTextCtrl::LoadFile(const wxString& file) @@ -452,17 +1032,21 @@ bool wxTextCtrl::LoadFile(const wxString& file) void wxTextCtrl::WriteText(const wxString& text) { - TEHandle teH ; - long size ; - - memcpy( wxBuffer, text , text.Length() ) ; - wxBuffer[text.Length() ] = 0 ; -// wxMacConvertNewlines( wxBuffer , wxBuffer ) ; - - UMAGetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - - TEInsert( wxBuffer , strlen( wxBuffer) , teH ) ; - Refresh() ; + wxString value ; + if( wxApp::s_macDefaultEncodingIsPC ) + value = wxMacMakeMacStringFromPC( text ) ; + else + value = text ; + if ( !m_macUsesTXN ) + { + TEInsert( value , value.Length() , ((TEHandle) m_macTE) ) ; + } + else + { + TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*) (const char*)value, value.Length(), + kTXNUseCurrentSelection, kTXNUseCurrentSelection); + } + MacRedrawControl() ; } void wxTextCtrl::AppendText(const wxString& text) @@ -473,8 +1057,20 @@ void wxTextCtrl::AppendText(const wxString& text) void wxTextCtrl::Clear() { - UMASetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 0 , (char*) ((const char*)NULL) ) ; - Refresh() ; + if ( !IsEditable() ) + { + 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); + } + Refresh() ; } bool wxTextCtrl::IsModified() const @@ -484,25 +1080,28 @@ bool wxTextCtrl::IsModified() const bool wxTextCtrl::IsEditable() const { - return IsEnabled(); + return IsEnabled() && m_editable ; } bool wxTextCtrl::AcceptsFocus() const { // we don't want focus if we can't be edited - return IsEditable() && wxControl::AcceptsFocus(); + return /*IsEditable() && */ wxControl::AcceptsFocus(); } wxSize wxTextCtrl::DoGetBestSize() const { int wText = 100 ; - - int hText ; - if ( UMAHasAppearance() ) - hText = 13 ; - else - hText = 24 ; - hText += 2 * m_macHorizontalBorder ; + + int hText; + if ( m_macUsesTXN ) + { + hText = 17 ; + } + else + { + hText = 13 ; + } /* int cx, cy; wxGetCharSize(GetHWND(), &cx, &cy, &GetFont()); @@ -515,8 +1114,10 @@ wxSize wxTextCtrl::DoGetBestSize() const */ if ( m_windowStyle & wxTE_MULTILINE ) { - hText *= wxMin(GetNumberOfLines(), 5); + hText *= 5 ; } + hText += 2 * m_macVerticalBorder ; + wText += 2 * m_macHorizontalBorder ; //else: for single line control everything is ok return wxSize(wText, hText); } @@ -557,15 +1158,15 @@ void wxTextCtrl::DiscardEdits() int wxTextCtrl::GetNumberOfLines() const { - Size actualsize; - UMAGetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ; - - int count = 1; - for (int i = 0; i < actualsize; i++) + // TODO change this if possible to reflect real lines + wxString content = GetValue() ; + + int count = 1; + for (int i = 0; i < content.Length() ; i++) { - if (wxBuffer[i] == '\r') count++; - } - + if (content[i] == '\r') count++; + } + return count; } @@ -587,59 +1188,57 @@ void wxTextCtrl::ShowPosition(long pos) int wxTextCtrl::GetLineLength(long lineNo) const { - Size actualsize; - UMAGetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ; + // TODO change this if possible to reflect real lines + wxString content = GetValue() ; // Find line first int count = 0; - for (int i = 0; i < actualsize; i++) - { - if (count == lineNo) - { - // Count chars in line then - count = 0; - for (int j = i; j < actualsize; j++) - { - count++; - if (wxBuffer[j] == '\r') return count; + for (int i = 0; i < content.Length() ; i++) + { + if (count == lineNo) + { + // Count chars in line then + count = 0; + for (int j = i; j < content.Length(); j++) + { + count++; + if (content[j] == '\r') return count; } return count; } - if (wxBuffer[i] == '\r') count++; + if (content[i] == '\r') count++; } - return 0; } wxString wxTextCtrl::GetLineText(long lineNo) const { - Size actualsize; - UMAGetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ; - + // TODO change this if possible to reflect real lines + wxString content = GetValue() ; + // Find line first int count = 0; - for (int i = 0; i < actualsize; i++) - { - if (count == lineNo) - { - // Add chars in line then - wxString tmp(""); - - for (int j = i; j < actualsize; j++) + for (int i = 0; i < content.Length() ; i++) + { + if (count == lineNo) + { + // Add chars in line then + wxString tmp(""); + + for (int j = i; j < content.Length(); j++) { - if (wxBuffer[j] == '\r') + if (content[j] == '\r') return tmp; - tmp += wxBuffer[j]; + tmp += content[j]; } return tmp; } - if (wxBuffer[i] == '\r') count++; + if (content[i] == '\r') count++; } - - return wxString(""); + return "" ; } /* @@ -663,39 +1262,52 @@ void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event) void wxTextCtrl::OnChar(wxKeyEvent& event) { - switch ( event.KeyCode() ) + 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) ) ) +/* && key != WXK_PRIOR && key != WXK_NEXT && key != WXK_HOME && key != WXK_END */ + ) + { + // eat it + return ; + } + switch ( key ) { case WXK_RETURN: - if (m_windowStyle & wxPROCESS_ENTER) - { + if (m_windowStyle & wxPROCESS_ENTER) + { wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); event.SetEventObject( this ); + event.SetString( GetValue() ); if ( GetEventHandler()->ProcessEvent(event) ) return; - } + } if ( !(m_windowStyle & wxTE_MULTILINE) ) { - wxWindow *parent = GetParent(); - wxPanel *panel = wxDynamicCast(parent, wxPanel); - while ( parent != NULL && panel == NULL ) - { - parent = parent->GetParent() ; - panel = wxDynamicCast(parent, wxPanel); - } - if ( panel && panel->GetDefaultItem() ) - { - wxButton *def = wxDynamicCast(panel->GetDefaultItem(), + wxWindow *parent = GetParent(); + while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) { + parent = parent->GetParent() ; + } + if ( parent && parent->GetDefaultItem() ) + { + wxButton *def = wxDynamicCast(parent->GetDefaultItem(), wxButton); - if ( def && def->IsEnabled() ) - { - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); - event.SetEventObject(def); - def->Command(event); - return ; + if ( def && def->IsEnabled() ) + { + wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); + event.SetEventObject(def); + def->Command(event); + return ; } - } + } + + // this will make wxWindows eat the ENTER key so that + // we actually prevent line wrapping in a single line + // text control + eat_key = TRUE; } - //else: multiline controls need Enter for themselves break; @@ -712,26 +1324,62 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) if ( GetParent()->GetEventHandler()->ProcessEvent(eventNav) ) return; - event.Skip() ; - return ; + + event.Skip() ; + return; } break; } + + if (!eat_key) + { + // default handling + event.Skip() ; + } + if ( key >= 0x20 || + key == WXK_RETURN || + key == WXK_DELETE || + key == WXK_BACK) + { + wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId); + event1.SetString( GetValue() ) ; + event1.SetEventObject( this ); + wxPostEvent(GetEventHandler(),event1); + } +} - EventRecord *ev = wxTheApp->MacGetCurrentEvent() ; - short keycode ; - short keychar ; - keychar = short(ev->message & charCodeMask); - keycode = short(ev->message & keyCodeMask) >> 8 ; - UMAHandleControlKey( m_macControl , keycode , keychar , ev->modifiers ) ; - if ( keychar >= 0x20 || event.KeyCode() == WXK_RETURN || event.KeyCode() == WXK_DELETE || event.KeyCode() == WXK_BACK) - { - wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId); - event.SetString( GetValue() ) ; - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); - } +void wxTextCtrl::MacSuperShown( bool show ) +{ + 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, + (**(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, + (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.bottom + 30000, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.right, (**(STPTextPaneVars **)m_macTXNvars).fTXNFrame); + } +} +bool wxTextCtrl::Show(bool show) +{ + bool former = m_macControlIsShown ; + + bool retval = wxControl::Show( show ) ; + + if ( former != m_macControlIsShown ) + { + if ( m_macControlIsShown ) + 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 + 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); + } + + return retval ; } // ---------------------------------------------------------------------------- @@ -788,5 +1436,7 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event) event.Enable( CanRedo() ); } + + #endif // wxUSE_TEXTCTRL