X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20b6985553b4e01e7960847e3211d940aeff8742..62f864c32c53356b7228591c85b14abc491c46f0:/src/mac/carbon/textctrl.cpp diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp index 159e35685b..2fd923f875 100644 --- a/src/mac/carbon/textctrl.cpp +++ b/src/mac/carbon/textctrl.cpp @@ -40,11 +40,11 @@ #include "wx/button.h" #include "wx/toplevel.h" #include "wx/textctrl.h" -#include "wx/notebook.h" -#include "wx/tabctrl.h" #include "wx/settings.h" #include "wx/filefn.h" #include "wx/utils.h" +#include "wx/sysopt.h" +#include "wx/menu.h" #if defined(__BORLANDC__) && !defined(__WIN32__) #include @@ -62,10 +62,19 @@ #define wxMAC_AWAYS_USE_MLTE 1 #endif +#ifndef __WXMAC_OSX__ +enum +{ + kTXNVisibilityTag = 'visb' /*set the visibility state of the object */ +}; +#endif + +#ifndef __DARWIN__ #include #include #include #include +#endif #include "wx/mac/uma.h" class wxMacFunctor @@ -160,7 +169,7 @@ void* wxMacMPRemoteGUICall( classtype *object , void (classtype::*function)( con class wxMacTextControl : public wxMacControl { public : - wxMacTextControl() ; + wxMacTextControl( wxTextCtrl *peer ) ; ~wxMacTextControl() ; virtual wxString GetStringValue() const = 0 ; @@ -189,6 +198,18 @@ public : virtual void ShowPosition( long WXUNUSED(pos) ) ; virtual int GetLineLength(long lineNo) const ; virtual wxString GetLineText(long lineNo) const ; + virtual bool SetupCursor( const wxPoint& pt ) { return false ; } + +#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 @@ -196,6 +217,7 @@ public : class wxMacMLTEControl : public wxMacTextControl { public : + wxMacMLTEControl( wxTextCtrl *peer ) ; virtual wxString GetStringValue() const ; virtual void SetStringValue( const wxString &str) ; @@ -246,13 +268,12 @@ protected : class wxMacMLTEHIViewControl : public wxMacMLTEControl { public : - wxMacMLTEHIViewControl( wxWindow *wxPeer, + wxMacMLTEHIViewControl( wxTextCtrl *wxPeer, const wxString& str, const wxPoint& pos, const wxSize& size, long style ) ; virtual OSStatus SetFocus( ControlFocusPart focusPart ) ; virtual bool HasFocus() const ; - virtual bool NeedsFocusRect() const; protected : HIViewRef m_scrollView ; HIViewRef m_textView ; @@ -263,7 +284,7 @@ protected : class wxMacUnicodeTextControl : public wxMacTextControl { public : - wxMacUnicodeTextControl( wxWindow *wxPeer, + wxMacUnicodeTextControl( wxTextCtrl *wxPeer, const wxString& str, const wxPoint& pos, const wxSize& size, long style ) ; @@ -287,30 +308,60 @@ protected : #endif -// implementation available under classic - -class STPTextPaneVars ; +// 'classic' MLTE implementation class wxMacMLTEClassicControl : public wxMacMLTEControl { public : - wxMacMLTEClassicControl( wxWindow *wxPeer, + wxMacMLTEClassicControl( wxTextCtrl *wxPeer, const wxString& str, const wxPoint& pos, const wxSize& size, long style ) ; ~wxMacMLTEClassicControl() ; virtual void VisibilityChanged(bool shown) ; - virtual bool NeedsFocusRect() const; + virtual void SuperChangedPosition() ; + + virtual void MacControlUserPaneDrawProc(wxInt16 part) ; + virtual wxInt16 MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) ; + virtual wxInt16 MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) ; + virtual void MacControlUserPaneIdleProc() ; + virtual wxInt16 MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) ; + virtual void MacControlUserPaneActivateProc(bool activating) ; + virtual wxInt16 MacControlUserPaneFocusProc(wxInt16 action) ; + virtual void MacControlUserPaneBackgroundProc(void* info) ; + + virtual bool SetupCursor( const wxPoint& WXUNUSED(pt) ) { MacControlUserPaneIdleProc() ; return true ;} + + virtual void SetRect( Rect *r ) ; + protected : OSStatus DoCreate(); -public : - // hack to make public until we have migrated all procs - STPTextPaneVars* m_macTXNvars ; + + void MacUpdatePosition() ; + void MacActivatePaneText(Boolean setActive) ; + void MacFocusPaneText(Boolean setFocus) ; + + void MacSetObjectVisibility(Boolean vis) ; +private : + TXNFrameID m_txnFrameID ; + GrafPtr m_txnPort ; + WindowRef m_txnWindow ; + // bounds of the control as we last did set the txn frames + Rect m_txnControlBounds ; + Rect m_txnVisBounds ; +#ifdef __WXMAC_OSX__ + static pascal void TXNScrollInfoProc (SInt32 iValue, SInt32 iMaximumValue, + TXNScrollBarOrientation iScrollBarOrientation, SInt32 iRefCon) ; + static pascal void TXNScrollActionProc( ControlRef controlRef , ControlPartCode partCode ) ; + ControlRef m_sbHorizontal ; + SInt32 m_lastHorizontalValue ; + ControlRef m_sbVertical ; + SInt32 m_lastVerticalValue ; +#endif } ; #define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl) BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) @@ -322,26 +373,34 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste) EVT_MENU(wxID_UNDO, wxTextCtrl::OnUndo) EVT_MENU(wxID_REDO, wxTextCtrl::OnRedo) + EVT_MENU(wxID_CLEAR, wxTextCtrl::OnDelete) + EVT_MENU(wxID_SELECTALL, wxTextCtrl::OnSelectAll) + + EVT_CONTEXT_MENU(wxTextCtrl::OnContextMenu) 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) + EVT_UPDATE_UI(wxID_CLEAR, wxTextCtrl::OnUpdateDelete) + EVT_UPDATE_UI(wxID_SELECTALL, wxTextCtrl::OnUpdateSelectAll) END_EVENT_TABLE() -#endif // Text item void wxTextCtrl::Init() { - m_editable = true ; - m_dirty = false; + m_editable = true ; + m_dirty = false; + + m_privateContextMenu = NULL; - m_maxLength = TE_UNLIMITED_LENGTH ; + m_maxLength = TE_UNLIMITED_LENGTH ; } wxTextCtrl::~wxTextCtrl() { + delete m_privateContextMenu; } @@ -361,8 +420,6 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, if ( !wxTextCtrlBase::Create(parent, id, pos, size, style & ~(wxHSCROLL|wxVSCROLL), validator, name) ) return false; - Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; - if ( m_windowStyle & wxTE_MULTILINE ) { wxASSERT_MSG( !(m_windowStyle & wxTE_PROCESS_ENTER), @@ -372,41 +429,55 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, style |= wxTE_PROCESS_ENTER ; } -#if TARGET_API_MAC_OSX + bool forceMLTE = false ; +#if wxUSE_SYSTEM_OPTIONS + if ( (wxSystemOptions::HasOption(wxMAC_TEXTCONTROL_USE_MLTE) ) && ( wxSystemOptions::GetOptionInt( wxMAC_TEXTCONTROL_USE_MLTE ) == 1) ) + { + forceMLTE = true ; + } +#endif + +#ifdef __WXMAC_OSX__ #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 - if ( UMAGetSystemVersion() >= 0x1030 ) + if ( UMAGetSystemVersion() >= 0x1030 && forceMLTE == false ) { - m_peer = new wxMacMLTEHIViewControl( this , str , pos , size , style ) ; + if ( m_windowStyle & wxTE_MULTILINE ) + m_peer = new wxMacMLTEHIViewControl( this , str , pos , size , style ) ; } #endif -#if !wxMAC_AWAYS_USE_MLTE if ( !m_peer ) { - m_peer = new wxMacUnicodeTextControl( this , str , pos , size , style ) ; + if ( !(m_windowStyle & wxTE_MULTILINE) && forceMLTE == false ) + m_peer = new wxMacUnicodeTextControl( this , str , pos , size , style ) ; } -#endif #endif if ( !m_peer ) { - // this control draws the border itself - if ( !HasFlag(wxNO_BORDER) ) - { - m_windowStyle &= ~wxSUNKEN_BORDER ; - bounds = wxMacGetBoundsForControl( this , pos , size ) ; - } 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; } +void wxTextCtrl::MacSuperChangedPosition() +{ + wxWindow::MacSuperChangedPosition() ; + GetPeer()->SuperChangedPosition() ; +} + void wxTextCtrl::MacVisibilityChanged() { GetPeer()->VisibilityChanged( MacIsReallyShown() ) ; @@ -592,7 +663,7 @@ void wxTextCtrl::WriteText(const wxString& str) if ( !wxIsMainThread() ) { // unfortunately CW 8 is not able to correctly deduce the template types, so we have - // to instantiate explicitely + // to instantiate explicitly wxMacMPRemoteGUICall( this , &wxTextCtrl::WriteText , str ) ; return ; } @@ -846,7 +917,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) event.SetEventObject(def); def->Command(event); return ; - } + } } // this will make wxWidgets eat the ENTER key so that @@ -938,6 +1009,19 @@ void wxTextCtrl::OnRedo(wxCommandEvent& WXUNUSED(event)) Redo(); } +void wxTextCtrl::OnDelete(wxCommandEvent& WXUNUSED(event)) +{ + long from, to; + GetSelection(& from, & to); + if (from != -1 && to != -1) + Remove(from, to); +} + +void wxTextCtrl::OnSelectAll(wxCommandEvent& WXUNUSED(event)) +{ + SetSelection(-1, -1); +} + void wxTextCtrl::OnUpdateCut(wxUpdateUIEvent& event) { event.Enable( CanCut() ); @@ -963,54 +1047,98 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event) event.Enable( CanRedo() ); } +void wxTextCtrl::OnUpdateDelete(wxUpdateUIEvent& event) +{ + long from, to; + GetSelection(& from, & to); + event.Enable(from != -1 && to != -1 && from != to && IsEditable()) ; +} + +void wxTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event) +{ + event.Enable(GetLastPosition() > 0); +} + +// CS: Context Menus only work with mlte implementations or non-multiline HIViews at the moment + +void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event) +{ + if (m_privateContextMenu == NULL) + { + m_privateContextMenu = new wxMenu; + m_privateContextMenu->Append(wxID_UNDO, _("&Undo")); + m_privateContextMenu->Append(wxID_REDO, _("&Redo")); + m_privateContextMenu->AppendSeparator(); + m_privateContextMenu->Append(wxID_CUT, _("Cu&t")); + m_privateContextMenu->Append(wxID_COPY, _("&Copy")); + m_privateContextMenu->Append(wxID_PASTE, _("&Paste")); + m_privateContextMenu->Append(wxID_CLEAR, _("&Delete")); + m_privateContextMenu->AppendSeparator(); + m_privateContextMenu->Append(wxID_SELECTALL, _("Select &All")); + } + + if (m_privateContextMenu != NULL) + PopupMenu(m_privateContextMenu); +} + bool wxTextCtrl::MacSetupCursor( const wxPoint& pt ) { - return true ; + if ( !GetPeer()->SetupCursor(pt) ) + return wxWindow::MacSetupCursor( pt ) ; + else + return true ; } #if !TARGET_API_MAC_OSX + // user pane implementation void wxTextCtrl::MacControlUserPaneDrawProc(wxInt16 part) { + GetPeer()->MacControlUserPaneDrawProc( part ) ; } wxInt16 wxTextCtrl::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) { - return kControlNoPart ; + return GetPeer()->MacControlUserPaneHitTestProc( x , y ) ; } wxInt16 wxTextCtrl::MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) { - return kControlNoPart ; + return GetPeer()->MacControlUserPaneTrackingProc( x , y , actionProc ) ; } void wxTextCtrl::MacControlUserPaneIdleProc() { + GetPeer()->MacControlUserPaneIdleProc( ) ; } wxInt16 wxTextCtrl::MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) { - return kControlNoPart ; + return GetPeer()->MacControlUserPaneKeyDownProc( keyCode , charCode , modifiers ) ; } void wxTextCtrl::MacControlUserPaneActivateProc(bool activating) { + GetPeer()->MacControlUserPaneActivateProc( activating ) ; } wxInt16 wxTextCtrl::MacControlUserPaneFocusProc(wxInt16 action) { - return kControlNoPart ; + return GetPeer()->MacControlUserPaneFocusProc( action ) ; } void wxTextCtrl::MacControlUserPaneBackgroundProc(void* info) { + GetPeer()->MacControlUserPaneBackgroundProc( info ) ; } + #endif // ---------------------------------------------------------------------------- // implementation base class // ---------------------------------------------------------------------------- -wxMacTextControl::wxMacTextControl() +wxMacTextControl::wxMacTextControl(wxTextCtrl* peer) : + wxMacControl( peer ) { } @@ -1160,10 +1288,10 @@ int wxMacTextControl::GetLineLength(long lineNo) const #if TARGET_API_MAC_OSX -wxMacUnicodeTextControl::wxMacUnicodeTextControl( wxWindow *wxPeer, +wxMacUnicodeTextControl::wxMacUnicodeTextControl( wxTextCtrl *wxPeer, const wxString& str, const wxPoint& pos, - const wxSize& size, long style ) + const wxSize& size, long style ) : wxMacTextControl( wxPeer ) { m_font = wxPeer->GetFont() ; m_windowStyle = style ; @@ -1290,19 +1418,14 @@ void wxMacUnicodeTextControl::WriteText(const wxString& str) // MLTE control implementation (common part) // ---------------------------------------------------------------------------- -#if TARGET_API_MAC_OSX == 0 -// declaration needed because of one line in the code... -static void TPUpdateVisibility(ControlRef theControl) ; -#endif - // if mlte is on read only , no changes at all are allowed, not even from // procedural API, in order to allow changes via API all the same we must undo // the readonly status while we are executing, this class helps to do so -class EditHelper +class wxMacEditHelper { public : - EditHelper( TXNObject txn ) + wxMacEditHelper( TXNObject txn ) { TXNControlTag tag[] = { kTXNIOPrivilegesTag } ; m_txn = txn ; @@ -1313,7 +1436,7 @@ public : TXNSetTXNObjectControls( m_txn , false , 1 , tag , data ) ; } } - ~EditHelper() + ~wxMacEditHelper() { TXNControlTag tag[] = { kTXNIOPrivilegesTag } ; if ( m_data[0].uValue == kTXNReadOnly ) @@ -1326,6 +1449,11 @@ public : TXNControlData m_data[1] ; } ; +wxMacMLTEControl::wxMacMLTEControl( wxTextCtrl *peer ) : wxMacTextControl( peer ) +{ + SetNeedsFocusRect( true ) ; +} + wxString wxMacMLTEControl::GetStringValue() const { wxString result ; @@ -1353,7 +1481,7 @@ wxString wxMacMLTEControl::GetStringValue() const SetHandleSize( theText , ( actualSize + 1 ) * sizeof( UniChar ) ) ; HLock( theText ) ; (((UniChar*)*theText)[actualSize]) = 0 ; - wxMBConvUTF16BE converter ; + wxMBConvUTF16 converter ; size_t noChars = converter.MB2WC( NULL , (const char*)*theText , 0 ) ; ptr = new wxChar[noChars + 1] ; @@ -1401,22 +1529,26 @@ void wxMacMLTEControl::SetStringValue( const wxString &str) wxString st = str ; wxMacConvertNewlines10To13( &st ) ; - EditHelper help(m_txn) ; - - // wxMacWindowClipper c( this ) ; -#if !TARGET_API_MAC_OSX - // otherwise scrolling might have problems ? - TPUpdateVisibility( m_controlRef ) ; -#endif - SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ; - TXNSetSelection( m_txn, 0, 0); - TXNShowSelection( m_txn, kTXNShowStart); + { + wxMacWindowClipper c( m_peer ) ; + { + wxMacEditHelper help(m_txn) ; + SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ; + } + TXNSetSelection( m_txn, 0, 0); + TXNShowSelection( m_txn, kTXNShowStart); + } } TXNFrameOptions wxMacMLTEControl::FrameOptionsFromWXStyle( long wxStyle ) { TXNFrameOptions frameOptions = - kTXNDontDrawCaretWhenInactiveMask ; + kTXNDontDrawCaretWhenInactiveMask +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 + | kTXNDoFontSubstitutionMask +#endif + ; + if ( ! ( wxStyle & wxTE_NOHIDESEL ) ) frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ; @@ -1431,7 +1563,11 @@ TXNFrameOptions wxMacMLTEControl::FrameOptionsFromWXStyle( long wxStyle ) } if ( !(wxStyle & wxTE_NO_VSCROLL ) ) + { frameOptions |= kTXNWantVScrollBarMask ; + if ( frameOptions & kTXNWantHScrollBarMask ) + frameOptions |= kTXNDrawGrowIconMask ; + } } else frameOptions |= kTXNSingleLineOnlyMask ; @@ -1444,14 +1580,18 @@ TXNFrameOptions wxMacMLTEControl::FrameOptionsFromWXStyle( long wxStyle ) void wxMacMLTEControl::AdjustCreationAttributes( const wxColour &background, bool visible ) { - TXNControlTag iControlTags[3] = { kTXNDoFontSubstitution, kTXNWordWrapStateTag }; - TXNControlData iControlData[3] = { {false}, {kTXNNoAutoWrap} }; - int toptag = 2 ; -#if TARGET_API_MAC_OSX - iControlTags[2] = kTXNVisibilityTag ; - iControlData[2].uValue = visible ; - toptag++ ; -#endif + TXNControlTag iControlTags[] = + { + kTXNDoFontSubstitution, + kTXNWordWrapStateTag , + }; + TXNControlData iControlData[] = + { + {true}, + {kTXNNoAutoWrap}, + }; + + int toptag = WXSIZEOF( iControlTags ) ; if ( m_windowStyle & wxTE_MULTILINE ) { @@ -1464,23 +1604,27 @@ void wxMacMLTEControl::AdjustCreationAttributes( const wxColour &background, boo iControlTags, iControlData )) ; // setting the default font + // under 10.2 this causes a visible caret, therefore we avoid it - Str255 fontName ; - SInt16 fontSize ; - Style fontStyle ; + if ( UMAGetSystemVersion() >= 0x1030 ) + { + Str255 fontName ; + SInt16 fontSize ; + Style fontStyle ; - GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ; + GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ; - TXNTypeAttributes typeAttr[] = - { - { kTXNQDFontNameAttribute , kTXNQDFontNameAttributeSize , { (void*) fontName } } , - { kTXNQDFontSizeAttribute , kTXNFontSizeAttributeSize , { (void*) (fontSize << 16) } } , - { kTXNQDFontStyleAttribute , kTXNQDFontStyleAttributeSize , { (void*) normal } } , - } ; + TXNTypeAttributes typeAttr[] = + { + { kTXNQDFontNameAttribute , kTXNQDFontNameAttributeSize , { (void*) fontName } } , + { kTXNQDFontSizeAttribute , kTXNFontSizeAttributeSize , { (void*) (fontSize << 16) } } , + { kTXNQDFontStyleAttribute , kTXNQDFontStyleAttributeSize , { (void*) normal } } , + } ; - verify_noerr( TXNSetTypeAttributes (m_txn, sizeof( typeAttr ) / sizeof(TXNTypeAttributes) , typeAttr, - kTXNStartOffset, - kTXNEndOffset) ); + verify_noerr( TXNSetTypeAttributes (m_txn, sizeof( typeAttr ) / sizeof(TXNTypeAttributes) , typeAttr, + kTXNStartOffset, + kTXNEndOffset) ); + } if ( m_windowStyle & wxTE_PASSWORD ) { @@ -1550,12 +1694,12 @@ void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , lo void wxMacMLTEControl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle ) { - EditHelper help(m_txn) ; + wxMacEditHelper help(m_txn) ; TXNSetAttribute( wxTextAttr(foreground,wxNullColour,font) , kTXNStartOffset,kTXNEndOffset ) ; } void wxMacMLTEControl::SetStyle(long start, long end, const wxTextAttr& style) { - EditHelper help(m_txn) ; + wxMacEditHelper help(m_txn) ; TXNSetAttribute( style , start,end ) ; } @@ -1588,7 +1732,7 @@ void wxMacMLTEControl::SetEditable(bool editable) { TXNControlTag tag[] = { kTXNIOPrivilegesTag } ; TXNControlData data[] = { { editable ? kTXNReadWrite : kTXNReadOnly } } ; - TXNSetTXNObjectControls( m_txn , false , sizeof(tag) / sizeof (TXNControlTag) , tag , data ) ; + TXNSetTXNObjectControls( m_txn , false , WXSIZEOF(tag) , tag , data ) ; } wxTextPos wxMacMLTEControl::GetLastPosition() const @@ -1616,7 +1760,8 @@ void wxMacMLTEControl::Replace( long from , long to , const wxString str ) wxString value = str ; wxMacConvertNewlines10To13( &value ) ; - EditHelper help( m_txn ) ; + wxMacEditHelper help( m_txn ) ; + wxMacWindowClipper c( m_peer ) ; TXNSetSelection(m_txn , from , to ) ; TXNClear( m_txn ) ; @@ -1625,8 +1770,8 @@ void wxMacMLTEControl::Replace( long from , long to , const wxString str ) void wxMacMLTEControl::Remove( long from , long to ) { - EditHelper help( m_txn ) ; - + wxMacWindowClipper c( m_peer ) ; + wxMacEditHelper help( m_txn ) ; TXNSetSelection(m_txn , from , to ) ; TXNClear( m_txn ) ; } @@ -1638,6 +1783,7 @@ void wxMacMLTEControl::GetSelection( long* from, long* to) const void wxMacMLTEControl::SetSelection( long from , long to ) { + wxMacWindowClipper c( m_peer ) ; /* change the selection */ if ((from == -1) && (to == -1)) TXNSelectAll(m_txn); @@ -1648,20 +1794,24 @@ void wxMacMLTEControl::SetSelection( long from , long to ) void wxMacMLTEControl::WriteText(const wxString& str) { - EditHelper helper( m_txn ) ; wxString st = str ; wxMacConvertNewlines10To13( &st ) ; long start , end , dummy ; GetSelection( &start , &dummy ) ; - SetTXNData( st , kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ; + wxMacWindowClipper c( m_peer ) ; + { + wxMacEditHelper helper( m_txn ) ; + SetTXNData( st , kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ; + } GetSelection( &dummy , &end ) ; // TODO SetStyle( start , end , GetDefaultStyle() ) ; } void wxMacMLTEControl::Clear() { - EditHelper st(m_txn) ; + wxMacWindowClipper c( m_peer ) ; + wxMacEditHelper st(m_txn) ; TXNSetSelection( m_txn , kTXNStartOffset , kTXNEndOffset ) ; TXNClear(m_txn); } @@ -1787,7 +1937,9 @@ void wxMacMLTEControl::ShowPosition( long pos ) SInt32 dh = desired.h - current.h ; TXNShowSelection( m_txn , true ) ; theErr = TXNScroll( m_txn, kTXNScrollUnitsInPixels , kTXNScrollUnitsInPixels , &dv , &dh ); - wxASSERT_MSG( theErr == noErr, _T("TXNScroll returned an error!") ); + // 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 @@ -1801,7 +1953,7 @@ void wxMacMLTEControl::SetTXNData( const wxString& st , TXNOffset start , TXNOff TXNSetData( m_txn , kTXNUnicodeTextData, (void*)st.wc_str(), len * 2, start, end); #else - wxMBConvUTF16BE converter ; + wxMBConvUTF16 converter ; ByteCount byteBufferLen = converter.WC2MB( NULL , st.wc_str() , 0 ) ; UniChar *unibuf = (UniChar*) malloc(byteBufferLen) ; converter.WC2MB( (char*) unibuf , st.wc_str() , byteBufferLen ) ; @@ -1900,232 +2052,295 @@ int wxMacMLTEControl::GetLineLength(long lineNo) const // MLTE control implementation (classic part) // ---------------------------------------------------------------------------- -// CS:TODO we still have a problem getting properly at the text events of a control because under Carbon -// the MLTE engine registers itself for the key events thus the normal flow never occurs, the only measure for the -// moment is to avoid setting the true focus on the control, the proper solution at the end would be to have -// an alternate path for carbon key events that routes automatically into the same wx flow of events - -/* part codes */ - -/* kmUPTextPart is the part code we return to indicate the user has clicked -in the text area of our control */ -#define kmUPTextPart 1 - - -/* routines for using existing user pane controls. -These routines are useful for cases where you would like to use an -existing user pane control in, say, a dialog window as a scrolling -text edit field.*/ +// OS X Notes : We still don't have a full replacement for MLTE, so this implementation +// has to live on. We have different problems coming from outdated implementations on the +// various OS X versions. Most deal with the scrollbars: they are not correctly embedded +// while this can be solved on 10.3 by reassigning them the correct place, on 10.2 there is +// no way out, therefore we are using our own implementation and our own scrollbars .... -/* Utility Routines */ +#ifdef __WXMAC_OSX__ -/* kUserClickedToFocusPart is a part code we pass to the SetKeyboardFocus -routine. In our focus switching routine this part code is understood -as meaning 'the user has clicked in the control and we need to switch -the current focus to ourselves before we can continue'. */ -#define kUserClickedToFocusPart 100 +TXNScrollInfoUPP gTXNScrollInfoProc = NULL ; +ControlActionUPP gTXNScrollActionProc = NULL ; -/* STPTextPaneVars is a structure used for storing the the mUP Control's -internal variables and state information. A handle to this record is -stored in the pane control's reference value field using the -SetControlReference routine. */ - -class STPTextPaneVars { -public : - /* OS records referenced */ - TXNObject fTXNRec; /* the txn record */ - TXNFrameID fTXNFrame; /* the txn frame ID */ - ControlRef fUserPaneRec; /* handle to the user pane control */ - WindowPtr fOwner; /* window containing control */ - GrafPtr fDrawingEnvironment; /* grafport where control is drawn */ - /* flags */ - Boolean fInFocus; /* true while the focus rect is drawn around the control */ - Boolean fIsActive; /* true while the control is drawn in the active state */ - Boolean fTXNObjectActive; /* reflects the activation state of the text edit record */ - Boolean fFocusDrawState; /* true if focus is drawn (default: true) */ - /* calculated locations */ - Rect fRBounds; /* control bounds */ - Rect fRTextArea; /* area where the text is drawn */ - Rect fRFocusOutline; /* rectangle used to draw the focus box */ - Rect fRTextOutline; /* rectangle used to draw the border */ - RgnHandle fRTextOutlineRegion; /* background region for the text, erased before calling TEUpdate */ - /* our focus advance override routine */ - EventHandlerUPP handlerUPP; - EventHandlerRef handlerRef; - bool fNoBorders ; - bool fMultiline ; - bool fVisible ; -} ; - -/* Univerals Procedure Pointer variables used by the -mUP Control. These variables are set up -the first time that mUPOpenControl is called. */ -ControlUserPaneDrawUPP gTPDrawProc = NULL; -ControlUserPaneHitTestUPP gTPHitProc = NULL; -ControlUserPaneTrackingUPP gTPTrackProc = NULL; -ControlUserPaneIdleUPP gTPIdleProc = NULL; -ControlUserPaneKeyDownUPP gTPKeyProc = NULL; -ControlUserPaneActivateUPP gTPActivateProc = NULL; -ControlUserPaneFocusUPP gTPFocusProc = NULL; - -// one place for calculating all -static void TPCalculateBounds(STPTextPaneVars *varsp, const Rect& bounds) +pascal void wxMacMLTEClassicControl::TXNScrollInfoProc (SInt32 iValue, SInt32 iMaximumValue, TXNScrollBarOrientation + iScrollBarOrientation, SInt32 iRefCon) { - SetRect(&varsp->fRBounds, bounds.left, bounds.top, bounds.right, bounds.bottom); - SetRect(&varsp->fRFocusOutline, bounds.left, bounds.top, bounds.right, bounds.bottom); - // eventually make TextOutline inset 1,1 - SetRect(&varsp->fRTextOutline, bounds.left, bounds.top, bounds.right, bounds.bottom); - if ( !varsp->fNoBorders ) - { - SetRect(&varsp->fRTextArea, bounds.left + 2 , bounds.top + (varsp->fMultiline ? 0 : 2) , - bounds.right - (varsp->fMultiline ? 0 : 2), bounds.bottom - (varsp->fMultiline ? 0 : 2)); - } - else - { - SetRect(&varsp->fRTextArea, bounds.left , bounds.top , - bounds.right, bounds.bottom); - } -} + wxMacMLTEClassicControl* mlte = (wxMacMLTEClassicControl*) iRefCon ; + SInt32 value = wxMax( iValue , 0 ) ; + SInt32 maximum = wxMax( iMaximumValue , 0 ) ; -OSStatus MLTESetObjectVisibility( STPTextPaneVars *varsp, Boolean vis , long wxStyle) -{ - OSStatus err = noErr ; - wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(varsp->fUserPaneRec); - if ( textctrl ) + if ( iScrollBarOrientation == kTXNHorizontal ) { -#if TARGET_API_MAC_OSX - TXNControlTag iControlTags[1] = { kTXNVisibilityTag }; - TXNControlData iControlData[1] = {{ vis }}; - err = ::TXNSetTXNObjectControls( varsp->fTXNRec, false, 1, iControlTags, iControlData ); -#endif - Rect bounds ; - UMAGetControlBoundsInWindowCoords( varsp->fUserPaneRec, &bounds); - TPCalculateBounds( varsp , bounds ) ; - if ( vis ) + if ( mlte->m_sbHorizontal ) { - wxMacWindowClipper cl(textctrl) ; - TXNSetFrameBounds( varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left, - varsp->fRTextArea.bottom, varsp->fRTextArea.right, varsp->fTXNFrame); - TXNShowSelection( varsp->fTXNRec, kTXNShowStart); + SetControl32BitValue( mlte->m_sbHorizontal , value ) ; + SetControl32BitMaximum( mlte->m_sbHorizontal , maximum ) ; + mlte->m_lastHorizontalValue = value ; } - else + } + else if ( iScrollBarOrientation == kTXNVertical ) + { + if ( mlte->m_sbVertical ) { -#if TARGET_API_MAC_OSX - // in 10.2 the scrollbars are still actively redrawn when using only the code above - if ( UMAGetSystemVersion() < 0x1030 ) - { - TXNSetFrameBounds( varsp->fTXNRec, varsp->fRTextArea.top + 20000 , varsp->fRTextArea.left + 20000 , - varsp->fRTextArea.bottom + 20000 , varsp->fRTextArea.right + 20000 , varsp->fTXNFrame); - } -#endif + SetControl32BitValue( mlte->m_sbVertical , value ) ; + SetControl32BitMaximum( mlte->m_sbVertical , maximum ) ; + mlte->m_lastVerticalValue = value ; } } - return err ; } -// make sure we don't miss changes as carbon events are not available for these under classic -static void TPUpdateVisibility(ControlRef theControl) { - wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(theControl); - if ( textctrl == NULL ) +pascal void wxMacMLTEClassicControl::TXNScrollActionProc( ControlRef controlRef , ControlPartCode partCode ) +{ + OSStatus err ; + wxMacMLTEClassicControl* mlte = (wxMacMLTEClassicControl*) GetControlReference( controlRef ) ; + if ( mlte == NULL ) + return ; + + if ( controlRef != mlte->m_sbVertical && controlRef != mlte->m_sbHorizontal ) return ; - STPTextPaneVars *varsp = (STPTextPaneVars *) ((wxMacMLTEClassicControl*)textctrl->GetPeer())->m_macTXNvars ; + bool isHorizontal = ( controlRef == mlte->m_sbHorizontal ) ; - Rect bounds ; - UMAGetControlBoundsInWindowCoords(theControl, &bounds); - if ( textctrl->MacIsReallyShown() != varsp->fVisible ) + SInt32 minimum = 0 ; + SInt32 maximum = GetControl32BitMaximum( controlRef ) ; + SInt32 value = GetControl32BitValue( controlRef ) ; + SInt32 delta = 0; + switch ( partCode ) { - // invalidate old position - // InvalWindowRect( GetControlOwner( theControl ) , &varsp->fRBounds ) ; - varsp->fVisible = textctrl->MacIsReallyShown() ; + case kControlDownButtonPart : + delta = 10 ; + break ; + case kControlUpButtonPart : + delta = -10 ; + break ; + case kControlPageDownPart : + delta = GetControlViewSize( controlRef ) ; + break ; + case kControlPageUpPart : + delta = -GetControlViewSize( controlRef ) ; + break ; + case kControlIndicatorPart : + delta = value - + ( isHorizontal ? mlte->m_lastHorizontalValue : mlte->m_lastVerticalValue ) ; + break ; + default : + break ; } - if ( !EqualRect( &bounds , &varsp->fRBounds ) ) + if ( delta != 0 ) { - // old position - Rect oldBounds = varsp->fRBounds ; - TPCalculateBounds( varsp , bounds ) ; - // we only recalculate when visible, otherwise scrollbars get drawn at incorrect places - if ( varsp->fVisible ) + SInt32 newValue = value ; + + if ( partCode != kControlIndicatorPart ) { - wxMacWindowClipper cl(textctrl) ; - TXNSetFrameBounds( varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left, - varsp->fRTextArea.bottom, varsp->fRTextArea.right, varsp->fTXNFrame); + if( value + delta < minimum ) + delta = minimum - value ; + if ( value + delta > maximum ) + delta = maximum - value ; + + SetControl32BitValue( controlRef , value + delta ) ; + newValue = value + delta ; } - InvalWindowRect( GetControlOwner( theControl ) , &oldBounds ) ; - InvalWindowRect( GetControlOwner( theControl ) , &varsp->fRBounds ) ; + + SInt32 verticalDelta = isHorizontal ? 0 : delta ; + SInt32 horizontalDelta = isHorizontal ? delta : 0 ; + + err = TXNScroll( mlte->m_txn , kTXNScrollUnitsInPixels, kTXNScrollUnitsInPixels, + &verticalDelta , &horizontalDelta ); + + if ( isHorizontal ) + mlte->m_lastHorizontalValue = newValue ; + else + mlte->m_lastVerticalValue = newValue ; } } +#endif // make correct activations -static void TPActivatePaneText(STPTextPaneVars *varsp, Boolean setActive) { - wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(varsp->fUserPaneRec); - if (varsp->fTXNObjectActive != setActive && textctrl->MacIsReallyShown() ) +void wxMacMLTEClassicControl::MacActivatePaneText(Boolean setActive) +{ + wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef); + + wxMacWindowClipper clipper( textctrl ) ; + TXNActivate(m_txn, m_txnFrameID, setActive); + + ControlRef controlFocus = 0 ; + GetKeyboardFocus( m_txnWindow , &controlFocus ) ; + if ( controlFocus == m_controlRef ) + TXNFocus( m_txn, setActive); +} + +void wxMacMLTEClassicControl::MacFocusPaneText(Boolean setFocus) +{ + TXNFocus( m_txn, setFocus); +} + +// guards against inappropriate redraw (hidden objects drawing onto window) + +void wxMacMLTEClassicControl::MacSetObjectVisibility(Boolean vis) +{ + ControlRef controlFocus = 0 ; + GetKeyboardFocus( m_txnWindow , &controlFocus ) ; + + if ( controlFocus == m_controlRef && vis == false ) { - varsp->fTXNObjectActive = setActive; - TXNActivate(varsp->fTXNRec, varsp->fTXNFrame, varsp->fTXNObjectActive); - if (varsp->fInFocus) - TXNFocus( varsp->fTXNRec, varsp->fTXNObjectActive); + SetKeyboardFocus( m_txnWindow , m_controlRef , kControlFocusNoPart ) ; } -} -// update focus outlines -static void TPRedrawFocusOutline(STPTextPaneVars *varsp) { - /* state changed */ - if (varsp->fFocusDrawState != (varsp->fIsActive && varsp->fInFocus)) + TXNControlTag iControlTags[1] = { kTXNVisibilityTag }; + TXNControlData iControlData[1] = { {(UInt32) false } }; + + verify_noerr( TXNGetTXNObjectControls( m_txn , 1, + iControlTags, iControlData ) ) ; + + if ( iControlData[0].uValue != vis ) { - varsp->fFocusDrawState = (varsp->fIsActive && varsp->fInFocus); - // DrawThemeFocusRect(&varsp->fRFocusOutline, varsp->fFocusDrawState); + iControlData[0].uValue = vis ; + verify_noerr( TXNSetTXNObjectControls( m_txn, false , 1, + iControlTags, iControlData )) ; } + // we right now are always clipping as partial visibility (overlapped) visibility + // is also a problem, if we run into further problems we might set the FrameBounds to an empty + // rect here } -// update TXN focus state -static void TPFocusPaneText(STPTextPaneVars *varsp, Boolean setFocus) { - wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(varsp->fUserPaneRec); +// make sure that the TXNObject is at the right position + +void wxMacMLTEClassicControl::MacUpdatePosition() +{ + wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef); + if ( textctrl == NULL ) + return ; + + Rect bounds ; + UMAGetControlBoundsInWindowCoords(m_controlRef, &bounds); + + wxRect visRect = textctrl->MacGetClippedClientRect() ; + Rect visBounds = { visRect.y , visRect.x , visRect.y + visRect.height , visRect.x + visRect.width } ; + int x , y ; + x = y = 0 ; + textctrl->MacWindowToRootWindow( &x , &y ) ; + OffsetRect( &visBounds , x , y ) ; - if (varsp->fInFocus != setFocus && textctrl->MacIsReallyShown()) { - varsp->fInFocus = setFocus; - TXNFocus( varsp->fTXNRec, varsp->fInFocus); + if ( !EqualRect( &bounds , &m_txnControlBounds ) || !EqualRect( &visBounds , &m_txnVisBounds) ) + { + m_txnControlBounds = bounds ; + m_txnVisBounds = visBounds ; + wxMacWindowClipper cl(textctrl) ; + +#ifdef __WXMAC_OSX__ + bool isCompositing = textctrl->MacGetTopLevelWindow()->MacUsesCompositing() ; + if ( m_sbHorizontal || m_sbVertical ) + { + int w = bounds.right - bounds.left ; + int h = bounds.bottom - bounds.top ; + + if ( m_sbHorizontal ) + { + Rect sbBounds ; + + sbBounds.left = -1 ; + sbBounds.top = h - 14 ; + sbBounds.right = w + 1 ; + sbBounds.bottom = h + 1 ; + + if ( !isCompositing ) + OffsetRect( &sbBounds , m_txnControlBounds.left , m_txnControlBounds.top ) ; + + SetControlBounds( m_sbHorizontal , &sbBounds ) ; + SetControlViewSize( m_sbHorizontal , w ) ; + } + if ( m_sbVertical ) + { + Rect sbBounds ; + + sbBounds.left = w - 14 ; + sbBounds.top = -1 ; + sbBounds.right = w + 1 ; + sbBounds.bottom = m_sbHorizontal ? h - 14 : h + 1 ; + + if ( !isCompositing ) + OffsetRect( &sbBounds , m_txnControlBounds.left , m_txnControlBounds.top ) ; + + SetControlBounds( m_sbVertical , &sbBounds ) ; + SetControlViewSize( m_sbVertical , h ) ; + } + } + + Rect oldviewRect ; + TXNLongRect olddestRect ; + TXNGetRectBounds( m_txn , &oldviewRect , &olddestRect , NULL ) ; + + Rect viewRect = { m_txnControlBounds.top, m_txnControlBounds.left, + m_txnControlBounds.bottom - ( m_sbHorizontal ? 14 : 0 ) , m_txnControlBounds.right - ( m_sbVertical ? 14 : 0 ) } ; + TXNLongRect destRect = { m_txnControlBounds.top, m_txnControlBounds.left, + m_txnControlBounds.bottom - ( m_sbHorizontal ? 14 : 0 ) , m_txnControlBounds.right - ( m_sbVertical ? 14 : 0 ) } ; + + if ( olddestRect.right >= 10000 ) + destRect.right = destRect.left + 32000 ; + + if ( olddestRect.bottom >= 0x20000000 ) + destRect.bottom = destRect.top + 0x40000000 ; + + SectRect( &viewRect , &visBounds , &viewRect ) ; + TXNSetRectBounds( m_txn , &viewRect , &destRect , true ) ; +/* + TXNSetFrameBounds( m_txn, m_txnControlBounds.top, m_txnControlBounds.left, + m_txnControlBounds.bottom - ( m_sbHorizontal ? 14 : 0 ) , m_txnControlBounds.right - ( m_sbVertical ? 14 : 0 ), m_txnFrameID); +*/ +#else + + TXNSetFrameBounds( m_txn, m_txnControlBounds.top, m_txnControlBounds.left, + wxMax( m_txnControlBounds.bottom , m_txnControlBounds.top ) , + wxMax( m_txnControlBounds.right , m_txnControlBounds.left ) , m_txnFrameID); +#endif + // the SetFrameBounds method unter classic sometimes does not correctly scroll a selection into sight after a + // movement, therefore we have to force it + + // according to David Surovell this problem also sometimes occurs under OSX, so we use this as well + + TXNLongRect textRect ; + TXNGetRectBounds( m_txn , NULL , NULL , &textRect ) ; + if ( textRect.left < m_txnControlBounds.left ) + { + TXNShowSelection( m_txn , false ) ; + } } } -// draw the control -static pascal void TPPaneDrawProc(ControlRef theControl, ControlPartCode thePart) { - /* set up our globals */ +void wxMacMLTEClassicControl::SetRect( Rect *r ) +{ + wxMacControl::SetRect( r ) ; + MacUpdatePosition() ; +} - wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(theControl); +void wxMacMLTEClassicControl::MacControlUserPaneDrawProc(wxInt16 thePart) +{ + wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef); if ( textctrl == NULL ) return ; - TPUpdateVisibility( theControl ) ; - STPTextPaneVars *varsp = (STPTextPaneVars *) ((wxMacMLTEClassicControl*)textctrl->GetPeer())->m_macTXNvars ; if ( textctrl->MacIsReallyShown() ) { wxMacWindowClipper clipper( textctrl ) ; - TXNDraw(varsp->fTXNRec, NULL); - if ( !varsp->fNoBorders ) - DrawThemeEditTextFrame(&varsp->fRTextOutline, varsp->fIsActive ? kThemeStateActive: kThemeStateInactive); - TPRedrawFocusOutline( varsp ) ; + TXNDraw( m_txn , NULL ) ; } } - -/* TPPaneHitTestProc is called when the control manager would -like to determine what part of the control the mouse resides over. -We also call this routine from our tracking proc to determine how -to handle mouse clicks. */ -static pascal ControlPartCode TPPaneHitTestProc(ControlRef theControl, Point where) { +wxInt16 wxMacMLTEClassicControl::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) +{ + Point where = { y , x } ; ControlPartCode result; - /* set up our locals and lock down our globals*/ + result = 0; - wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(theControl); + wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef); if ( textctrl == NULL ) return 0 ; - TPUpdateVisibility( theControl ) ; - STPTextPaneVars *varsp = (STPTextPaneVars *) ((wxMacMLTEClassicControl*)textctrl->GetPeer())->m_macTXNvars ; + if (textctrl->MacIsReallyShown() ) { - if (PtInRect(where, &varsp->fRBounds)) - result = kmUPTextPart; + if (PtInRect(where, &m_txnControlBounds)) + result = kControlEditTextPart ; else { // sometimes we get the coords also in control local coordinates, therefore test again @@ -2136,8 +2351,8 @@ static pascal ControlPartCode TPPaneHitTestProc(ControlRef theControl, Point whe where.h += x ; where.v += y ; } - if (PtInRect(where, &varsp->fRBounds)) - result = kmUPTextPart; + if (PtInRect(where, &m_txnControlBounds)) + result = kControlEditTextPart ; else result = 0; } @@ -2145,33 +2360,17 @@ static pascal ControlPartCode TPPaneHitTestProc(ControlRef theControl, Point whe return result; } - - - - -/* TPPaneTrackingProc is called when the mouse is being held down -over our control. This routine handles clicks in the text area -and in the scroll bar. */ -static pascal ControlPartCode TPPaneTrackingProc(ControlRef theControl, Point startPt, ControlActionUPP actionProc) { - - ControlPartCode partCodeResult; - /* make sure we have some variables... */ - partCodeResult = 0; - wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(theControl); +wxInt16 wxMacMLTEClassicControl::MacControlUserPaneTrackingProc( wxInt16 x, wxInt16 y, void* actionProc ) +{ + wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef); if ( textctrl == NULL ) return 0; - TPUpdateVisibility( theControl ) ; - STPTextPaneVars *varsp = (STPTextPaneVars *) ((wxMacMLTEClassicControl*)textctrl->GetPeer())->m_macTXNvars ; + + ControlPartCode partCodeResult = 0; + if (textctrl->MacIsReallyShown() ) { - /* we don't do any of these functions unless we're in focus */ - if ( ! varsp->fInFocus) { - WindowPtr owner; - owner = GetControlOwner(theControl); - ClearKeyboardFocus(owner); - SetKeyboardFocus(owner, theControl, kUserClickedToFocusPart); - } - /* find the location for the click */ + Point startPt = { y ,x } ; // for compositing, we must convert these into toplevel window coordinates, because hittesting expects them if ( textctrl->MacGetTopLevelWindow()->MacUsesCompositing() ) { @@ -2181,279 +2380,274 @@ static pascal ControlPartCode TPPaneTrackingProc(ControlRef theControl, Point st startPt.v += y ; } - switch (TPPaneHitTestProc(theControl, startPt)) + switch (MacControlUserPaneHitTestProc( startPt.h , startPt.v )) { - /* handle clicks in the text part */ - case kmUPTextPart: + case kControlEditTextPart : { wxMacWindowClipper clipper( textctrl ) ; EventRecord rec ; ConvertEventRefToEventRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) ; - TXNClick( varsp->fTXNRec, &rec ); + TXNClick( m_txn, &rec ); } - break; - + break; } } return partCodeResult; } - -/* TPPaneIdleProc is our user pane idle routine. When our text field -is active and in focus, we use this routine to set the cursor. */ -static pascal void TPPaneIdleProc(ControlRef theControl) { - /* set up locals */ - wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(theControl); +void wxMacMLTEClassicControl::MacControlUserPaneIdleProc() +{ + wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef); if ( textctrl == NULL ) return ; - TPUpdateVisibility( theControl ) ; - STPTextPaneVars *varsp = (STPTextPaneVars *) ((wxMacMLTEClassicControl*)textctrl->GetPeer())->m_macTXNvars ; - if (textctrl->MacIsReallyShown()) { - /* if we're not active, then we have nothing to say about the cursor */ - if (varsp->fIsActive) { - Rect bounds; + + if (textctrl->MacIsReallyShown()) + { + if (IsControlActive(m_controlRef)) + { Point mousep; wxMacWindowClipper clipper( textctrl ) ; GetMouse(&mousep); - /* there's a 'focus thing' and an 'unfocused thing' */ - if (varsp->fInFocus) { - /* flash the cursor */ - SetPort(varsp->fDrawingEnvironment); - TXNIdle(varsp->fTXNRec); - /* set the cursor */ - if (PtInRect(mousep, &varsp->fRTextArea)) { - RgnHandle theRgn; - RectRgn((theRgn = NewRgn()), &varsp->fRTextArea); - TXNAdjustCursor(varsp->fTXNRec, theRgn); - DisposeRgn(theRgn); - } - else - { - // SetThemeCursor(kThemeArrowCursor); - } - } else { - /* if it's in our bounds, set the cursor */ - UMAGetControlBoundsInWindowCoords(theControl, &bounds); - if (PtInRect(mousep, &bounds)) - { - // SetThemeCursor(kThemeArrowCursor); - } + + TXNIdle(m_txn); + + if (PtInRect(mousep, &m_txnControlBounds)) + { + RgnHandle theRgn; + RectRgn((theRgn = NewRgn()), &m_txnControlBounds); + TXNAdjustCursor(m_txn, theRgn); + DisposeRgn(theRgn); } } } } - -/* TPPaneKeyDownProc is called whenever a keydown event is directed -at our control. Here, we direct the keydown event to the text -edit record and redraw the scroll bar and text field as appropriate. */ -static pascal ControlPartCode TPPaneKeyDownProc(ControlRef theControl, - SInt16 keyCode, SInt16 charCode, SInt16 modifiers) { - - wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(theControl); +wxInt16 wxMacMLTEClassicControl::MacControlUserPaneKeyDownProc (wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) +{ + wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef); if ( textctrl == NULL ) return 0; - TPUpdateVisibility( theControl ) ; - STPTextPaneVars *varsp = (STPTextPaneVars *) ((wxMacMLTEClassicControl*)textctrl->GetPeer())->m_macTXNvars ; - if (varsp->fInFocus) - { - /* turn autoscrolling on and send the key event to text edit */ - wxMacWindowClipper clipper( textctrl ) ; - EventRecord ev ; - memset( &ev , 0 , sizeof( ev ) ) ; - ev.what = keyDown ; - ev.modifiers = modifiers ; - ev.message = (( keyCode << 8 ) & keyCodeMask ) + ( charCode & charCodeMask ) ; - TXNKeyDown( varsp->fTXNRec, &ev); - } + wxMacWindowClipper clipper( textctrl ) ; + + EventRecord ev ; + memset( &ev , 0 , sizeof( ev ) ) ; + ev.what = keyDown ; + ev.modifiers = modifiers ; + ev.message = (( keyCode << 8 ) & keyCodeMask ) + ( charCode & charCodeMask ) ; + TXNKeyDown( m_txn , &ev); + return kControlEntireControl; } +void wxMacMLTEClassicControl::MacControlUserPaneActivateProc( bool activating) +{ + MacActivatePaneText( activating ); +} -/* TPPaneActivateProc is called when the window containing -the user pane control receives activate events. Here, we redraw -the control and it's text as necessary for the activation state. */ -static pascal void TPPaneActivateProc(ControlRef theControl, Boolean activating) { - /* set up locals */ - wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(theControl); +wxInt16 wxMacMLTEClassicControl::MacControlUserPaneFocusProc(wxInt16 action) +{ + ControlPartCode focusResult; + focusResult = kControlFocusNoPart; + wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef); if ( textctrl == NULL ) - return ; - TPUpdateVisibility( theControl ) ; - - STPTextPaneVars *varsp = (STPTextPaneVars *) ((wxMacMLTEClassicControl*)textctrl->GetPeer())->m_macTXNvars ; + return 0; - varsp->fIsActive = activating; wxMacWindowClipper clipper( textctrl ) ; - TPActivatePaneText(varsp, varsp->fIsActive && varsp->fInFocus); - /* redraw the frame */ - if ( textctrl->MacIsReallyShown() ) - { - if ( !varsp->fNoBorders ) - DrawThemeEditTextFrame(&varsp->fRTextOutline, varsp->fIsActive ? kThemeStateActive: kThemeStateInactive); - TPRedrawFocusOutline( varsp ) ; - } -} + ControlRef controlFocus = 0 ; + GetKeyboardFocus( m_txnWindow , &controlFocus ) ; + bool wasFocused = ( controlFocus == m_controlRef ) ; -/* TPPaneFocusProc is called when every the focus changes to or -from our control. Herein, switch the focus appropriately -according to the parameters and redraw the control as -necessary. */ -static pascal ControlPartCode TPPaneFocusProc(ControlRef theControl, ControlFocusPart action) { - ControlPartCode focusResult; + switch (action) + { + case kControlFocusPrevPart: + case kControlFocusNextPart: + MacFocusPaneText( ( !wasFocused)); + focusResult = (!wasFocused) ? (ControlPartCode) kControlEditTextPart : (ControlPartCode) kControlFocusNoPart; + break; - focusResult = kControlFocusNoPart; - wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(theControl); - if ( textctrl == NULL ) - return 0; - TPUpdateVisibility( theControl ) ; - STPTextPaneVars *varsp = (STPTextPaneVars *) ((wxMacMLTEClassicControl*)textctrl->GetPeer())->m_macTXNvars ; - /* if kControlFocusPrevPart and kControlFocusNextPart are received when the user is - tabbing forwards (or shift tabbing backwards) through the items in the dialog, - and kControlFocusNextPart will be received. When the user clicks in our field - and it is not the current focus, then the constant kUserClickedToFocusPart will - be received. The constant kControlFocusNoPart will be received when our control - is the current focus and the user clicks in another control. In your focus routine, - you should respond to these codes as follows: - - kControlFocusNoPart - turn off focus and return kControlFocusNoPart. redraw - the control and the focus rectangle as necessary. - - kControlFocusPrevPart or kControlFocusNextPart - toggle focus on or off - depending on its current state. redraw the control and the focus rectangle - as appropriate for the new focus state. If the focus state is 'off', return the constant - kControlFocusNoPart, otherwise return a non-zero part code. - kUserClickedToFocusPart - is a constant defined for this example. You should - define your own value for handling click-to-focus type events. */ - /* calculate the next highlight state */ - switch (action) { - default: case kControlFocusNoPart: - TPFocusPaneText(varsp, false); + default: + MacFocusPaneText( false); focusResult = kControlFocusNoPart; break; - case kUserClickedToFocusPart: - TPFocusPaneText(varsp, true); - focusResult = 1; - break; - case kControlFocusPrevPart: - case kControlFocusNextPart: - TPFocusPaneText(varsp, ( ! varsp->fInFocus)); - focusResult = varsp->fInFocus ? 1 : kControlFocusNoPart; - break; - } - TPActivatePaneText(varsp, varsp->fIsActive && varsp->fInFocus); - /* redraw the text fram and focus rectangle to indicate the - new focus state */ - if ( textctrl->MacIsReallyShown() ) - { - wxMacWindowClipper c( textctrl ) ; - if ( !varsp->fNoBorders ) - DrawThemeEditTextFrame(&varsp->fRTextOutline, varsp->fIsActive ? kThemeStateActive: kThemeStateInactive); - TPRedrawFocusOutline( varsp ) ; } + return focusResult; } -wxMacMLTEClassicControl::wxMacMLTEClassicControl( wxWindow *wxPeer, +void wxMacMLTEClassicControl::MacControlUserPaneBackgroundProc( void *info ) +{ +} + +wxMacMLTEClassicControl::wxMacMLTEClassicControl( wxTextCtrl *wxPeer, const wxString& str, const wxPoint& pos, - const wxSize& size, long style ) + const wxSize& size, long style ) : wxMacMLTEControl( wxPeer ) { m_font = wxPeer->GetFont() ; m_windowStyle = style ; Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ; - wxString st = str ; - wxMacConvertNewlines10To13( &st ) ; short featurSet; featurSet = kControlSupportsEmbedding | kControlSupportsFocus | kControlWantsIdle - | kControlWantsActivate | kControlHandlesTracking | kControlHasSpecialBackground + | kControlWantsActivate | kControlHandlesTracking // | kControlHasSpecialBackground | kControlGetsFocusOnClick | kControlSupportsLiveFeedback; - /* create the control */ verify_noerr( ::CreateUserPaneControl( MAC_WXHWND(wxPeer->GetParent()->MacGetTopLevelWindowRef()), &bounds, featurSet, &m_controlRef ) ); - { -// wxMacWindowClipper c(wxPeer) ; - DoCreate(); - } - - if ( wxPeer->MacIsReallyShown() ) - MLTESetObjectVisibility( (STPTextPaneVars*) m_macTXNvars, true , style ) ; + DoCreate(); - { - // wxMacWindowClipper clipper( wxPeer ) ; + AdjustCreationAttributes( *wxWHITE , true) ; - TPUpdateVisibility( m_controlRef ) ; + MacSetObjectVisibility( wxPeer->MacIsReallyShown() ) ; + { + wxString st = str ; + wxMacConvertNewlines10To13( &st ) ; + wxMacWindowClipper clipper( m_peer ) ; SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ; - TXNSetSelection( m_txn, 0, 0); - TXNShowSelection( m_txn, kTXNShowStart); } - - AdjustCreationAttributes( *wxWHITE , true ) ; } wxMacMLTEClassicControl::~wxMacMLTEClassicControl() { -// SetControlReference(m_controlRef , 0) ; TXNDeleteObject(m_txn); - free(m_macTXNvars); + m_txn = NULL ; } void wxMacMLTEClassicControl::VisibilityChanged(bool shown) { - MLTESetObjectVisibility((STPTextPaneVars*) m_macTXNvars , shown , m_windowStyle ) ; - if ( !shown ) - InvalWindowRect( GetControlOwner( m_controlRef ) , &((STPTextPaneVars *)m_macTXNvars)->fRBounds ) ; + MacSetObjectVisibility( shown ) ; + wxMacControl::VisibilityChanged( shown ) ; } -bool wxMacMLTEClassicControl::NeedsFocusRect() const +void wxMacMLTEClassicControl::SuperChangedPosition() { - return true; + MacUpdatePosition() ; + wxMacControl::SuperChangedPosition() ; +} + +#ifdef __WXMAC_OSX__ + +ControlUserPaneDrawUPP gTPDrawProc = NULL; +ControlUserPaneHitTestUPP gTPHitProc = NULL; +ControlUserPaneTrackingUPP gTPTrackProc = NULL; +ControlUserPaneIdleUPP gTPIdleProc = NULL; +ControlUserPaneKeyDownUPP gTPKeyProc = NULL; +ControlUserPaneActivateUPP gTPActivateProc = NULL; +ControlUserPaneFocusUPP gTPFocusProc = NULL; + +static pascal void wxMacControlUserPaneDrawProc(ControlRef control, SInt16 part) +{ + wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ; + wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ; + if ( win ) + win->MacControlUserPaneDrawProc(part) ; +} + +static pascal ControlPartCode wxMacControlUserPaneHitTestProc(ControlRef control, Point where) +{ + wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ; + wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ; + if ( win ) + return win->MacControlUserPaneHitTestProc(where.h , where.v) ; + else + return kControlNoPart ; +} + +static pascal ControlPartCode wxMacControlUserPaneTrackingProc(ControlRef control, Point startPt, ControlActionUPP actionProc) +{ + wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ; + wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ; + if ( win ) + return win->MacControlUserPaneTrackingProc( startPt.h , startPt.v , (void*) actionProc) ; + else + return kControlNoPart ; +} + +static pascal void wxMacControlUserPaneIdleProc(ControlRef control) +{ + wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ; + wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ; + if ( win ) + win->MacControlUserPaneIdleProc() ; +} + +static pascal ControlPartCode wxMacControlUserPaneKeyDownProc(ControlRef control, SInt16 keyCode, SInt16 charCode, SInt16 modifiers) +{ + wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ; + wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ; + if ( win ) + return win->MacControlUserPaneKeyDownProc(keyCode,charCode,modifiers) ; + else + return kControlNoPart ; +} + +static pascal void wxMacControlUserPaneActivateProc(ControlRef control, Boolean activating) +{ + wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ; + wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ; + if ( win ) + win->MacControlUserPaneActivateProc(activating) ; +} + +static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control, ControlFocusPart action) +{ + wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ; + wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ; + if ( win ) + return win->MacControlUserPaneFocusProc(action) ; + else + return kControlNoPart ; } +/* +static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, ControlBackgroundPtr info) +{ + wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ; + wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ; + if ( win ) + win->MacControlUserPaneBackgroundProc(info) ; +} +*/ +#endif + +// TXNRegisterScrollInfoProc + OSStatus wxMacMLTEClassicControl::DoCreate() { Rect bounds; - WindowRef theWindow; OSStatus err = noErr ; /* 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 */ - m_macTXNvars = (STPTextPaneVars *) malloc(sizeof(STPTextPaneVars)); +#ifdef __WXMAC_OSX__ + if (gTPDrawProc == NULL) gTPDrawProc = NewControlUserPaneDrawUPP(wxMacControlUserPaneDrawProc); + if (gTPHitProc == NULL) gTPHitProc = NewControlUserPaneHitTestUPP(wxMacControlUserPaneHitTestProc); + if (gTPTrackProc == NULL) gTPTrackProc = NewControlUserPaneTrackingUPP(wxMacControlUserPaneTrackingProc); + if (gTPIdleProc == NULL) gTPIdleProc = NewControlUserPaneIdleUPP(wxMacControlUserPaneIdleProc); + if (gTPKeyProc == NULL) gTPKeyProc = NewControlUserPaneKeyDownUPP(wxMacControlUserPaneKeyDownProc); + if (gTPActivateProc == NULL) gTPActivateProc = NewControlUserPaneActivateUPP(wxMacControlUserPaneActivateProc); + if (gTPFocusProc == NULL) gTPFocusProc = NewControlUserPaneFocusUPP(wxMacControlUserPaneFocusProc); + + if (gTXNScrollInfoProc == NULL ) gTXNScrollInfoProc = NewTXNScrollInfoUPP(TXNScrollInfoProc) ; + if (gTXNScrollActionProc == NULL ) gTXNScrollActionProc = NewControlActionUPP(TXNScrollActionProc) ; +#endif /* set the initial settings for our private data */ - m_macTXNvars->fMultiline = m_windowStyle & wxTE_MULTILINE ; - m_macTXNvars->fNoBorders = m_windowStyle & wxNO_BORDER ; - m_macTXNvars->fInFocus = false; - m_macTXNvars->fIsActive = true; - m_macTXNvars->fTXNObjectActive = false; - m_macTXNvars->fFocusDrawState = false ; - m_macTXNvars->fUserPaneRec = m_controlRef ; - m_macTXNvars->fVisible = true ; - - theWindow = m_macTXNvars->fOwner = GetControlOwner(m_controlRef); - m_macTXNvars->fDrawingEnvironment = (GrafPtr) GetWindowPort(theWindow); + m_txnWindow =GetControlOwner(m_controlRef); + m_txnPort = (GrafPtr) GetWindowPort(m_txnWindow); +#ifdef __WXMAC_OSX__ /* set up the user pane procedures */ SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneDrawProcTag, sizeof(gTPDrawProc), &gTPDrawProc); SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneHitTestProcTag, sizeof(gTPHitProc), &gTPHitProc); @@ -2462,31 +2656,89 @@ OSStatus wxMacMLTEClassicControl::DoCreate() SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneKeyDownProcTag, sizeof(gTPKeyProc), &gTPKeyProc); SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneActivateProcTag, sizeof(gTPActivateProc), &gTPActivateProc); SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneFocusProcTag, sizeof(gTPFocusProc), &gTPFocusProc); - +#endif /* calculate the rectangles used by the control */ UMAGetControlBoundsInWindowCoords(m_controlRef, &bounds); - m_macTXNvars->fRTextOutlineRegion = NewRgn() ; - TPCalculateBounds( m_macTXNvars , bounds ) ; - /* set up the drawing environment */ - SetPort(m_macTXNvars->fDrawingEnvironment); + m_txnControlBounds = bounds ; + m_txnVisBounds = bounds ; + + CGrafPtr origPort = NULL ; + GDHandle origDev = NULL ; + GetGWorld( &origPort , &origDev ) ; + SetPort(m_txnPort); /* create the new edit field */ TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( m_windowStyle ) ; - verify_noerr(TXNNewObject(NULL, m_macTXNvars->fOwner, &m_macTXNvars->fRTextArea, +#ifdef __WXMAC_OSX__ + + // the scrollbars are not correctly embedded but are inserted at the root + // this gives us problems as we have erratic redraws even over the structure + // area + + m_sbHorizontal = 0 ; + m_sbVertical = 0 ; + m_lastHorizontalValue = 0 ; + m_lastVerticalValue = 0 ; + + Rect sb = { 0 , 0 , 0 , 0 } ; + if ( frameOptions & kTXNWantVScrollBarMask ) + { + CreateScrollBarControl( m_txnWindow , &sb , 0 , 0 , 100 , 1 , true , gTXNScrollActionProc , &m_sbVertical ) ; + SetControlReference( m_sbVertical , (SInt32) this ) ; + SetControlAction( m_sbVertical, gTXNScrollActionProc ); + ShowControl( m_sbVertical ) ; + EmbedControl( m_sbVertical , m_controlRef ) ; + frameOptions &= ~kTXNWantVScrollBarMask ; + } + if ( frameOptions & kTXNWantHScrollBarMask ) + { + CreateScrollBarControl( m_txnWindow , &sb , 0 , 0 , 100 , 1 , true , gTXNScrollActionProc , &m_sbHorizontal ) ; + SetControlReference( m_sbHorizontal , (SInt32) this ) ; + SetControlAction( m_sbHorizontal, gTXNScrollActionProc ); + ShowControl( m_sbHorizontal ) ; + EmbedControl( m_sbHorizontal , m_controlRef ) ; + frameOptions &= ~(kTXNWantHScrollBarMask | kTXNDrawGrowIconMask); + } + +#endif + + verify_noerr(TXNNewObject(NULL, m_txnWindow , &bounds, frameOptions , kTXNTextEditStyleFrameType, kTXNTextensionFile, kTXNSystemDefaultEncoding, - &m_macTXNvars->fTXNRec, &m_macTXNvars->fTXNFrame, (TXNObjectRefcon) m_macTXNvars)); - m_txn = m_macTXNvars->fTXNRec ; + &m_txn, &m_txnFrameID, NULL ) ); +/* + TXNCarbonEventInfo cInfo ; - /* perform final activations and setup for our text field. Here, - we assume that the window is going to be the 'active' window. */ - TPActivatePaneText(m_macTXNvars, m_macTXNvars->fIsActive && m_macTXNvars->fInFocus); - /* all done */ + cInfo.useCarbonEvents = false ; + cInfo.filler = 0 ; + cInfo.flags = 0 ; + cInfo.fDictionary = NULL ; + + TXNControlTag iControlTags[] = + { + kTXNUseCarbonEvents , + }; + TXNControlData iControlData[] = + { + {(UInt32) &cInfo }, + }; + + int toptag = WXSIZEOF( iControlTags ) ; + + verify_noerr( TXNSetTXNObjectControls( m_txn, false , toptag, + iControlTags, iControlData )) ; + +*/ +#ifdef __WXMAC_OSX__ + TXNRegisterScrollInfoProc( m_txn, gTXNScrollInfoProc, (SInt32) this); +#endif + + SetGWorld( origPort , origDev ) ; return err; } @@ -2498,10 +2750,10 @@ OSStatus wxMacMLTEClassicControl::DoCreate() #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 -wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxWindow *wxPeer, +wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer, const wxString& str, const wxPoint& pos, - const wxSize& size, long style ) + const wxSize& size, long style ) : wxMacMLTEControl( wxPeer ) { m_font = wxPeer->GetFont() ; m_windowStyle = style ; @@ -2538,12 +2790,14 @@ wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxWindow *wxPeer, m_controlRef = m_textView ; } + AdjustCreationAttributes( *wxWHITE , true ) ; + + wxMacWindowClipper c( m_peer ) ; SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ; TXNSetSelection( m_txn, 0, 0); TXNShowSelection( m_txn, kTXNShowStart); - AdjustCreationAttributes( *wxWHITE , true ) ; } OSStatus wxMacMLTEHIViewControl::SetFocus( ControlFocusPart focusPart ) @@ -2559,11 +2813,6 @@ bool wxMacMLTEHIViewControl::HasFocus() const return control == m_textView ; } -bool wxMacMLTEHIViewControl::NeedsFocusRect() const -{ - return m_windowStyle & wxNO_BORDER ? false : true; -} - #endif // MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2