X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45c8d9e52a7e612541688ea205c4e4de86d9757a..fa2f5d3bc9563c2b88282d5487758572d8baffb3:/src/mac/carbon/textctrl.cpp diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp index f69d2f0e9e..05da8899ac 100644 --- a/src/mac/carbon/textctrl.cpp +++ b/src/mac/carbon/textctrl.cpp @@ -23,7 +23,14 @@ #else #include #endif -#include + +#if wxUSE_STD_IOSTREAM + #if wxUSE_IOSTREAMH + #include + #else + #include + #endif +#endif #include "wx/app.h" #include "wx/dc.h" @@ -51,7 +58,10 @@ #include "TextEncodingConverter.h" #include "wx/mac/uma.h" +#define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL + extern wxApp *wxTheApp ; +extern wxControl *wxFindControlFromMacControl(ControlHandle inControl ) ; // CS:TODO we still have a problem getting properly at the text events of a control because under Carbon // the MLTE engine registers itself for the key events thus the normal flow never occurs, the only measure for the @@ -83,7 +93,7 @@ extern wxApp *wxTheApp ; 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); +OSStatus mUPOpenControl(ControlHandle theControl, long wxStyle); /* Utility Routines */ @@ -130,7 +140,7 @@ typedef struct { /* our focus advance override routine */ EventHandlerUPP handlerUPP; EventHandlerRef handlerRef; - bool fMultiline ; + bool fMultiline ; } STPTextPaneVars; @@ -194,26 +204,28 @@ static pascal void TPPaneDrawProc(ControlRef theControl, ControlPartCode thePart /* save the drawing state */ SetPort((**tpvars).fDrawingEnvironment); - /* verify our boundary */ + /* 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)); + + wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ; + if ( ! EqualRect(&bounds, &varsp->fRFocusOutline) ) { + // scrollbar is on the border, we add one + Rect oldbounds = varsp->fRFocusOutline ; + InsetRect( &oldbounds , -1 , -1 ) ; + + 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); + 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 ) ; + RGBColor white = { 65535 , 65535 , 65535 } ; + RGBBackColor( &white ) ; EraseRgn(varsp->fTextBackgroundRgn); TXNDraw(varsp->fTXNRec, NULL); /* restore the drawing environment */ @@ -222,6 +234,7 @@ static pascal void TPPaneDrawProc(ControlRef theControl, ControlPartCode thePart if ((**tpvars).fIsActive && varsp->fInFocus) DrawThemeFocusRect(&varsp->fRFocusOutline, true); /* release our globals */ HSetState((Handle) tpvars, state); + } } @@ -282,6 +295,7 @@ static pascal ControlPartCode TPPaneTrackingProc(ControlHandle theControl, Point /* handle clicks in the text part */ case kmUPTextPart: { SetPort((**tpvars).fDrawingEnvironment); + wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ; TXNClick( varsp->fTXNRec, (const EventRecord*) wxTheApp->MacGetCurrentEvent()); } break; @@ -312,6 +326,7 @@ static pascal void TPPaneIdleProc(ControlHandle theControl) { varsp = *tpvars; /* get the current mouse coordinates (in our window) */ SetPortWindowPort(GetControlOwner(theControl)); + wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ; GetMouse(&mousep); /* there's a 'focus thing' and an 'unfocused thing' */ if (varsp->fInFocus) { @@ -324,12 +339,18 @@ static pascal void TPPaneIdleProc(ControlHandle theControl) { RectRgn((theRgn = NewRgn()), &varsp->fRTextArea); TXNAdjustCursor(varsp->fTXNRec, theRgn); DisposeRgn(theRgn); - } else SetThemeCursor(kThemeArrowCursor); + } + else + { + // SetThemeCursor(kThemeArrowCursor); + } } else { /* if it's in our bounds, set the cursor */ GetControlBounds(theControl, &bounds); if (PtInRect(mousep, &bounds)) - SetThemeCursor(kThemeArrowCursor); + { + // SetThemeCursor(kThemeArrowCursor); + } } HSetState((Handle) tpvars, state); @@ -349,6 +370,7 @@ static pascal ControlPartCode TPPaneKeyDownProc(ControlHandle theControl, if ((**tpvars).fInFocus) { /* turn autoscrolling on and send the key event to text edit */ SetPort((**tpvars).fDrawingEnvironment); + wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ; EventRecord ev ; memset( &ev , 0 , sizeof( ev ) ) ; ev.what = keyDown ; @@ -376,6 +398,7 @@ static pascal void TPPaneActivateProc(ControlHandle theControl, Boolean activati varsp = *tpvars; /* de/activate the text edit record */ SetPort((**tpvars).fDrawingEnvironment); + wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ; GetControlBounds(theControl, &bounds); varsp->fIsActive = activating; TPActivatePaneText(tpvars, varsp->fIsActive && varsp->fInFocus); @@ -421,6 +444,7 @@ static pascal ControlPartCode TPPaneFocusProc(ControlHandle theControl, ControlF define your own value for handling click-to-focus type events. */ /* save the drawing state */ SetPort((**tpvars).fDrawingEnvironment); + wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ; /* calculate the next highlight state */ switch (action) { default: @@ -451,42 +475,42 @@ static pascal ControlPartCode TPPaneFocusProc(ControlHandle theControl, ControlF /* 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) + 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, long wxStyle ) { - 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); + Rect bounds; + WindowRef theWindow; + STPTextPaneVars **tpvars, *varsp; + 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); + 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 = wxStyle & wxTE_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); @@ -514,44 +538,66 @@ OSStatus mUPOpenControl(ControlHandle theControl, bool multiline) SetPort(varsp->fDrawingEnvironment); /* create the new edit field */ + + TXNFrameOptions frameOptions = + kTXNDontDrawCaretWhenInactiveMask ; + if ( ! ( wxStyle & wxTE_NOHIDESEL ) ) + frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ; + + if ( wxStyle & wxTE_MULTILINE ) + { + if ( ! ( wxStyle & wxTE_DONTWRAP ) ) + frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ; + else + { + frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ; + frameOptions |= kTXNWantHScrollBarMask ; + } + + if ( !(wxStyle & wxTE_NO_VSCROLL ) ) + frameOptions |= kTXNWantVScrollBarMask ; + } + else + frameOptions |= kTXNSingleLineOnlyMask ; + + if ( wxStyle & wxTE_READONLY ) + frameOptions |= kTXNReadOnlyMask ; + TXNNewObject(NULL, varsp->fOwner, &varsp->fRTextArea, - ( multiline ? kTXNWantVScrollBarMask : 0 ) | - kTXNDontDrawCaretWhenInactiveMask | - kTXNDontDrawSelectionWhenInactiveMask | - kTXNAlwaysWrapAtViewEdgeMask , + frameOptions , kTXNTextEditStyleFrameType, kTXNTextensionFile, kTXNSystemDefaultEncoding, &varsp->fTXNRec, &varsp->fTXNFrame, (TXNObjectRefcon) tpvars); - Str255 fontName ; - SInt16 fontSize ; - Style fontStyle ; - - GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ; + Str255 fontName ; + SInt16 fontSize ; + Style fontStyle ; + + GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ; - TXNTypeAttributes typeAttr[] = - { + TXNTypeAttributes typeAttr[] = + { { kTXNQDFontNameAttribute , kTXNQDFontNameAttributeSize , { (void*) fontName } } , - { kTXNQDFontSizeAttribute , kTXNFontSizeAttributeSize , { (void*) (fontSize << 16) } } , - { kTXNQDFontStyleAttribute , kTXNQDFontStyleAttributeSize , { (void*) normal } } , + { kTXNQDFontSizeAttribute , kTXNFontSizeAttributeSize , { (void*) (fontSize << 16) } } , + { kTXNQDFontStyleAttribute , kTXNQDFontStyleAttributeSize , { (void*) normal } } , } ; - OSStatus status = TXNSetTypeAttributes (varsp->fTXNRec, sizeof( typeAttr ) / sizeof(TXNTypeAttributes) , typeAttr, - kTXNStartOffset, - kTXNEndOffset); + err = 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; + return err; } @@ -585,6 +631,7 @@ wxTextCtrl::wxTextCtrl() m_macTXNvars = NULL ; m_macUsesTXN = false ; m_editable = true ; + m_maxLength = TE_UNLIMITED_LENGTH ; } wxTextCtrl::~wxTextCtrl() @@ -624,12 +671,12 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, return FALSE; wxSize mySize = size ; - if ( m_macUsesTXN ) - { - m_macHorizontalBorder = 5 ; // additional pixels around the real control - m_macVerticalBorder = 3 ; - } - else + if ( m_macUsesTXN ) + { + m_macHorizontalBorder = 5 ; // additional pixels around the real control + m_macVerticalBorder = 3 ; + } + else { m_macHorizontalBorder = 5 ; // additional pixels around the real control m_macVerticalBorder = 5 ; @@ -658,55 +705,61 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, m_windowStyle |= wxTE_PROCESS_ENTER; } + if ( m_windowStyle & wxTE_READONLY) + { + m_editable = FALSE ; + } 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 ; + 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 ) ; } - else - { + else + { short featurSet; - featurSet = kControlSupportsEmbedding | kControlSupportsFocus // | kControlWantsIdle + 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() ; - } - } + mUPOpenControl((ControlHandle) m_macControl, m_windowStyle ); + if ( parent ) + { + parent->MacGetTopLevelWindow()->MacInstallEventHandler() ; + } + } MacPostControlCreate() ; 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) ) ; + 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 { STPTextPaneVars **tpvars; - /* set up locals */ + /* set up locals */ tpvars = (STPTextPaneVars **) GetControlReference((ControlHandle) m_macControl); - /* set the text in the record */ + /* 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 ; + TXNSetSelection( (TXNObject) m_macTXN, 0, 0); + TXNShowSelection( (TXNObject) m_macTXN, kTXNShowStart); } return TRUE; @@ -715,32 +768,45 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, wxString wxTextCtrl::GetValue() const { 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 ) ; - } - } + + 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 ; + + wxString value; + if( wxApp::s_macDefaultEncodingIsPC ) - return wxMacMakePCStringFromMac( wxBuffer ) ; + { + value = wxMacMakePCStringFromMac( wxBuffer ) ; + value.Replace( "\r", "\n" ); + } else - return wxString(wxBuffer); + value = wxBuffer; + + + return value; } void wxTextCtrl::GetSelection(long* from, long* to) const @@ -758,24 +824,106 @@ void wxTextCtrl::GetSelection(long* from, long* to) const void wxTextCtrl::SetValue(const wxString& st) { - wxString value ; + wxString value; if( wxApp::s_macDefaultEncodingIsPC ) + { value = wxMacMakeMacStringFromPC( st ) ; + value.Replace( "\n", "\r" ); + } 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); - } + value = st; + + + if ( !m_macUsesTXN ) + { + ::SetControlData((ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , value.Length() , (char*) ((const char*)value) ) ; + } + else + { + bool formerEditable = IsEditable() ; + if ( !formerEditable ) + SetEditable(true) ; + TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*)value.c_str(), value.Length(), + kTXNStartOffset, kTXNEndOffset); + TXNSetSelection( (TXNObject) m_macTXN, 0, 0); + TXNShowSelection( (TXNObject) m_macTXN, kTXNShowStart); + if ( !formerEditable ) + SetEditable(formerEditable) ; + } MacRedrawControl() ; } +void wxTextCtrl::SetMaxLength(unsigned long len) +{ + m_maxLength = len ; +} + +bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style) +{ + if ( m_macUsesTXN ) + { + bool formerEditable = IsEditable() ; + if ( !formerEditable ) + SetEditable(true) ; + TXNTypeAttributes typeAttr[4] ; + Str255 fontName = "\pMonaco" ; + SInt16 fontSize = 12 ; + Style fontStyle = normal ; + RGBColor color ; + int attrCounter = 0 ; + if ( style.HasFont() ) + { + const wxFont &font = style.GetFont() ; + CopyCStringToPascal( font.GetFaceName().c_str() , fontName ) ; + fontSize = font.GetPointSize() ; + if ( font.GetUnderlined() ) + fontStyle |= underline ; + if ( font.GetWeight() == wxBOLD ) + fontStyle |= bold ; + if ( font.GetStyle() == wxITALIC ) + fontStyle |= italic ; + + typeAttr[attrCounter].tag = kTXNQDFontNameAttribute ; + typeAttr[attrCounter].size = kTXNQDFontNameAttributeSize ; + typeAttr[attrCounter].data.dataPtr = (void*) fontName ; + typeAttr[attrCounter+1].tag = kTXNQDFontSizeAttribute ; + typeAttr[attrCounter+1].size = kTXNFontSizeAttributeSize ; + typeAttr[attrCounter+1].data.dataValue = (fontSize << 16) ; + typeAttr[attrCounter+2].tag = kTXNQDFontStyleAttribute ; + typeAttr[attrCounter+2].size = kTXNQDFontStyleAttributeSize ; + typeAttr[attrCounter+2].data.dataValue = fontStyle ; + attrCounter += 3 ; + + } + if ( style.HasTextColour() ) + { + typeAttr[attrCounter].tag = kTXNQDFontColorAttribute ; + typeAttr[attrCounter].size = kTXNQDFontColorAttributeSize ; + typeAttr[attrCounter].data.dataPtr = (void*) &color ; + color = MAC_WXCOLORREF(style.GetTextColour().GetPixel()) ; + attrCounter += 1 ; + } + + if ( attrCounter > 0 ) + { + OSStatus status = TXNSetTypeAttributes ((TXNObject)m_macTXN, attrCounter , typeAttr, + start,end); + wxASSERT_MSG( status == noErr , "Couldn't set text attributes" ) ; + } + if ( !formerEditable ) + SetEditable(formerEditable) ; + } + return TRUE ; +} + +bool wxTextCtrl::SetDefaultStyle(const wxTextAttr& style) +{ + wxTextCtrlBase::SetDefaultStyle( style ) ; + SetStyle( kTXNUseCurrentSelection , kTXNUseCurrentSelection , GetDefaultStyle() ) ; + return TRUE ; +} + // Clipboard operations void wxTextCtrl::Copy() { @@ -783,17 +931,17 @@ void wxTextCtrl::Copy() { if ( !m_macUsesTXN ) { - TECopy( ((TEHandle) m_macTE) ) ; - ClearCurrentScrap(); - TEToScrap() ; - MacRedrawControl() ; - } - else - { + TECopy( ((TEHandle) m_macTE) ) ; + ClearCurrentScrap(); + TEToScrap() ; + MacRedrawControl() ; + } + else + { ClearCurrentScrap(); TXNCopy((TXNObject)m_macTXN); TXNConvertToPublicScrap(); - } + } } } @@ -803,22 +951,22 @@ void wxTextCtrl::Cut() { if ( !m_macUsesTXN ) { - TECut( ((TEHandle) m_macTE) ) ; - ClearCurrentScrap(); - TEToScrap() ; - MacRedrawControl() ; + TECut( ((TEHandle) m_macTE) ) ; + ClearCurrentScrap(); + TEToScrap() ; + MacRedrawControl() ; } - else - { + 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() @@ -831,11 +979,12 @@ void wxTextCtrl::Paste() TEPaste( (TEHandle) m_macTE ) ; MacRedrawControl() ; } - else - { + else + { TXNConvertFromPublicScrap(); TXNPaste((TXNObject)m_macTXN); - } + SetStyle( kTXNUseCurrentSelection , kTXNUseCurrentSelection , GetDefaultStyle() ) ; + } wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId); event.SetString( GetValue() ) ; event.SetEventObject( this ); @@ -868,7 +1017,6 @@ bool wxTextCtrl::CanPaste() const if (!IsEditable()) return FALSE; - long offset ; #if TARGET_CARBON OSStatus err = noErr; ScrapRef scrapRef; @@ -876,8 +1024,8 @@ bool wxTextCtrl::CanPaste() const err = GetCurrentScrap( &scrapRef ); if ( err != noTypeErr && err != memFullErr ) { - ScrapFlavorFlags flavorFlags; - Size byteCount; + ScrapFlavorFlags flavorFlags; + Size byteCount; if (( err = GetScrapFlavorFlags( scrapRef, 'TEXT', &flavorFlags )) == noErr) { @@ -890,6 +1038,7 @@ bool wxTextCtrl::CanPaste() const return FALSE; #else + long offset ; if ( GetScrap( NULL , 'TEXT' , &offset ) > 0 ) { return TRUE ; @@ -903,10 +1052,19 @@ void wxTextCtrl::SetEditable(bool editable) if ( editable != m_editable ) { m_editable = editable ; - if ( editable ) - UMAActivateControl( (ControlHandle) m_macControl ) ; + if ( !m_macUsesTXN ) + { + if ( editable ) + UMAActivateControl( (ControlHandle) m_macControl ) ; + else + UMADeactivateControl((ControlHandle) m_macControl ) ; + } else - UMADeactivateControl((ControlHandle) m_macControl ) ; + { + TXNControlTag tag[] = { kTXNIOPrivilegesTag } ; + TXNControlData data[] = { { editable ? kTXNReadWrite : kTXNReadOnly } } ; + TXNSetTXNObjectControls( (TXNObject) m_macTXN , false , sizeof(tag) / sizeof (TXNControlTag) , tag , data ) ; + } } } @@ -957,22 +1115,27 @@ void wxTextCtrl::Replace(long from, long to, const wxString& value) { if ( !m_macUsesTXN ) { - ControlEditTextSelectionRec selection ; + ControlEditTextSelectionRec selection ; - 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); - } + 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 + { + bool formerEditable = IsEditable() ; + if ( !formerEditable ) + SetEditable(true) ; + TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ; + TXNClear( ((TXNObject) m_macTXN) ) ; + TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*)value.c_str(), value.Length(), + kTXNUseCurrentSelection, kTXNUseCurrentSelection); + if ( !formerEditable ) + SetEditable( formerEditable ) ; + } Refresh() ; } @@ -980,17 +1143,22 @@ void wxTextCtrl::Remove(long from, long to) { if ( !m_macUsesTXN ) { - ControlEditTextSelectionRec selection ; + ControlEditTextSelectionRec selection ; - selection.selStart = from ; - selection.selEnd = to ; - ::SetControlData( (ControlHandle) m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ; - TEDelete( ((TEHandle) m_macTE) ) ; + selection.selStart = from ; + selection.selEnd = to ; + ::SetControlData( (ControlHandle) m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ; + TEDelete( ((TEHandle) m_macTE) ) ; } else { + bool formerEditable = IsEditable() ; + if ( !formerEditable ) + SetEditable(true) ; TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ; TXNClear( ((TXNObject) m_macTXN) ) ; + if ( !formerEditable ) + SetEditable( formerEditable ) ; } Refresh() ; } @@ -1009,14 +1177,15 @@ void wxTextCtrl::SetSelection(long from, long to) } 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); + 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); + TXNShowSelection( (TXNObject) m_macTXN, kTXNShowStart); } } @@ -1033,20 +1202,33 @@ bool wxTextCtrl::LoadFile(const wxString& file) void wxTextCtrl::WriteText(const wxString& text) { wxString value ; - if( wxApp::s_macDefaultEncodingIsPC ) - value = wxMacMakeMacStringFromPC( text ) ; - else - value = text ; + if( wxApp::s_macDefaultEncodingIsPC ) + { + value = wxMacMakeMacStringFromPC( text ) ; + value.Replace( "\n", "\r" ); + } + 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() ; + TEInsert( value , value.Length() , ((TEHandle) m_macTE) ) ; + } + else + { + bool formerEditable = IsEditable() ; + if ( !formerEditable ) + SetEditable(true) ; + long start , end , dummy ; + GetSelection( &start , &dummy ) ; + TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*) (const char*)value, value.Length(), + kTXNUseCurrentSelection, kTXNUseCurrentSelection); + GetSelection( &dummy , &end ) ; + SetStyle( start , end , GetDefaultStyle() ) ; + if ( !formerEditable ) + SetEditable( formerEditable ) ; + } + MacRedrawControl() ; } void wxTextCtrl::AppendText(const wxString& text) @@ -1063,12 +1245,12 @@ void wxTextCtrl::Clear() } if ( !m_macUsesTXN ) { - ::SetControlData((ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 0 , (char*) ((const char*)NULL) ) ; + ::SetControlData((ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 0 , (char*) ((const char*)NULL) ) ; } else { - ClearCurrentScrap(); - TXNClear((TXNObject)m_macTXN); + TXNSetSelection( (TXNObject)m_macTXN , kTXNStartOffset , kTXNEndOffset ) ; + TXNClear((TXNObject)m_macTXN); } Refresh() ; } @@ -1094,14 +1276,14 @@ wxSize wxTextCtrl::DoGetBestSize() const int wText = 100 ; int hText; - if ( m_macUsesTXN ) - { - hText = 17 ; - } - else - { - hText = 13 ; - } + if ( m_macUsesTXN ) + { + hText = 17 ; + } + else + { + hText = 13 ; + } /* int cx, cy; wxGetCharSize(GetHWND(), &cx, &cy, &GetFont()); @@ -1162,9 +1344,9 @@ int wxTextCtrl::GetNumberOfLines() const wxString content = GetValue() ; int count = 1; - for (int i = 0; i < content.Length() ; i++) - { - if (content[i] == '\r') count++; + for (size_t i = 0; i < content.Length() ; i++) + { + if (content[i] == '\r') count++; } return count; @@ -1190,25 +1372,25 @@ int wxTextCtrl::GetLineLength(long lineNo) const { // TODO change this if possible to reflect real lines wxString content = GetValue() ; - - // Find line first - int count = 0; - for (int i = 0; i < content.Length() ; i++) + + // Find line first + int count = 0; + for (size_t i = 0; i < content.Length() ; i++) { if (count == lineNo) { // Count chars in line then count = 0; - for (int j = i; j < content.Length(); j++) + for (size_t j = i; j < content.Length(); j++) { count++; - if (content[j] == '\r') return count; - } - - return count; - } - if (content[i] == '\r') count++; - } + if (content[j] == '\r') return count; + } + + return count; + } + if (content[i] == '\r') count++; + } return 0; } @@ -1217,28 +1399,28 @@ wxString wxTextCtrl::GetLineText(long lineNo) const // TODO change this if possible to reflect real lines wxString content = GetValue() ; - // Find line first - int count = 0; - for (int i = 0; i < content.Length() ; i++) + // Find line first + int count = 0; + for (size_t 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 (content[j] == '\r') - return tmp; - - tmp += content[j]; - } - - return tmp; - } - if (content[i] == '\r') count++; - } - return "" ; + for (size_t j = i; j < content.Length(); j++) + { + if (content[j] == '\r') + return tmp; + + tmp += content[j]; + } + + return tmp; + } + if (content[i] == '\r') count++; + } + return "" ; } /* @@ -1265,6 +1447,13 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) int key = event.GetKeyCode() ; bool eat_key = false ; + if ( key == 'c' && event.MetaDown() ) + { + if ( CanCopy() ) + Copy() ; + return ; + } + if ( !IsEditable() && key != WXK_LEFT && key != WXK_RIGHT && key != WXK_DOWN && key != WXK_UP && key != WXK_TAB && !( key == WXK_RETURN && ( (m_windowStyle & wxPROCESS_ENTER) || (m_windowStyle & wxTE_MULTILINE) ) ) /* && key != WXK_PRIOR && key != WXK_NEXT && key != WXK_HOME && key != WXK_END */ @@ -1273,6 +1462,18 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) // eat it return ; } + if ( key == 'v' && event.MetaDown() ) + { + if ( CanPaste() ) + Paste() ; + return ; + } + if ( key == 'x' && event.MetaDown() ) + { + if ( CanCut() ) + Cut() ; + return ; + } switch ( key ) { case WXK_RETURN: @@ -1336,7 +1537,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) // default handling event.Skip() ; } - if ( key >= 0x20 || + if ( ( key >= 0x20 && key < WXK_START ) || key == WXK_RETURN || key == WXK_DELETE || key == WXK_BACK) @@ -1355,11 +1556,11 @@ void wxTextCtrl::MacSuperShown( bool 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); + 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); + 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); } } @@ -1369,14 +1570,14 @@ bool wxTextCtrl::Show(bool show) bool retval = wxControl::Show( show ) ; - if ( former != m_macControlIsShown ) + if ( former != m_macControlIsShown && show ) { 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); + 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); + 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 ; @@ -1436,7 +1637,13 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event) event.Enable( CanRedo() ); } - +bool wxTextCtrl::MacSetupCursor( const wxPoint& pt ) +{ + if ( m_macUsesTXN ) + return true ; + else + return wxWindow::MacSetupCursor( pt ) ; +} #endif // wxUSE_TEXTCTRL