#define wxMAC_AWAYS_USE_MLTE 1
#endif
+#ifndef __WXMAC_OSX__
+enum
+{
+ kTXNVisibilityTag = 'visb' /*set the visibility state of the object */
+};
+#endif
+
#include <MacTextEditor.h>
#include <ATSUnicode.h>
#include <TextCommon.h>
class wxMacTextControl : public wxMacControl
{
public :
- wxMacTextControl() ;
+ wxMacTextControl( wxTextCtrl *peer ) ;
~wxMacTextControl() ;
virtual wxString GetStringValue() const = 0 ;
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
class wxMacMLTEControl : public wxMacTextControl
{
public :
+ wxMacMLTEControl( wxTextCtrl *peer ) ;
virtual wxString GetStringValue() const ;
virtual void SetStringValue( const wxString &str) ;
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 ;
class wxMacUnicodeTextControl : public wxMacTextControl
{
public :
- wxMacUnicodeTextControl( wxWindow *wxPeer,
+ wxMacUnicodeTextControl( wxTextCtrl *wxPeer,
const wxString& str,
const wxPoint& pos,
const wxSize& size, long style ) ;
#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 ;
+
+#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 ( !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),
style |= wxTE_PROCESS_ENTER ;
}
-#if TARGET_API_MAC_OSX
+#ifdef __WXMAC_OSX__
#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
- if ( UMAGetSystemVersion() >= 0x1030 )
+ if ( UMAGetSystemVersion() >= 0x1050 )
{
m_peer = new wxMacMLTEHIViewControl( this , str , pos , size , style ) ;
}
#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 ) ;
}
{
SetEditable( false ) ;
}
+
+ SetCursor( wxCursor( wxCURSOR_IBEAM ) ) ;
return true;
}
+void wxTextCtrl::MacSuperChangedPosition()
+{
+ wxWindow::MacSuperChangedPosition() ;
+ GetPeer()->SuperChangedPosition() ;
+}
+
void wxTextCtrl::MacVisibilityChanged()
{
GetPeer()->VisibilityChanged( MacIsReallyShown() ) ;
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 )
{
}
#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 ;
// 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 ;
TXNSetTXNObjectControls( m_txn , false , 1 , tag , data ) ;
}
}
- ~EditHelper()
+ ~wxMacEditHelper()
{
TXNControlTag tag[] = { kTXNIOPrivilegesTag } ;
if ( m_data[0].uValue == kTXNReadOnly )
TXNControlData m_data[1] ;
} ;
+wxMacMLTEControl::wxMacMLTEControl( wxTextCtrl *peer ) : wxMacTextControl( peer )
+{
+ SetNeedsFocusRect( true ) ;
+}
+
wxString wxMacMLTEControl::GetStringValue() const
{
wxString result ;
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 ;
+
if ( ! ( wxStyle & wxTE_NOHIDESEL ) )
frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ;
}
if ( !(wxStyle & wxTE_NO_VSCROLL ) )
+ {
frameOptions |= kTXNWantVScrollBarMask ;
+ if ( frameOptions & kTXNWantHScrollBarMask )
+ frameOptions |= kTXNDrawGrowIconMask ;
+ }
}
else
frameOptions |= kTXNSingleLineOnlyMask ;
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[] =
+ {
+ {false},
+ {kTXNNoAutoWrap},
+ };
+
+ int toptag = WXSIZEOF( iControlTags ) ;
if ( m_windowStyle & wxTE_MULTILINE )
{
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 ) ;
}
{
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
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 ) ;
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 ) ;
}
void wxMacMLTEControl::SetSelection( long from , long to )
{
+ wxMacWindowClipper c( m_peer ) ;
/* change the selection */
if ((from == -1) && (to == -1))
TXNSelectAll(m_txn);
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);
}
// 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.*/
-
-/* Utility Routines */
+// 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 ....
-/* 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
+#ifdef __WXMAC_OSX__
-/* 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. */
+TXNScrollInfoUPP gTXNScrollInfoProc = NULL ;
+ControlActionUPP gTXNScrollActionProc = NULL ;
-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 )
+ wxMacMLTEClassicControl* mlte = (wxMacMLTEClassicControl*) iRefCon ;
+ SInt32 value = wxMax( iValue , 0 ) ;
+ SInt32 maximum = wxMax( iMaximumValue , 0 ) ;
+
+ if ( iScrollBarOrientation == kTXNHorizontal )
{
- SetRect(&varsp->fRTextArea, bounds.left + 2 , bounds.top + (varsp->fMultiline ? 0 : 2) ,
- bounds.right - (varsp->fMultiline ? 0 : 2), bounds.bottom - (varsp->fMultiline ? 0 : 2));
+ if ( mlte->m_sbHorizontal )
+ {
+ SetControl32BitValue( mlte->m_sbHorizontal , value ) ;
+ SetControl32BitMaximum( mlte->m_sbHorizontal , maximum ) ;
+ mlte->m_lastHorizontalValue = value ;
+ }
}
- else
+ else if ( iScrollBarOrientation == kTXNVertical )
{
- SetRect(&varsp->fRTextArea, bounds.left , bounds.top ,
- bounds.right, bounds.bottom);
+ if ( mlte->m_sbVertical )
+ {
+ SetControl32BitValue( mlte->m_sbVertical , value ) ;
+ SetControl32BitMaximum( mlte->m_sbVertical , maximum ) ;
+ mlte->m_lastVerticalValue = value ;
+ }
}
}
-OSStatus MLTESetObjectVisibility( STPTextPaneVars *varsp, Boolean vis , long wxStyle)
+pascal void wxMacMLTEClassicControl::TXNScrollActionProc( ControlRef controlRef , ControlPartCode partCode )
{
- OSStatus err = noErr ;
- wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(varsp->fUserPaneRec);
- if ( textctrl )
+ OSStatus err ;
+ wxMacMLTEClassicControl* mlte = (wxMacMLTEClassicControl*) GetControlReference( controlRef ) ;
+ if ( mlte == NULL )
+ return ;
+
+ if ( controlRef != mlte->m_sbVertical && controlRef != mlte->m_sbHorizontal )
+ return ;
+
+ bool isHorizontal = ( controlRef == mlte->m_sbHorizontal ) ;
+
+ SInt32 minimum = 0 ;
+ SInt32 maximum = GetControl32BitMaximum( controlRef ) ;
+ SInt32 value = GetControl32BitValue( controlRef ) ;
+ SInt32 delta = 0;
+ switch ( partCode )
+ {
+ 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 ( delta != 0 )
{
-#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 )
+ 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);
- TXNShowSelection( varsp->fTXNRec, kTXNShowStart);
+ if( value + delta < minimum )
+ delta = minimum - value ;
+ if ( value + delta > maximum )
+ delta = maximum - value ;
+
+ SetControl32BitValue( controlRef , value + delta ) ;
+ newValue = value + delta ;
}
+
+ 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
- {
-#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);
- }
+ mlte->m_lastVerticalValue = newValue ;
+ }
+}
#endif
- }
+
+// make correct activations
+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 )
+ {
+ SetKeyboardFocus( m_txnWindow , m_controlRef , kControlFocusNoPart ) ;
}
- return err ;
+ // 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
}
-// 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);
+// make sure that the TXNObject is at the right position
+
+void wxMacMLTEClassicControl::MacUpdatePosition()
+{
+ wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
if ( textctrl == NULL )
return ;
- STPTextPaneVars *varsp = (STPTextPaneVars *) ((wxMacMLTEClassicControl*)textctrl->GetPeer())->m_macTXNvars ;
-
Rect bounds ;
- UMAGetControlBoundsInWindowCoords(theControl, &bounds);
- if ( textctrl->MacIsReallyShown() != varsp->fVisible )
- {
- // invalidate old position
- // InvalWindowRect( GetControlOwner( theControl ) , &varsp->fRBounds ) ;
- varsp->fVisible = textctrl->MacIsReallyShown() ;
- }
- if ( !EqualRect( &bounds , &varsp->fRBounds ) )
+ UMAGetControlBoundsInWindowCoords(m_controlRef, &bounds);
+
+ if ( !EqualRect( &bounds , &m_txnControlBounds ) )
{
// old position
- Rect oldBounds = varsp->fRBounds ;
- TPCalculateBounds( varsp , bounds ) ;
- // we only recalculate when visible, otherwise scrollbars get drawn at incorrect places
- if ( varsp->fVisible )
+ Rect oldBounds = m_txnControlBounds ;
+ m_txnControlBounds = bounds ;
+ wxMacWindowClipper cl(textctrl) ;
+
+#ifdef __WXMAC_OSX__
+ bool isCompositing = textctrl->MacGetTopLevelWindow()->MacUsesCompositing() ;
+ if ( m_sbHorizontal || m_sbVertical )
{
- wxMacWindowClipper cl(textctrl) ;
- TXNSetFrameBounds( varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left,
- varsp->fRTextArea.bottom, varsp->fRTextArea.right, varsp->fTXNFrame);
+ 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 ) ;
+ }
}
- InvalWindowRect( GetControlOwner( theControl ) , &oldBounds ) ;
- InvalWindowRect( GetControlOwner( theControl ) , &varsp->fRBounds ) ;
- }
-}
+ 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);
-// make correct activations
-static void TPActivatePaneText(STPTextPaneVars *varsp, Boolean setActive) {
- wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(varsp->fUserPaneRec);
- if (varsp->fTXNObjectActive != setActive && textctrl->MacIsReallyShown() )
- {
- varsp->fTXNObjectActive = setActive;
- TXNActivate(varsp->fTXNRec, varsp->fTXNFrame, varsp->fTXNObjectActive);
- if (varsp->fInFocus)
- TXNFocus( varsp->fTXNRec, varsp->fTXNObjectActive);
- }
-}
+ // the SetFrameBounds method unter classic sometimes does not correctly scroll a selection into sight after a
+ // movement, therefore we have to force it
-// update focus outlines
-static void TPRedrawFocusOutline(STPTextPaneVars *varsp) {
- /* state changed */
- if (varsp->fFocusDrawState != (varsp->fIsActive && varsp->fInFocus))
- {
- varsp->fFocusDrawState = (varsp->fIsActive && varsp->fInFocus);
- // DrawThemeFocusRect(&varsp->fRFocusOutline, varsp->fFocusDrawState);
+ TXNLongRect textRect ;
+ TXNGetRectBounds( m_txn , NULL , NULL , &textRect ) ;
+ if ( textRect.left < m_txnControlBounds.left )
+ {
+ TXNShowSelection( m_txn , false ) ;
+ }
+#endif
}
}
-// update TXN focus state
-static void TPFocusPaneText(STPTextPaneVars *varsp, Boolean setFocus) {
- wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(varsp->fUserPaneRec);
-
- if (varsp->fInFocus != setFocus && textctrl->MacIsReallyShown()) {
- varsp->fInFocus = setFocus;
- TXNFocus( varsp->fTXNRec, varsp->fInFocus);
- }
+void wxMacMLTEClassicControl::SetRect( Rect *r )
+{
+ wxMacControl::SetRect( r ) ;
+ MacUpdatePosition() ;
}
-// draw the control
-static pascal void TPPaneDrawProc(ControlRef theControl, ControlPartCode thePart) {
- /* set up our globals */
-
- 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
where.h += x ;
where.v += y ;
}
- if (PtInRect(where, &varsp->fRBounds))
- result = kmUPTextPart;
+ if (PtInRect(where, &m_txnControlBounds))
+ result = kControlEditTextPart ;
else
result = 0;
}
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() )
{
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);
- }
- return kControlEntireControl;
-}
-
-
-/* TPPaneActivateProc is called when the window containing
-the user pane control receives activate events. Here, we redraw
-the control and it's text as necessary for the activation state. */
-static pascal void TPPaneActivateProc(ControlRef theControl, Boolean activating) {
- /* set up locals */
- wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(theControl);
-
- if ( textctrl == NULL )
- return ;
- TPUpdateVisibility( theControl ) ;
+ wxMacWindowClipper clipper( textctrl ) ;
- STPTextPaneVars *varsp = (STPTextPaneVars *) ((wxMacMLTEClassicControl*)textctrl->GetPeer())->m_macTXNvars ;
+ EventRecord ev ;
+ memset( &ev , 0 , sizeof( ev ) ) ;
+ ev.what = keyDown ;
+ ev.modifiers = modifiers ;
+ ev.message = (( keyCode << 8 ) & keyCodeMask ) + ( charCode & charCodeMask ) ;
+ TXNKeyDown( m_txn , &ev);
- 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 ) ;
- }
+ return kControlEntireControl;
}
+void wxMacMLTEClassicControl::MacControlUserPaneActivateProc( bool activating)
+{
+ MacActivatePaneText( activating );
+}
-/* 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) {
+wxInt16 wxMacMLTEClassicControl::MacControlUserPaneFocusProc(wxInt16 action)
+{
ControlPartCode focusResult;
focusResult = kControlFocusNoPart;
- 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 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);
- focusResult = kControlFocusNoPart;
- break;
- case kUserClickedToFocusPart:
- TPFocusPaneText(varsp, true);
- focusResult = 1;
- break;
+
+ wxMacWindowClipper clipper( textctrl ) ;
+
+ ControlRef controlFocus = 0 ;
+ GetKeyboardFocus( m_txnWindow , &controlFocus ) ;
+ bool wasFocused = ( controlFocus == m_controlRef ) ;
+
+ switch (action)
+ {
case kControlFocusPrevPart:
case kControlFocusNextPart:
- TPFocusPaneText(varsp, ( ! varsp->fInFocus));
- focusResult = varsp->fInFocus ? 1 : kControlFocusNoPart;
+ MacFocusPaneText( ( !wasFocused));
+ focusResult = (!wasFocused) ? (ControlPartCode) kControlEditTextPart : (ControlPartCode) kControlFocusNoPart;
+ break;
+
+ case kControlFocusNoPart:
+ default:
+ MacFocusPaneText( false);
+ focusResult = 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 ;
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 ) ;
-
- {
- // wxMacWindowClipper clipper( wxPeer ) ;
+ DoCreate();
- TPUpdateVisibility( m_controlRef ) ;
+ MacSetObjectVisibility( wxPeer->MacIsReallyShown() ) ;
- SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ;
+ AdjustCreationAttributes( *wxWHITE , true) ;
- TXNSetSelection( m_txn, 0, 0);
- TXNShowSelection( m_txn, kTXNShowStart);
- }
-
- AdjustCreationAttributes( *wxWHITE , true ) ;
+ wxMacWindowClipper clipper( m_peer ) ;
+ SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ;
+ TXNSetSelection( m_txn, 0, 0);
}
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);
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 ;
+
+ 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 ) );
- /* 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 */
+#ifdef __WXMAC_OSX__
+ TXNRegisterScrollInfoProc( m_txn, gTXNScrollInfoProc, (SInt32) this);
+#endif
+
+ SetGWorld( origPort , origDev ) ;
return err;
}
#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 ;
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 )
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
projects / wxWidgets.git / blobdiff