X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d84afea9d1ec41ee4e2ebb3bf6b87926cf5f04d1..baf52e1ccd454f351eb9825bb147400f82f4a85f:/src/mac/textctrl.cpp?ds=sidebyside diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp index f479c01bb7..4517542013 100644 --- a/src/mac/textctrl.cpp +++ b/src/mac/textctrl.cpp @@ -44,691 +44,12 @@ #ifndef __DARWIN__ #include -#include -#endif -#include "wx/mac/uma.h" - -#define wxUSE_MLTE 0 - -#if wxUSE_MLTE == 0 // old textctrl implementation - -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl) - -BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) - 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) - EVT_MENU(wxID_UNDO, wxTextCtrl::OnUndo) - EVT_MENU(wxID_REDO, wxTextCtrl::OnRedo) - - EVT_UPDATE_UI(wxID_CUT, wxTextCtrl::OnUpdateCut) - EVT_UPDATE_UI(wxID_COPY, wxTextCtrl::OnUpdateCopy) - EVT_UPDATE_UI(wxID_PASTE, wxTextCtrl::OnUpdatePaste) - EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo) - EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo) -END_EVENT_TABLE() -#endif - -// Text item -wxTextCtrl::wxTextCtrl() -{ -} - -const short kVerticalMargin = 2 ; -const short kHorizontalMargin = 2 ; - -bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, - const wxString& st, - const wxPoint& pos, - const wxSize& size, long style, - const wxValidator& validator, - const wxString& name) -{ - // base initialization - if ( !CreateBase(parent, id, pos, size, style, validator, name) ) - return FALSE; - - wxSize mySize = size ; - if ( UMAHasAppearance() ) - { - m_macHorizontalBorder = 5 ; // additional pixels around the real control - m_macVerticalBorder = 5 ; - } - else - { - m_macHorizontalBorder = 0 ; // additional pixels around the real control - m_macVerticalBorder = 0 ; - } - - - 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 ) ; - - if ( m_windowStyle & wxTE_MULTILINE ) - { - wxASSERT_MSG( !(m_windowStyle & wxTE_PROCESS_ENTER), - wxT("wxTE_PROCESS_ENTER style is ignored for multiline text controls (they always process it)") ); - - m_windowStyle |= wxTE_PROCESS_ENTER; - } - - - m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , "\p" , true , 0 , 0 , 1, - ( style & wxTE_PASSWORD ) ? kControlEditTextPasswordProc : kControlEditTextProc , (long) this ) ; - MacPostControlCreate() ; - - wxString value ; - - { - TEHandle teH ; - long size ; - - ::GetControlData( (ControlHandle) m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - (*teH)->lineHeight = -1 ; - } - - if( wxApp::s_macDefaultEncodingIsPC ) - value = wxMacMakeMacStringFromPC( st ) ; - else - value = st ; - ::SetControlData( (ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , value.Length() , (char*) ((const char*)value) ) ; - - return TRUE; -} - -wxString wxTextCtrl::GetValue() const -{ - Size actualsize; - ::GetControlData( (ControlHandle) 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); -} - -void wxTextCtrl::GetSelection(long* from, long* to) const -{ - ControlEditTextSelectionRec selection ; - TEHandle teH ; - long size ; - - ::GetControlData( (ControlHandle) m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - - *from = (**teH).selStart; - *to = (**teH).selEnd; -} - -void wxTextCtrl::SetValue(const wxString& st) -{ - wxString value ; - - if( wxApp::s_macDefaultEncodingIsPC ) - value = wxMacMakeMacStringFromPC( st ) ; - else - value = st ; - ::SetControlData( (ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , value.Length() , (char*) ((const char*)value) ) ; - - MacRedrawControl() ; - Update(); -} - -// Clipboard operations -void wxTextCtrl::Copy() -{ - if (CanCopy()) - { - TEHandle teH ; - long size ; - - ::GetControlData( (ControlHandle) m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - TECopy( teH ) ; - ClearCurrentScrap(); - TEToScrap() ; - } -} - -void wxTextCtrl::Cut() -{ - if (CanCut()) - { - TEHandle teH ; - long size ; - - ::GetControlData( (ControlHandle) m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - TECut( teH ) ; - ClearCurrentScrap(); - TEToScrap() ; - // MacInvalidateControl() ; - } -} - -void wxTextCtrl::Paste() -{ - if (CanPaste()) - { - TEHandle teH ; - long size ; - - ::GetControlData( (ControlHandle) m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - TEFromScrap() ; - TEPaste( teH ) ; - MacRedrawControl() ; - } -} - -bool wxTextCtrl::CanCopy() const -{ - // Can copy if there's a selection - long from, to; - GetSelection(& from, & to); - return (from != to); -} - -bool wxTextCtrl::CanCut() const -{ - // Can cut if there's a selection - long from, to; - GetSelection(& from, & to); - return (from != to); -} - -bool wxTextCtrl::CanPaste() const -{ - if (!IsEditable()) - return FALSE; - -#if TARGET_CARBON - 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; - -#else - long offset ; - if ( GetScrap( NULL , 'TEXT' , &offset ) > 0 ) - { - return TRUE ; - } -#endif - return FALSE ; -} - -void wxTextCtrl::SetEditable(bool editable) -{ - if ( editable ) - UMAActivateControl( (ControlHandle) m_macControl ) ; - else - UMADeactivateControl( (ControlHandle) m_macControl ) ; -} - -void wxTextCtrl::SetInsertionPoint(long pos) -{ - SetSelection( pos , pos ) ; -} - -void wxTextCtrl::SetInsertionPointEnd() -{ - long pos = GetLastPosition(); - SetInsertionPoint(pos); -} - -long wxTextCtrl::GetInsertionPoint() const -{ - // ControlEditTextSelectionRec selection ; - TEHandle teH ; - long size ; - - ::GetControlData( (ControlHandle) m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; -// ::GetControlData( (ControlHandle) m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection , &size ) ; - return (**teH).selStart ; -} - -long wxTextCtrl::GetLastPosition() const -{ - // ControlEditTextSelectionRec selection ; - TEHandle teH ; - long size ; - - ::GetControlData( (ControlHandle) m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - -// ::GetControlData( (ControlHandle) m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection , &size ) ; - return (**teH).teLength ; -} - -void wxTextCtrl::Replace(long from, long to, const wxString& value) -{ - TEHandle teH ; - long size ; - - ControlEditTextSelectionRec selection ; - - selection.selStart = from ; - selection.selEnd = to ; - ::SetControlData( (ControlHandle) m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ; - ::GetControlData( (ControlHandle) m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - TESetSelect( from , to , teH ) ; - TEDelete( teH ) ; - TEInsert( value , value.Length() , teH ) ; - Refresh() ; -} - -void wxTextCtrl::Remove(long from, long to) -{ - TEHandle teH ; - long size ; - - ControlEditTextSelectionRec selection ; - - selection.selStart = from ; - selection.selEnd = to ; - ::SetControlData( (ControlHandle) m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ; - ::GetControlData( (ControlHandle) m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - TEDelete( teH ) ; - Refresh() ; -} - -void wxTextCtrl::SetSelection(long from, long to) -{ - ControlEditTextSelectionRec selection ; - TEHandle teH ; - long size ; - - ::GetControlData( (ControlHandle) m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - - selection.selStart = from ; - selection.selEnd = to ; - - ::SetControlData( (ControlHandle) m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ; - TESetSelect( selection.selStart , selection.selEnd , teH ) ; -} - -bool wxTextCtrl::LoadFile(const wxString& file) -{ - if ( wxTextCtrlBase::LoadFile(file) ) - { - return TRUE; - } - - return FALSE; -} - -void wxTextCtrl::WriteText(const wxString& text) -{ - TEHandle teH ; - long size ; - - memcpy( wxBuffer, text , text.Length() ) ; - wxBuffer[text.Length() ] = 0 ; -// wxMacConvertNewlines( wxBuffer , wxBuffer ) ; - - ::GetControlData( (ControlHandle) m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - - TEInsert( wxBuffer , strlen( wxBuffer) , teH ) ; - Refresh() ; -} - -void wxTextCtrl::AppendText(const wxString& text) -{ - SetInsertionPointEnd(); - WriteText(text); -} - -void wxTextCtrl::Clear() -{ - ::SetControlData( (ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 0 , (char*) ((const char*)NULL) ) ; - Refresh() ; -} - -bool wxTextCtrl::IsModified() const -{ - return TRUE; -} - -bool wxTextCtrl::IsEditable() const -{ - return IsEnabled(); -} - -bool wxTextCtrl::AcceptsFocus() const -{ - // we don't want focus if we can't be edited - 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 cx, cy; - wxGetCharSize(GetHWND(), &cx, &cy, &GetFont()); - - int wText = DEFAULT_ITEM_WIDTH; - - int hText = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy); - - return wxSize(wText, hText); -*/ - if ( m_windowStyle & wxTE_MULTILINE ) - { - hText *= wxMin(GetNumberOfLines(), 5); - } - //else: for single line control everything is ok - return wxSize(wText, hText); -} - -// ---------------------------------------------------------------------------- -// Undo/redo -// ---------------------------------------------------------------------------- - -void wxTextCtrl::Undo() -{ - if (CanUndo()) - { - } -} - -void wxTextCtrl::Redo() -{ - if (CanRedo()) - { - } -} - -bool wxTextCtrl::CanUndo() const -{ - return FALSE ; -} - -bool wxTextCtrl::CanRedo() const -{ - return FALSE ; -} - -// Makes 'unmodified' -void wxTextCtrl::DiscardEdits() -{ - // TODO -} - -int wxTextCtrl::GetNumberOfLines() const -{ - Size actualsize; - ::GetControlData( (ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ; - - int count = 1; - for (int i = 0; i < actualsize; i++) - { - if (wxBuffer[i] == '\r') count++; - } - - return count; -} - -long wxTextCtrl::XYToPosition(long x, long y) const -{ - // TODO - return 0; -} - -bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const -{ - return FALSE ; -} - -void wxTextCtrl::ShowPosition(long pos) -{ - // TODO -} - -int wxTextCtrl::GetLineLength(long lineNo) const -{ - Size actualsize; - ::GetControlData( (ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ; - - // 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; - } - - return count; - } - if (wxBuffer[i] == '\r') count++; - } - - return 0; -} - -wxString wxTextCtrl::GetLineText(long lineNo) const -{ - Size actualsize; - ::GetControlData( (ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ; - - // 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++) - { - if (wxBuffer[j] == '\r') - return tmp; - - tmp += wxBuffer[j]; - } - - return tmp; - } - if (wxBuffer[i] == '\r') count++; - } - - return wxString(""); -} - -/* - * Text item - */ - -void wxTextCtrl::Command(wxCommandEvent & event) -{ - SetValue (event.GetString()); - ProcessCommand (event); -} - -void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event) -{ - // By default, load the first file into the text window. - if (event.GetNumberOfFiles() > 0) - { - LoadFile(event.GetFiles()[0]); - } -} - -void wxTextCtrl::OnChar(wxKeyEvent& key_event) -{ - bool eat_key = FALSE; - - switch ( key_event.KeyCode() ) - { - case WXK_RETURN: - 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(); - 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 ; - } - } - - // this will make wxWindows eat the ENTER key so that - // we actually prevent line wrapping in a single line - // text control - eat_key = TRUE; - } - - break; - - case WXK_TAB: - // always produce navigation event - even if we process TAB - // ourselves the fact that we got here means that the user code - // decided to skip processing of this TAB - probably to let it - // do its default job. - { - wxNavigationKeyEvent eventNav; - eventNav.SetDirection(!key_event.ShiftDown()); - eventNav.SetWindowChange(key_event.ControlDown()); - eventNav.SetEventObject(this); - - if ( GetParent()->GetEventHandler()->ProcessEvent(eventNav) ) - return; - - key_event.Skip() ; - return; - } - break; - } - - EventRecord *ev = (EventRecord*) wxTheApp->MacGetCurrentEvent(); - short keychar = short(ev->message & charCodeMask); - if (!eat_key) - { - short keycode = short(ev->message & keyCodeMask) >> 8 ; - ::HandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers ); - } - if ( keychar >= 0x20 || - key_event.KeyCode() == WXK_RETURN || - key_event.KeyCode() == WXK_DELETE || - key_event.KeyCode() == WXK_BACK) - { - wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId); - event.SetString( GetValue() ) ; - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); - } -} - -// ---------------------------------------------------------------------------- -// standard handlers for standard edit menu events -// ---------------------------------------------------------------------------- - -void wxTextCtrl::OnCut(wxCommandEvent& event) -{ - Cut(); -} - -void wxTextCtrl::OnCopy(wxCommandEvent& event) -{ - Copy(); -} - -void wxTextCtrl::OnPaste(wxCommandEvent& event) -{ - Paste(); -} - -void wxTextCtrl::OnUndo(wxCommandEvent& event) -{ - Undo(); -} - -void wxTextCtrl::OnRedo(wxCommandEvent& event) -{ - Redo(); -} - -void wxTextCtrl::OnUpdateCut(wxUpdateUIEvent& event) -{ - event.Enable( CanCut() ); -} - -void wxTextCtrl::OnUpdateCopy(wxUpdateUIEvent& event) -{ - event.Enable( CanCopy() ); -} - -void wxTextCtrl::OnUpdatePaste(wxUpdateUIEvent& event) -{ - event.Enable( CanPaste() ); -} - -void wxTextCtrl::OnUpdateUndo(wxUpdateUIEvent& event) -{ - event.Enable( CanUndo() ); -} - -void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event) -{ - event.Enable( CanRedo() ); -} - -#else +#endif +#include +#include "ATSUnicode.h" +#include "TextCommon.h" +#include "TextEncodingConverter.h" +#include "wx/mac/uma.h" extern wxApp *wxTheApp ; // CS:We will replace the TextEdit by using the MultiLanguageTextEngine based on the following code written by apple @@ -807,76 +128,10 @@ 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); - -/* mUPCloseControl deallocates all of the structures allocated - by mUPOpenControl. */ -OSStatus mUPCloseControl(ControlHandle theControl); - - - -/* routines for creating new scrolling text user pane controls. - These routines allow you to create new scrolling text - user pane controls. */ - -/* mUPCreateControl creates a new user pane control and then it passes it - to mUPOpenControl to initialize it as a scrolling text user pane control. */ -OSStatus mUPCreateControl(WindowPtr theWindow, Rect *bounds, ControlHandle *theControl); - -/* mUPDisposeControl calls mUPCloseControl and then it calls DisposeControl. */ -OSStatus mUPDisposeControl(ControlHandle theControl); - +OSStatus mUPOpenControl(ControlHandle theControl, bool multiline); /* Utility Routines */ - /* mUPSetText replaces the contents of the selection with the unicode - text described by the text and count parameters:. - text = pointer to unicode text buffer - count = number of bytes in the buffer. */ -OSStatus mUPSetText(ControlHandle theControl, char* text, long count); - -/* mUPGetText returns the current text data being displayed inside of - the mUPControl. When noErr is returned, *theText contain a new - handle containing all of the Unicode text copied from the current - selection. It is the caller's responsibiliby to dispose of this handle. */ -OSStatus mUPGetText(ControlHandle theControl, Handle *theText); - - -/* mUPSetSelection sets the text selection and autoscrolls the text view - so either the cursor or the selction is in the view. */ -void mUPSetSelection(ControlHandle theControl, long selStart, long selEnd); - - - -/* IsmUPControl returns true if theControl is not NULL - and theControl refers to a mUP Control. */ -Boolean IsmUPControl(ControlHandle theControl); - - - -/* Edit commands for mUP Controls. */ -enum { - kmUPCut = 1, - kmUPCopy = 2, - kmUPPaste = 3, - kmUPClear = 4 -}; - - -/* mUPDoEditCommand performs the editing command specified - in the editCommand parameter. The mUPControl's text - and scroll bar are redrawn and updated as necessary. */ -void mUPDoEditCommand(ControlHandle theControl, short editCommand); - - - - -/* mUPGetContents returns the entire contents of the control including the text - and the formatting information. */ -OSStatus mUPGetContents(ControlHandle theControl, Handle *theContents); -/* mUPSetContents replaces the contents of the selection with the data stored in the handle. */ -OSStatus mUPSetContents(ControlHandle theControl, Handle theContents); - enum { kShiftKeyCode = 56 }; @@ -904,6 +159,7 @@ typedef struct { /* OS records referenced */ TXNObject fTXNRec; /* the txn record */ TXNFrameID fTXNFrame; /* the txn frame ID */ + bool fMultiline ; ControlHandle fUserPaneRec; /* handle to the user pane control */ WindowPtr fOwner; /* window containing control */ GrafPtr fDrawingEnvironment; /* grafport where control is drawn */ @@ -938,8 +194,8 @@ ControlUserPaneFocusUPP gTPFocusProc = NULL; /* events handled by our focus advance override routine */ #if TARGET_CARBON -static const EventTypeSpec gMLTEEvents[] = { { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } }; -#define kMLTEEventCount (sizeof( gMLTEEvents ) / sizeof( EventTypeSpec )) +//static const EventTypeSpec gMLTEEvents[] = { { kEventClassTextInput, kEventUnicodeForKeyEvent } }; +//#define kMLTEEventCount (sizeof( gMLTEEvents ) / sizeof( EventTypeSpec )) #endif @@ -991,15 +247,24 @@ static pascal void TPPaneDrawProc(ControlRef theControl, ControlPartCode thePart SetPort((**tpvars).fDrawingEnvironment); /* verify our boundary */ GetControlBounds(theControl, &bounds); - if ( ! EqualRect(&bounds, &varsp->fRTextArea) ) { - 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, bounds.top, bounds.right, bounds.bottom); + 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, bounds.top, bounds.left, bounds.bottom, bounds.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 ) ; EraseRgn(varsp->fTextBackgroundRgn); TXNDraw(varsp->fTXNRec, NULL); /* restore the drawing environment */ @@ -1068,7 +333,7 @@ static pascal ControlPartCode TPPaneTrackingProc(ControlHandle theControl, Point /* handle clicks in the text part */ case kmUPTextPart: { SetPort((**tpvars).fDrawingEnvironment); - TXNClick( varsp->fTXNRec, GetCurrentEventRecord()); + TXNClick( varsp->fTXNRec, (const EventRecord*) wxTheApp->MacGetCurrentEvent()); } break; @@ -1097,11 +362,7 @@ static pascal void TPPaneIdleProc(ControlHandle theControl) { HLock((Handle) tpvars); varsp = *tpvars; /* get the current mouse coordinates (in our window) */ -#if TARGET_CARBON - SetPort(GetWindowPort(GetControlOwner(theControl))); -#else - SetPort((GrafPtr) GetWindowPort(GetControlOwner(theControl))); -#endif + SetPortWindowPort(GetControlOwner(theControl)); GetMouse(&mousep); /* there's a 'focus thing' and an 'unfocused thing' */ if (varsp->fInFocus) { @@ -1139,7 +400,7 @@ static pascal ControlPartCode TPPaneKeyDownProc(ControlHandle theControl, if ((**tpvars).fInFocus) { /* turn autoscrolling on and send the key event to text edit */ SetPort((**tpvars).fDrawingEnvironment); - TXNKeyDown( (**tpvars).fTXNRec, GetCurrentEventRecord()); + TXNKeyDown( (**tpvars).fTXNRec, (const EventRecord*) wxTheApp->MacGetCurrentEvent()); } } return kControlEntireControl; @@ -1229,411 +490,160 @@ static pascal ControlPartCode TPPaneFocusProc(ControlHandle theControl, ControlF DrawThemeEditTextFrame(&varsp->fRTextOutline, varsp->fIsActive ? kThemeStateActive: kThemeStateInactive); DrawThemeFocusRect(&varsp->fRFocusOutline, varsp->fIsActive && varsp->fInFocus); /* done */ - HSetState((Handle) tpvars, state); - } - return focusResult; -} - - - - - - - - - - - -//This our carbon event handler for unicode key downs -#if TARGET_CARBON -static pascal OSStatus FocusAdvanceOverride(EventHandlerCallRef myHandler, EventRef event, void* userData) { - WindowRef window; - STPTextPaneVars **tpvars; - OSStatus err; - unsigned short mUnicodeText; - ByteCount charCounts=0; - /* get our window pointer */ - tpvars = (STPTextPaneVars **) userData; - window = (**tpvars).fOwner; - //find out how many bytes are needed - err = GetEventParameter(event, kEventParamTextInputSendText, - typeUnicodeText, NULL, 0, &charCounts, NULL); - if (err != noErr) goto bail; - /* we're only looking at single characters */ - if (charCounts != 2) { err = eventNotHandledErr; goto bail; } - /* get the character */ - err = GetEventParameter(event, kEventParamTextInputSendText, - typeUnicodeText, NULL, sizeof(mUnicodeText), - &charCounts, (char*) &mUnicodeText); - if (err != noErr) goto bail; - /* if it's not the tab key, forget it... */ - if ((mUnicodeText != '\t')) { err = eventNotHandledErr; goto bail; } - /* advance the keyboard focus */ - AdvanceKeyboardFocus(window); - /* noErr lets the CEM know we handled the event */ - return noErr; -bail: - return eventNotHandledErr; -} -#endif - - -/* 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; - WindowPtr 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->fInFocus = false; - varsp->fIsActive = true; - varsp->fTEActive = false; - varsp->fUserPaneRec = theControl; - theWindow = varsp->fOwner = GetControlOwner(theControl); -#if TARGET_CARBON - varsp->fDrawingEnvironment = GetWindowPort(varsp->fOwner); -#else - varsp->fDrawingEnvironment = (GrafPtr) GetWindowPort(varsp->fOwner); -#endif - 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, bounds.top, bounds.right, bounds.bottom); - /* 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, - kTXNWantVScrollBarMask | kTXNAlwaysWrapAtViewEdgeMask, - kTXNTextEditStyleFrameType, - kTXNTextensionFile, - kTXNSystemDefaultEncoding, - &varsp->fTXNRec, &varsp->fTXNFrame, (TXNObjectRefcon) tpvars); - - /* set the field's background */ - tback.bgType = kTXNBackgroundTypeRGB; - tback.bg.color = rgbWhite; - TXNSetBackground( varsp->fTXNRec, &tback); - - /* install our focus advance override routine */ -#if TARGET_CARBON - varsp->handlerUPP = NewEventHandlerUPP(FocusAdvanceOverride); - err = InstallWindowEventHandler( varsp->fOwner, varsp->handlerUPP, - kMLTEEventCount, gMLTEEvents, tpvars, &varsp->handlerRef ); -#endif - /* 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; -} - - - -/* mUPCloseControl deallocates all of the structures allocated - by mUPOpenControl. */ -OSStatus mUPCloseControl(ControlHandle theControl) { - STPTextPaneVars **tpvars; - /* set up locals */ - tpvars = (STPTextPaneVars **) GetControlReference(theControl); - /* release our sub records */ - TXNDeleteObject((**tpvars).fTXNRec); - /* remove our focus advance override */ - RemoveEventHandler((**tpvars).handlerRef); - DisposeEventHandlerUPP((**tpvars).handlerUPP); - /* delete our private storage */ - DisposeHandle((Handle) tpvars); - /* zero the control reference */ - SetControlReference(theControl, 0); - return noErr; -} - - - - - /* mUPSetText replaces the contents of the selection with the unicode - text described by the text and count parameters:. - text = pointer to unicode text buffer - count = number of bytes in the buffer. */ -OSStatus mUPSetText(ControlHandle theControl, char* text, long count) { - STPTextPaneVars **tpvars; - /* set up locals */ - tpvars = (STPTextPaneVars **) GetControlReference(theControl); - /* set the text in the record */ - return TXNSetData( (**tpvars).fTXNRec, kTXNUnicodeTextData, text, count, - kTXNUseCurrentSelection, kTXNUseCurrentSelection); - - return noErr; -} - - -/* mUPSetSelection sets the text selection and autoscrolls the text view - so either the cursor or the selction is in the view. */ -void mUPSetSelection(ControlHandle theControl, long selStart, long selEnd) { - STPTextPaneVars **tpvars; - /* set up our locals */ - tpvars = (STPTextPaneVars **) GetControlReference(theControl); - /* and our drawing environment as the operation - may force a redraw in the text area. */ - SetPort((**tpvars).fDrawingEnvironment); - /* change the selection */ - TXNSetSelection( (**tpvars).fTXNRec, selStart, selEnd); -} - - - - - -/* mUPGetText returns the current text data being displayed inside of - the mUPControl. When noErr is returned, *theText contain a new - handle containing all of the Unicode text copied from the current - selection. It is the caller's responsibiliby to dispose of this handle. */ -OSStatus mUPGetText(ControlHandle theControl, Handle *theText) { - STPTextPaneVars **tpvars; - OSStatus err; - /* set up locals */ - tpvars = (STPTextPaneVars **) GetControlReference(theControl); - /* extract the text from the record */ - err = TXNGetData( (**tpvars).fTXNRec, kTXNUseCurrentSelection, kTXNUseCurrentSelection, theText); - /* all done */ - return err; -} - - - -/* mUPCreateControl creates a new user pane control and then it passes it - to mUPOpenControl to initialize it as a scrolling text user pane control. */ -OSStatus mUPCreateControl(WindowPtr theWindow, Rect *bounds, ControlHandle *theControl) { - short featurSet; - /* the following feature set can be specified in CNTL resources by using - the value 1214. When creating a user pane control, we pass this value - in the 'value' parameter. */ - featurSet = kControlSupportsEmbedding | kControlSupportsFocus | kControlWantsIdle - | kControlWantsActivate | kControlHandlesTracking | kControlHasSpecialBackground - | kControlGetsFocusOnClick | kControlSupportsLiveFeedback; - /* create the control */ - *theControl = NewControl(theWindow, bounds, "\p", true, featurSet, 0, featurSet, kControlUserPaneProc, 0); - /* set up the mUP specific features and data */ - mUPOpenControl(*theControl); - /* all done.... */ - return noErr; -} - - -/* mUPDisposeControl calls mUPCloseControl and then it calls DisposeControl. */ -OSStatus mUPDisposeControl(ControlHandle theControl) { - /* deallocate the mUP specific data */ - mUPCloseControl(theControl); - /* deallocate the user pane control itself */ - DisposeControl(theControl); - return noErr; -} - - - - -/* IsmUPControl returns true if theControl is not NULL - and theControl refers to a mUP Control. */ -Boolean IsmUPControl(ControlHandle theControl) { - Size theSize; - ControlUserPaneFocusUPP localFocusProc; - /* a NULL control is not a mUP control */ - if (theControl == NULL) return false; - /* check if the control is using our focus procedure */ - theSize = sizeof(localFocusProc); - if (GetControlData(theControl, kControlEntireControl, kControlUserPaneFocusProcTag, - sizeof(localFocusProc), &localFocusProc, &theSize) != noErr) return false; - if (localFocusProc != gTPFocusProc) return false; - /* all tests passed, it's a mUP control */ - return true; -} - - -/* mUPDoEditCommand performs the editing command specified - in the editCommand parameter. The mUPControl's text - and scroll bar are redrawn and updated as necessary. */ -void mUPDoEditCommand(ControlHandle theControl, short editCommand) { - STPTextPaneVars **tpvars; - /* set up our locals */ - tpvars = (STPTextPaneVars **) GetControlReference(theControl); - /* and our drawing environment as the operation - may force a redraw in the text area. */ - SetPort((**tpvars).fDrawingEnvironment); - /* perform the editing command */ - switch (editCommand) { - case kmUPCut: - ClearCurrentScrap(); - TXNCut((**tpvars).fTXNRec); - TXNConvertToPublicScrap(); - break; - case kmUPCopy: - ClearCurrentScrap(); - TXNCopy((**tpvars).fTXNRec); - TXNConvertToPublicScrap(); - break; - case kmUPPaste: - TXNConvertFromPublicScrap(); - TXNPaste((**tpvars).fTXNRec); - break; - case kmUPClear: - TXNClear((**tpvars).fTXNRec); - break; + HSetState((Handle) tpvars, state); } + return focusResult; } - - - -/* mUPGetContents returns the entire contents of the control including the text - and the formatting information. */ -OSStatus mUPGetContents(ControlHandle theControl, Handle *theContents) { +//This our carbon event handler for unicode key downs +#if TARGET_CARBON +static pascal OSStatus FocusAdvanceOverride(EventHandlerCallRef myHandler, EventRef event, void* userData) { + WindowRef window; STPTextPaneVars **tpvars; OSStatus err; - short vRefNum; - long dirID; - FSSpec tspec; - short trefnum; - Boolean texists; - long bytecount; - Handle localdata; - /* set up locals */ - trefnum = 0; - texists = false; - localdata = NULL; - tpvars = (STPTextPaneVars **) GetControlReference(theControl); - if (theContents == NULL) return paramErr; - /* create a temporary file */ - err = FindFolder(kOnSystemDisk, kTemporaryFolderType, true, &vRefNum, &dirID); - if (err != noErr) goto bail; - FSMakeFSSpec(vRefNum, dirID, "\pmUPGetContents", &tspec); - err = FSpCreate(&tspec, 'trsh', 'trsh', smSystemScript); - if (err != noErr) goto bail; - texists = true; - /* open the file */ - err = FSpOpenDF(&tspec, fsRdWrPerm, &trefnum); - if (err != noErr) goto bail; - /* save the data */ - err = TXNSave( (**tpvars).fTXNRec, kTXNTextensionFile, 0, kTXNSystemDefaultEncoding, &tspec, trefnum, 0); - if (err != noErr) goto bail; - /* get the file length and set the position */ - err = GetEOF(trefnum, &bytecount); - if (err != noErr) goto bail; - err = SetFPos(trefnum, fsFromStart, 0); + unsigned short mUnicodeText; + ByteCount charCounts=0; + /* get our window pointer */ + tpvars = (STPTextPaneVars **) userData; + window = (**tpvars).fOwner; + //find out how many bytes are needed + err = GetEventParameter(event, kEventParamTextInputSendText, + typeUnicodeText, NULL, 0, &charCounts, NULL); if (err != noErr) goto bail; - /* copy the data fork to a handle */ - localdata = NewHandle(bytecount); - if (localdata == NULL) { err = memFullErr; goto bail; } - HLock(localdata); - err = FSRead(trefnum, &bytecount, *localdata); - HUnlock(localdata); + /* we're only looking at single characters */ + if (charCounts != 2) { err = eventNotHandledErr; goto bail; } + /* get the character */ + err = GetEventParameter(event, kEventParamTextInputSendText, + typeUnicodeText, NULL, sizeof(mUnicodeText), + &charCounts, (char*) &mUnicodeText); if (err != noErr) goto bail; - /* store result */ - *theContents = localdata; - /* clean up */ - FSClose(trefnum); - FSpDelete(&tspec); - /* all done */ + /* if it's not the tab key, forget it... */ + if ((mUnicodeText != '\t')) { err = eventNotHandledErr; goto bail; } + /* advance the keyboard focus */ + AdvanceKeyboardFocus(window); + /* noErr lets the CEM know we handled the event */ return noErr; bail: - if (trefnum != 0) FSClose(trefnum); - if (texists) FSpDelete(&tspec); - if (localdata != NULL) DisposeHandle(localdata); - return err; + return eventNotHandledErr; } +#endif +/* 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); -/* mUPSetContents replaces the contents of the selection with the data stored in the handle. */ -OSStatus mUPSetContents(ControlHandle theControl, Handle theContents) { - STPTextPaneVars **tpvars; - OSStatus err; - short vRefNum; - long dirID; - FSSpec tspec; - short trefnum; - Boolean texists; - long bytecount; - char state; - /* set up locals */ - trefnum = 0; - texists = false; - tpvars = (STPTextPaneVars **) GetControlReference(theControl); - if (theContents == NULL) return paramErr; - /* create a temporary file */ - err = FindFolder(kOnSystemDisk, kTemporaryFolderType, true, &vRefNum, &dirID); - if (err != noErr) goto bail; - FSMakeFSSpec(vRefNum, dirID, "\pmUPSetContents", &tspec); - err = FSpCreate(&tspec, 'trsh', 'trsh', smSystemScript); - if (err != noErr) goto bail; - texists = true; - /* open the file */ - err = FSpOpenDF(&tspec, fsRdWrPerm, &trefnum); - if (err != noErr) goto bail; - /* save the data to the temporary file */ - state = HGetState(theContents); - HLock(theContents); - bytecount = GetHandleSize(theContents); - err = FSWrite(trefnum, &bytecount, *theContents); - HSetState(theContents, state); - if (err != noErr) goto bail; - /* reset the file position */ - err = SetFPos(trefnum, fsFromStart, 0); - if (err != noErr) goto bail; - /* load the data */ - err = TXNSetDataFromFile((**tpvars).fTXNRec, trefnum, kTXNTextensionFile, bytecount, kTXNUseCurrentSelection, kTXNUseCurrentSelection); - if (err != noErr) goto bail; - /* clean up */ - FSClose(trefnum); - FSpDelete(&tspec); + /* set up the drawing environment */ + SetPort(varsp->fDrawingEnvironment); + + /* create the new edit field */ + TXNNewObject(NULL, varsp->fOwner, &varsp->fRTextArea, + ( multiline ? kTXNWantVScrollBarMask : 0 ) + | kTXNAlwaysWrapAtViewEdgeMask, + kTXNTextEditStyleFrameType, + kTXNTextensionFile, + kTXNSystemDefaultEncoding, + &varsp->fTXNRec, &varsp->fTXNFrame, (TXNObjectRefcon) tpvars); + + /* set the field's font and style */ + TXNTypeAttributes typeAttr[2]; + typeAttr[0].tag = kTXNQDFontSizeAttribute; + typeAttr[0].size = kTXNFontSizeAttributeSize; + typeAttr[0].data.dataValue = 10 << 16; + + typeAttr[1].tag = kTXNQDFontStyleAttribute; + typeAttr[1].size = kTXNQDFontStyleAttributeSize; + typeAttr[1].data.dataValue = normal ; + + /* this does not seem to get the font id through + typeAttr[2].tag = kTXNQDFontFamilyIDAttribute ; // NameAttribute; + typeAttr[2].size = kTXNQDFontFamilyIDAttributeSize ; // kTXNQDFontNameAttributeSize; + typeAttr[2].data.dataValue = kFontIDTimes ; // (void*) "\pGeneva" ; + */ + + 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); + + /* install our focus advance override routine */ +#if TARGET_CARBON +// varsp->handlerUPP = NewEventHandlerUPP(FocusAdvanceOverride); +// err = InstallWindowEventHandler( varsp->fOwner, varsp->handlerUPP, +// kMLTEEventCount, gMLTEEvents, tpvars, &varsp->handlerRef ); +#endif + + /* 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; -bail: - if (trefnum != 0) FSClose(trefnum); - if (texists) FSpDelete(&tspec); - return err; } + + + #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl) @@ -1657,6 +667,27 @@ END_EVENT_TABLE() // Text item wxTextCtrl::wxTextCtrl() { + ((TEHandle) m_macTE) = NULL ; + ((TXNObject) m_macTXN) = NULL ; + m_macUsesTXN = false ; + m_editable = true ; +} + +wxTextCtrl::~wxTextCtrl() +{ + if ( m_macUsesTXN ) + { + TXNDeleteObject((TXNObject)m_macTXN); + #if TARGET_CARBON + /* remove our focus advance override */ + // RemoveEventHandler((**tpvars).handlerRef); + // DisposeEventHandlerUPP((**tpvars).handlerUPP); + #endif + /* delete our private storage */ + DisposeHandle((Handle) m_macTXNvars); + /* zero the control reference */ + SetControlReference((ControlHandle)m_macControl, 0) ; + } } const short kVerticalMargin = 2 ; @@ -1669,21 +700,30 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, const wxValidator& validator, const wxString& name) { + ((TEHandle) m_macTE) = NULL ; + ((TXNObject) m_macTXN) = 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() ) + 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 ; } - else - { - m_macHorizontalBorder = 0 ; // additional pixels around the real control - m_macVerticalBorder = 0 ; - } Rect bounds ; @@ -1691,10 +731,10 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, if ( mySize.y == -1 ) { - if ( UMAHasAppearance() ) + if ( !m_macUsesTXN ) mySize.y = 13 ; else - mySize.y = 24 ; + mySize.y = 16 ; mySize.y += 2 * m_macVerticalBorder ; } @@ -1710,38 +750,51 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, } - if ( style & wxTE_PASSWORD ) + if ( !m_macUsesTXN ) { - m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , "\p" , true , 0 , 0 , 1, - kControlEditTextPasswordProc , (long) this ) ; - } - else - { - if ( mUPCreateControl(parent->MacGetRootWindow(), &bounds, &m_macControl) != noErr ) - return FALSE ; + 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 + { + 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 ); + } MacPostControlCreate() ; wxString value ; - - if( wxApp::s_macDefaultEncodingIsPC ) - value = wxMacMakeMacStringFromPC( st ) ; + + 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 - value = st ; - - if ( style & wxTE_PASSWORD ) { - ::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, (const char*)value, value.Length(), - kTXNStartOffset, kTXNEndOffset); - } + 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; } @@ -1749,31 +802,26 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, wxString wxTextCtrl::GetValue() const { Size actualsize; - if ( m_windowStyle & wxTE_PASSWORD ) - { + if ( !m_macUsesTXN ) + { ::GetControlData( (ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ; - } - else - { - STPTextPaneVars **tpvars; - OSStatus err; - /* set up locals */ - tpvars = (STPTextPaneVars **) GetControlReference( (ControlHandle) m_macControl); - /* extract the text from the record */ - Handle theText ; - err = TXNGetDataEncoded( (**tpvars).fTXNRec, kTXNStartOffset, kTXNEndOffset, &theText , kTXNTextData ); - /* all done */ - if ( err ) - { - actualsize = 0 ; - } - else - { - actualsize = GetHandleSize( theText ) ; - strncpy( wxBuffer , *theText , actualsize ) ; - DisposeHandle( theText ) ; - } - } + } + else + { + Handle theText ; + OSStatus err = TXNGetDataEncoded( ((TXNObject) m_macTXN), kTXNStartOffset, kTXNEndOffset, &theText , kTXNTextData ); + /* all done */ + if ( err ) + { + actualsize = 0 ; + } + else + { + actualsize = GetHandleSize( theText ) ; + strncpy( wxBuffer , *theText , actualsize ) ; + DisposeHandle( theText ) ; + } + } wxBuffer[actualsize] = 0 ; if( wxApp::s_macDefaultEncodingIsPC ) return wxMacMakePCStringFromMac( wxBuffer ) ; @@ -1783,26 +831,14 @@ wxString wxTextCtrl::GetValue() const void wxTextCtrl::GetSelection(long* from, long* to) const { - if ( m_windowStyle & wxTE_PASSWORD ) + if ( !m_macUsesTXN ) { - ControlEditTextSelectionRec selection ; - TEHandle teH ; - long size ; - - ::GetControlData( (ControlHandle) m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - - *from = (**teH).selStart; - *to = (**teH).selEnd; + *from = (**((TEHandle) m_macTE)).selStart; + *to = (**((TEHandle) m_macTE)).selEnd; } else { - STPTextPaneVars **tpvars; - - /* set up locals */ - tpvars = (STPTextPaneVars **) GetControlReference( (ControlHandle) m_macControl); - - TXNGetSelection( (**tpvars).fTXNRec , (TXNOffset*) from , (TXNOffset*) to ) ; - + TXNGetSelection( ((TXNObject) m_macTXN) , (TXNOffset*) from , (TXNOffset*) to ) ; } } @@ -1814,20 +850,16 @@ void wxTextCtrl::SetValue(const wxString& st) value = wxMacMakeMacStringFromPC( st ) ; else value = st ; - if ( m_windowStyle & wxTE_PASSWORD ) + if ( !m_macUsesTXN ) { - ::SetControlData( (ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , value.Length() , (char*) ((const char*)value) ) ; + ::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, (const char*)value, value.Length(), - kTXNStartOffset, kTXNEndOffset); + TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*)value.c_str(), value.Length(), + kTXNStartOffset, kTXNEndOffset); } - MacRedrawControl() ; + MacRedrawControl() ; } // Clipboard operations @@ -1835,20 +867,19 @@ void wxTextCtrl::Copy() { if (CanCopy()) { - if ( m_windowStyle & wxTE_PASSWORD ) + if ( !m_macUsesTXN ) { - TEHandle teH ; - long size ; - - ::GetControlData( (ControlHandle) m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - TECopy( teH ) ; + TECopy( ((TEHandle) m_macTE) ) ; + ClearCurrentScrap(); + TEToScrap() ; + MacRedrawControl() ; + } + else + { ClearCurrentScrap(); - TEToScrap() ; - } - else - { - mUPDoEditCommand( (ControlHandle) m_macControl , kmUPCopy ) ; - } + TXNCopy((TXNObject)m_macTXN); + TXNConvertToPublicScrap(); + } } } @@ -1856,42 +887,45 @@ void wxTextCtrl::Cut() { if (CanCut()) { - if ( m_windowStyle & wxTE_PASSWORD ) - { - TEHandle teH ; - long size ; - - ::GetControlData( (ControlHandle) m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - TECut( teH ) ; - ClearCurrentScrap(); - TEToScrap() ; - // MacInvalidateControl() ; - } - else + if ( !m_macUsesTXN ) { - mUPDoEditCommand( (ControlHandle) m_macControl , kmUPCut ) ; + 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()) { - if ( m_windowStyle & wxTE_PASSWORD ) - { - TEHandle teH ; - long size ; - - ::GetControlData( (ControlHandle) m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - TEFromScrap() ; - TEPaste( teH ) ; - MacRedrawControl() ; - } - else - { - mUPDoEditCommand( (ControlHandle) m_macControl , kmUPPaste ) ; - } + 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); } } @@ -1905,6 +939,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); @@ -1924,8 +962,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) { @@ -1948,10 +986,14 @@ bool wxTextCtrl::CanPaste() const void wxTextCtrl::SetEditable(bool editable) { + if ( editable != m_editable ) + { + m_editable = editable ; if ( editable ) - UMAActivateControl( (ControlHandle) m_macControl ) ; - else - UMADeactivateControl( (ControlHandle) m_macControl ) ; + UMAActivateControl( (ControlHandle) m_macControl ) ; + else + UMADeactivateControl((ControlHandle) m_macControl ) ; + } } void wxTextCtrl::SetInsertionPoint(long pos) @@ -1974,25 +1016,15 @@ long wxTextCtrl::GetInsertionPoint() const long wxTextCtrl::GetLastPosition() const { - if ( m_windowStyle & wxTE_PASSWORD ) + if ( !m_macUsesTXN ) { - - ControlEditTextSelectionRec selection ; - TEHandle teH ; - long size ; - - ::GetControlData( (ControlHandle) m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - -// ::GetControlData( (ControlHandle) m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection , &size ) ; - return (**teH).teLength ; + return (**((TEHandle) m_macTE)).teLength ; } else { - STPTextPaneVars** tpvars = (STPTextPaneVars **) GetControlReference( (ControlHandle) m_macControl); - - int actualsize = 0 ; Handle theText ; - OSErr err = TXNGetDataEncoded( (**tpvars).fTXNRec, kTXNStartOffset, kTXNEndOffset, &theText , kTXNTextData ); + long actualsize ; + OSErr err = TXNGetDataEncoded( (TXNObject) m_macTXN, kTXNStartOffset, kTXNEndOffset, &theText , kTXNTextData ); /* all done */ if ( err ) { @@ -2009,76 +1041,68 @@ long wxTextCtrl::GetLastPosition() const void wxTextCtrl::Replace(long from, long to, const wxString& value) { - if ( m_windowStyle & wxTE_PASSWORD ) + if ( !m_macUsesTXN ) { - TEHandle teH ; - long size ; - - ControlEditTextSelectionRec selection ; + ControlEditTextSelectionRec selection ; - selection.selStart = from ; - selection.selEnd = to ; - ::SetControlData( (ControlHandle) m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ; - ::GetControlData( (ControlHandle) m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - TESetSelect( from , to , teH ) ; - TEDelete( teH ) ; - TEInsert( value , value.Length() , teH ) ; - } - else - { - // TODO - } + 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) { - if ( m_windowStyle & wxTE_PASSWORD ) + if ( !m_macUsesTXN ) { - TEHandle teH ; - long size ; + ControlEditTextSelectionRec selection ; - ControlEditTextSelectionRec selection ; - - selection.selStart = from ; - selection.selEnd = to ; - ::SetControlData( (ControlHandle) m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ; - ::GetControlData( (ControlHandle) m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - TEDelete( teH ) ; + selection.selStart = from ; + selection.selEnd = to ; + ::SetControlData( (ControlHandle) m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ; + TEDelete( ((TEHandle) m_macTE) ) ; } else { - //TODO + TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ; + TXNClear( ((TXNObject) m_macTXN) ) ; } Refresh() ; } void wxTextCtrl::SetSelection(long from, long to) { - if ( m_windowStyle & wxTE_PASSWORD ) + + if ( !m_macUsesTXN ) { ControlEditTextSelectionRec selection ; - TEHandle teH ; - long size ; - - ::GetControlData( (ControlHandle) m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - selection.selStart = from ; selection.selEnd = to ; - ::SetControlData( (ControlHandle) 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); + 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); } } @@ -2095,28 +1119,20 @@ 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 ( m_windowStyle & wxTE_PASSWORD ) + if( wxApp::s_macDefaultEncodingIsPC ) + value = wxMacMakeMacStringFromPC( text ) ; + else + value = text ; + if ( !m_macUsesTXN ) { - TEHandle teH ; - long size ; - - ::GetControlData( (ControlHandle) m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ; - TEInsert( value , value.Length() , teH ) ; - } - else - { - STPTextPaneVars **tpvars; - /* set up locals */ - tpvars = (STPTextPaneVars **) GetControlReference( (ControlHandle) m_macControl); - /* set the text in the record */ - TXNSetData( (**tpvars).fTXNRec, kTXNTextData, (const char*)value, value.Length(), - kTXNUseCurrentSelection, kTXNUseCurrentSelection); - } - Refresh() ; + 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) @@ -2127,14 +1143,18 @@ void wxTextCtrl::AppendText(const wxString& text) void wxTextCtrl::Clear() { - if ( m_windowStyle & wxTE_PASSWORD ) + if ( !IsEditable() ) + { + return ; + } + 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 { - mUPDoEditCommand( (ControlHandle) m_macControl , kmUPClear) ; + ClearCurrentScrap(); + TXNClear((TXNObject)m_macTXN); } Refresh() ; } @@ -2146,13 +1166,13 @@ 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 @@ -2223,12 +1243,12 @@ int wxTextCtrl::GetNumberOfLines() const wxString content = GetValue() ; int count = 1; - for (int i = 0; i < content.Length() ; i++) - { - if (content[i] == '\r') count++; + for (int i = 0; i < content.Length() ; i++) + { + if (content[i] == '\r') count++; } - return count; + return count; } long wxTextCtrl::XYToPosition(long x, long y) const @@ -2251,25 +1271,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 (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++) + for (int 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; } @@ -2278,28 +1298,27 @@ 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 (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 (content[j] == '\r') - return tmp; - - tmp += content[j]; - } - - return tmp; - } - if (content[i] == '\r') count++; - } - return wxString(""); + for (int j = i; j < content.Length(); j++) + { + if (content[j] == '\r') + return tmp; + + tmp += content[j]; + } + + return tmp; + } + if (content[i] == '\r') count++; + } } /* @@ -2323,13 +1342,25 @@ 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) { wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); event.SetEventObject( this ); + event.SetString( GetValue() ); if ( GetEventHandler()->ProcessEvent(event) ) return; } @@ -2351,8 +1382,12 @@ void wxTextCtrl::OnChar(wxKeyEvent& 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; @@ -2369,26 +1404,30 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) if ( GetParent()->GetEventHandler()->ProcessEvent(eventNav) ) return; + event.Skip() ; - return ; + return; } break; } - - EventRecord *ev = wxTheApp->MacGetCurrentEvent() ; - short keycode ; - short keychar ; - keychar = short(ev->message & charCodeMask); - keycode = short(ev->message & keyCodeMask) >> 8 ; - UMAHandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers ) ; - if ( keychar >= 0x20 || event.KeyCode() == WXK_RETURN || event.KeyCode() == WXK_DELETE || event.KeyCode() == WXK_BACK) + + EventRecord *ev = (EventRecord*) wxTheApp->MacGetCurrentEvent(); + short keychar = short(ev->message & charCodeMask); + if (!eat_key) { - wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId); - event.SetString( GetValue() ) ; - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); + short keycode = short(ev->message & keyCodeMask) >> 8 ; + ::HandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers ); + } + if ( keychar >= 0x20 || + event.KeyCode() == WXK_RETURN || + event.KeyCode() == WXK_DELETE || + event.KeyCode() == WXK_BACK) + { + wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId); + event1.SetString( GetValue() ) ; + event1.SetEventObject( this ); + GetEventHandler()->ProcessEvent(event1); } - } // ---------------------------------------------------------------------------- @@ -2445,7 +1484,7 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event) event.Enable( CanRedo() ); } -#endif + #endif // wxUSE_TEXTCTRL