X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3306aec1240b38347abda1ad776df32b6687ad01..a8b2285edf2eb1ef1dd1cb19abf130a871821dbf:/src/mac/carbon/textctrl.cpp diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp index 3ee3663952..fd154aae35 100644 --- a/src/mac/carbon/textctrl.cpp +++ b/src/mac/carbon/textctrl.cpp @@ -63,13 +63,7 @@ #endif #include "wx/mac/uma.h" - - -// if this is set to 1 then under OSX 10.2 the 'classic' MLTE implementation will be used -// if set to 0 then the unicode textctrl will be used -#ifndef wxMAC_AWAYS_USE_MLTE -#define wxMAC_AWAYS_USE_MLTE 1 -#endif +#include "wx/mac/carbon/private/mactext.h" #ifndef __WXMAC_OSX__ enum @@ -172,59 +166,6 @@ void* wxMacMPRemoteGUICall( classtype *object , void (classtype::*function)( con return result ; } -// common interface for all implementations -class wxMacTextControl : public wxMacControl -{ -public : - wxMacTextControl( wxTextCtrl *peer ) ; - virtual ~wxMacTextControl() ; - - virtual wxString GetStringValue() const = 0 ; - virtual void SetStringValue( const wxString &val ) = 0 ; - virtual void SetSelection( long from, long to ) = 0 ; - virtual void GetSelection( long* from, long* to ) const = 0 ; - virtual void WriteText( const wxString& str ) = 0 ; - - virtual void SetStyle( long start, long end, const wxTextAttr& style ) ; - virtual void Copy() ; - virtual void Cut() ; - virtual void Paste() ; - virtual bool CanPaste() const ; - virtual void SetEditable( bool editable ) ; - virtual wxTextPos GetLastPosition() const ; - virtual void Replace( long from, long to, const wxString &str ) ; - virtual void Remove( long from, long to ) ; - - - virtual bool HasOwnContextMenu() const - { return false ; } - - virtual bool SetupCursor( const wxPoint& pt ) - { return false ; } - - virtual void Clear() ; - virtual bool CanUndo() const; - virtual void Undo() ; - virtual bool CanRedo() const; - virtual void Redo() ; - virtual int GetNumberOfLines() const ; - virtual long XYToPosition(long x, long y) const; - virtual bool PositionToXY(long pos, long *x, long *y) const ; - virtual void ShowPosition(long WXUNUSED(pos)) ; - virtual int GetLineLength(long lineNo) const ; - virtual wxString GetLineText(long lineNo) const ; - -#ifndef __WXMAC_OSX__ - virtual void MacControlUserPaneDrawProc(wxInt16 part) = 0 ; - virtual wxInt16 MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) = 0 ; - virtual wxInt16 MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) = 0 ; - virtual void MacControlUserPaneIdleProc() = 0 ; - virtual wxInt16 MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) = 0 ; - virtual void MacControlUserPaneActivateProc(bool activating) = 0 ; - virtual wxInt16 MacControlUserPaneFocusProc(wxInt16 action) = 0 ; - virtual void MacControlUserPaneBackgroundProc(void* info) = 0 ; -#endif -} ; // common parts for implementations based on MLTE @@ -270,6 +211,12 @@ public : return false ; } + virtual void CheckSpelling(bool check) + { +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 + TXNSetSpellCheckAsYouType( m_txn, (Boolean) check ); +#endif + } virtual void Clear() ; virtual bool CanUndo() const ; @@ -319,38 +266,6 @@ protected : #endif -class wxMacUnicodeTextControl : public wxMacTextControl -{ -public : - wxMacUnicodeTextControl( wxTextCtrl *wxPeer, - const wxString& str, - const wxPoint& pos, - const wxSize& size, long style ) ; - virtual ~wxMacUnicodeTextControl(); - - virtual void VisibilityChanged(bool shown); - virtual wxString GetStringValue() const ; - virtual void SetStringValue( const wxString &str) ; - virtual void Copy(); - virtual void Cut(); - virtual void Paste(); - virtual bool CanPaste() const; - virtual void SetEditable(bool editable) ; - virtual void GetSelection( long* from, long* to) const ; - virtual void SetSelection( long from , long to ) ; - virtual void WriteText(const wxString& str) ; - -protected : - // contains the tag for the content (is different for password and non-password controls) - OSType m_valueTag ; - - // as the selection tag only works correctly when the control has the focus we have to mirror the - // intended value - EventHandlerRef m_focusHandlerRef ; -public : - ControlEditTextSelectionRec m_selection ; -}; - #endif // 'classic' MLTE implementation @@ -480,6 +395,27 @@ bool wxTextCtrl::Create( wxWindow *parent, style |= wxTE_PROCESS_ENTER ; } + CreatePeer( str, pos, size, style ); + + MacPostControlCreate(pos, size) ; + + // only now the embedding is correct and we can do a positioning update + + MacSuperChangedPosition() ; + + if ( m_windowStyle & wxTE_READONLY) + SetEditable( false ) ; + + SetCursor( wxCursor( wxCURSOR_IBEAM ) ) ; + + return true; +} + +void wxTextCtrl::CreatePeer( + const wxString& str, + const wxPoint& pos, + const wxSize& size, long style ) +{ bool forceMLTE = false ; #if wxUSE_SYSTEM_OPTIONS @@ -488,6 +424,9 @@ bool wxTextCtrl::Create( wxWindow *parent, forceMLTE = true ; } #endif +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + forceMLTE = false; +#endif #ifdef __WXMAC_OSX__ #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 @@ -500,26 +439,20 @@ bool wxTextCtrl::Create( wxWindow *parent, if ( !m_peer ) { +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 if ( !(m_windowStyle & wxTE_MULTILINE) && !forceMLTE ) +#endif + { m_peer = new wxMacUnicodeTextControl( this , str , pos , size , style ) ; + } } #endif + // the horizontal single line scrolling bug that made us keep +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 if ( !m_peer ) m_peer = new wxMacMLTEClassicControl( this , str , pos , size , style ) ; - - MacPostControlCreate(pos, size) ; - - // only now the embedding is correct and we can do a positioning update - - MacSuperChangedPosition() ; - - if ( m_windowStyle & wxTE_READONLY) - SetEditable( false ) ; - - SetCursor( wxCursor( wxCURSOR_IBEAM ) ) ; - - return true; +#endif } void wxTextCtrl::MacSuperChangedPosition() @@ -537,6 +470,11 @@ void wxTextCtrl::MacEnabledStateChanged() { } +void wxTextCtrl::MacCheckSpelling(bool check) +{ + GetPeer()->CheckSpelling(check); +} + wxString wxTextCtrl::GetValue() const { return GetPeer()->GetStringValue() ; @@ -547,20 +485,17 @@ void wxTextCtrl::GetSelection(long* from, long* to) const GetPeer()->GetSelection( from , to ) ; } -void wxTextCtrl::SetValue(const wxString& str) +void wxTextCtrl::DoSetValue(const wxString& str, int flags) { // optimize redraws if ( GetValue() == str ) - return ; + return; GetPeer()->SetStringValue( str ) ; - if ( m_triggerOnSetValue ) + if ( (flags & SetValue_SendEvent) && m_triggerOnSetValue ) { - wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId ); - event.SetString( GetValue() ); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent( event ); + SendTextUpdatedEvent(); } } @@ -1414,11 +1349,23 @@ static pascal OSStatus wxMacUnicodeTextControlEventHandler( EventHandlerCallRef DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacUnicodeTextControlEventHandler ) +wxMacUnicodeTextControl::wxMacUnicodeTextControl( wxTextCtrl *wxPeer ) : wxMacTextControl( wxPeer ) +{ +} + wxMacUnicodeTextControl::wxMacUnicodeTextControl( wxTextCtrl *wxPeer, const wxString& str, const wxPoint& pos, const wxSize& size, long style ) : wxMacTextControl( wxPeer ) +{ + Create( wxPeer, str, pos, size, style ); +} + +bool wxMacUnicodeTextControl::Create( wxTextCtrl *wxPeer, + const wxString& str, + const wxPoint& pos, + const wxSize& size, long style ) { m_font = wxPeer->GetFont() ; m_windowStyle = style ; @@ -1427,13 +1374,9 @@ wxMacUnicodeTextControl::wxMacUnicodeTextControl( wxTextCtrl *wxPeer, wxMacConvertNewlines10To13( &st ) ; wxMacCFStringHolder cf(st , m_font.GetEncoding()) ; CFStringRef cfr = cf ; - Boolean isPassword = ( m_windowStyle & wxTE_PASSWORD ) != 0 ; - m_valueTag = isPassword ? kControlEditTextPasswordCFStringTag : kControlEditTextCFStringTag ; - - OSStatus err = CreateEditUnicodeTextControl( - MAC_WXHWND(wxPeer->MacGetTopLevelWindowRef()), &bounds , cfr , - isPassword , NULL , &m_controlRef ) ; - verify_noerr( err ); + + m_valueTag = kControlEditTextCFStringTag ; + CreateControl( wxPeer, &bounds, cfr ); if ( !(m_windowStyle & wxTE_MULTILINE) ) SetData( kControlEditTextPart , kControlEditTextSingleLineTag , true ) ; @@ -1441,6 +1384,8 @@ wxMacUnicodeTextControl::wxMacUnicodeTextControl( wxTextCtrl *wxPeer, InstallControlEventHandler( m_controlRef , GetwxMacUnicodeTextControlEventHandlerUPP(), GetEventTypeCount(unicodeTextControlEventList), unicodeTextControlEventList, this, &m_focusHandlerRef); + + return true; } wxMacUnicodeTextControl::~wxMacUnicodeTextControl() @@ -1493,6 +1438,19 @@ void wxMacUnicodeTextControl::SetStringValue( const wxString &str ) verify_noerr( SetData( 0, m_valueTag , cf ) ) ; } +void wxMacUnicodeTextControl::CreateControl( wxTextCtrl* peer, const Rect* bounds, CFStringRef cfr ) +{ + Boolean isPassword = ( m_windowStyle & wxTE_PASSWORD ) != 0 ; + if ( isPassword ) + { + m_valueTag = kControlEditTextPasswordCFStringTag ; + } + OSStatus err = CreateEditUnicodeTextControl( + MAC_WXHWND(peer->MacGetTopLevelWindowRef()), bounds , cfr , + isPassword , NULL , &m_controlRef ) ; + verify_noerr( err ); +} + void wxMacUnicodeTextControl::Copy() { SendHICommand( kHICommandCopy ) ; @@ -1720,7 +1678,9 @@ void wxMacMLTEControl::SetStringValue( const wxString &str ) wxMacConvertNewlines10To13( &st ); { - wxMacWindowClipper c( m_peer ); +#ifndef __LP64__ + wxMacWindowClipper c( m_peer ) ; +#endif { wxMacEditHelper help( m_txn ); @@ -1901,7 +1861,7 @@ void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , lo #else typeAttr[attrCount].tag = kTXNATSUIStyle ; typeAttr[attrCount].size = kTXNATSUIStyleSize ; - typeAttr[attrCount].data.dataValue = (UInt32)font.MacGetATSUStyle() ; + typeAttr[attrCount].data.dataPtr = font.MacGetATSUStyle() ; attrCount++ ; #endif } @@ -1995,7 +1955,9 @@ void wxMacMLTEControl::Replace( long from , long to , const wxString &str ) wxMacConvertNewlines10To13( &value ) ; wxMacEditHelper help( m_txn ) ; +#ifndef __LP64__ wxMacWindowClipper c( m_peer ) ; +#endif TXNSetSelection( m_txn, from, to ) ; TXNClear( m_txn ) ; @@ -2004,7 +1966,9 @@ void wxMacMLTEControl::Replace( long from , long to , const wxString &str ) void wxMacMLTEControl::Remove( long from , long to ) { +#ifndef __LP64__ wxMacWindowClipper c( m_peer ) ; +#endif wxMacEditHelper help( m_txn ) ; TXNSetSelection( m_txn , from , to ) ; TXNClear( m_txn ) ; @@ -2017,7 +1981,9 @@ void wxMacMLTEControl::GetSelection( long* from, long* to) const void wxMacMLTEControl::SetSelection( long from , long to ) { +#ifndef __LP64__ wxMacWindowClipper c( m_peer ) ; +#endif // change the selection if ((from == -1) && (to == -1)) @@ -2036,7 +2002,9 @@ void wxMacMLTEControl::WriteText( const wxString& str ) long start , end , dummy ; GetSelection( &start , &dummy ) ; +#ifndef __LP64__ wxMacWindowClipper c( m_peer ) ; +#endif { wxMacEditHelper helper( m_txn ) ; @@ -2050,7 +2018,9 @@ void wxMacMLTEControl::WriteText( const wxString& str ) void wxMacMLTEControl::Clear() { +#ifndef __LP64__ wxMacWindowClipper c( m_peer ) ; +#endif wxMacEditHelper st( m_txn ) ; TXNSetSelection( m_txn , kTXNStartOffset , kTXNEndOffset ) ; TXNClear( m_txn ) ; @@ -2168,30 +2138,24 @@ bool wxMacMLTEControl::PositionToXY( long pos, long *x, long *y ) const void wxMacMLTEControl::ShowPosition( long pos ) { -#if TARGET_RT_MAC_MACHO && defined(AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER) - { - Point current, desired ; - TXNOffset selstart, selend; + Point current, desired ; + TXNOffset selstart, selend; - TXNGetSelection( m_txn, &selstart, &selend ); - TXNOffsetToPoint( m_txn, selstart, ¤t ); - TXNOffsetToPoint( m_txn, pos, &desired ); + TXNGetSelection( m_txn, &selstart, &selend ); + TXNOffsetToPoint( m_txn, selstart, ¤t ); + TXNOffsetToPoint( m_txn, pos, &desired ); - // TODO: use HIPoints for 10.3 and above - if ( (UInt32)TXNScroll != (UInt32)kUnresolvedCFragSymbolAddress ) - { - OSErr theErr = noErr; - SInt32 dv = desired.v - current.v; - SInt32 dh = desired.h - current.h; - TXNShowSelection( m_txn, kTXNShowStart ) ; // NB: should this be kTXNShowStart or kTXNShowEnd ?? - theErr = TXNScroll( m_txn, kTXNScrollUnitsInPixels, kTXNScrollUnitsInPixels, &dv, &dh ); - - // there will be an error returned for classic MLTE implementation when the control is - // invisible, but HITextView works correctly, so we don't assert that one - // wxASSERT_MSG( theErr == noErr, _T("TXNScroll returned an error!") ); - } - } -#endif + // TODO: use HIPoints for 10.3 and above + + OSErr theErr = noErr; + long dv = desired.v - current.v; + long dh = desired.h - current.h; + TXNShowSelection( m_txn, kTXNShowStart ) ; // NB: should this be kTXNShowStart or kTXNShowEnd ?? + theErr = TXNScroll( m_txn, kTXNScrollUnitsInPixels, kTXNScrollUnitsInPixels, &dv, &dh ); + + // there will be an error returned for classic MLTE implementation when the control is + // invisible, but HITextView works correctly, so we don't assert that one + // wxASSERT_MSG( theErr == noErr, _T("TXNScroll returned an error!") ); } void wxMacMLTEControl::SetTXNData( const wxString& st, TXNOffset start, TXNOffset end ) @@ -2292,6 +2256,8 @@ int wxMacMLTEControl::GetLineLength(long lineNo) const return theLength ; } +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 + // ---------------------------------------------------------------------------- // MLTE control implementation (classic part) // ---------------------------------------------------------------------------- @@ -2979,6 +2945,7 @@ OSStatus wxMacMLTEClassicControl::DoCreate() return err; } +#endif // ---------------------------------------------------------------------------- // MLTE control implementation (OSX part) @@ -3060,12 +3027,20 @@ wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer, m_scrollView = NULL ; TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( style ) ; - if ( frameOptions & (kTXNWantVScrollBarMask | kTXNWantHScrollBarMask) ) + if (( frameOptions & (kTXNWantVScrollBarMask | kTXNWantHScrollBarMask)) || !(frameOptions &kTXNSingleLineOnlyMask)) { - HIScrollViewCreate( - (frameOptions & kTXNWantHScrollBarMask ? kHIScrollViewOptionsHorizScroll : 0) - | (frameOptions & kTXNWantVScrollBarMask ? kHIScrollViewOptionsVertScroll : 0) , - &m_scrollView ) ; + if ( frameOptions & (kTXNWantVScrollBarMask | kTXNWantHScrollBarMask) ) + { + HIScrollViewCreate( + (frameOptions & kTXNWantHScrollBarMask ? kHIScrollViewOptionsHorizScroll : 0) + | (frameOptions & kTXNWantVScrollBarMask ? kHIScrollViewOptionsVertScroll : 0) , + &m_scrollView ) ; + } + else + { + HIScrollViewCreate(kHIScrollViewOptionsVertScroll,&m_scrollView); + HIScrollViewSetScrollBarAutoHide(m_scrollView,true); + } HIViewSetFrame( m_scrollView, &hr ); HIViewSetVisible( m_scrollView, true ); @@ -3088,8 +3063,9 @@ wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer, } AdjustCreationAttributes( *wxWHITE , true ) ; - +#ifndef __LP64__ wxMacWindowClipper c( m_peer ) ; +#endif SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ; TXNSetSelection( m_txn, 0, 0 );