return result ;
}
+class WXDLLEXPORT wxMacPortSaver
+{
+ DECLARE_NO_COPY_CLASS(wxMacPortSaver)
+
+public:
+ wxMacPortSaver( GrafPtr port );
+ ~wxMacPortSaver();
+private :
+ GrafPtr m_port;
+};
+
+
+/*
+ Clips to the visible region of a control within the current port
+ */
+
+class WXDLLEXPORT wxMacWindowClipper : public wxMacPortSaver
+{
+ DECLARE_NO_COPY_CLASS(wxMacWindowClipper)
+
+public:
+ wxMacWindowClipper( const wxWindow* win );
+ ~wxMacWindowClipper();
+private:
+ GrafPtr m_newPort;
+ RgnHandle m_formerClip;
+ RgnHandle m_newClip;
+};
// common parts for implementations based on MLTE
void AdjustCreationAttributes( const wxColour& background, bool visible ) ;
virtual void SetFont( const wxFont & font, const wxColour& foreground, long windowStyle ) ;
- virtual void SetBackground( const wxBrush &brush ) ;
+ virtual void SetBackgroundColour(const wxColour& col );
virtual void SetStyle( long start, long end, const wxTextAttr& style ) ;
virtual void Copy() ;
virtual void Cut() ;
virtual bool HasOwnContextMenu() const
{
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
- if ( UMAGetSystemVersion() >= 0x1040 )
- {
- TXNCommandEventSupportOptions options ;
- TXNGetCommandEventSupport( m_txn , & options ) ;
- return options & kTXNSupportEditCommandProcessing ;
- }
-#endif
-
- return false ;
+ TXNCommandEventSupportOptions options ;
+ TXNGetCommandEventSupport( m_txn , & options ) ;
+ return options & kTXNSupportEditCommandProcessing ;
}
virtual void CheckSpelling(bool check)
{
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
- TXNSetSpellCheckAsYouType( m_txn, (Boolean) check );
-#endif
+ TXNSetSpellCheckAsYouType( m_txn, (Boolean) check );
}
virtual void Clear() ;
virtual OSStatus SetFocus( ControlFocusPart focusPart ) ;
virtual bool HasFocus() const ;
- virtual void SetBackground( const wxBrush &brush) ;
+ virtual void SetBackgroundColour(const wxColour& col ) ;
protected :
HIViewRef m_scrollView ;
IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
- EVT_ERASE_BACKGROUND( wxTextCtrl::OnEraseBackground )
EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
EVT_CHAR(wxTextCtrl::OnChar)
EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
if ( !forceMLTE )
{
- if ( m_windowStyle & wxTE_MULTILINE )
+ if ( m_windowStyle & wxTE_MULTILINE || ( UMAGetSystemVersion() >= 0x1050 ) )
m_peer = new wxMacMLTEHIViewControl( this , str , pos , size , style ) ;
}
GetPeer()->VisibilityChanged( MacIsReallyShown() ) ;
}
-void wxTextCtrl::MacEnabledStateChanged()
-{
-}
-
void wxTextCtrl::MacCheckSpelling(bool check)
{
GetPeer()->CheckSpelling(check);
wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );
event.SetEventObject( this );
- GetEventHandler()->ProcessEvent( event );
+ HandleWindowEvent( event );
}
}
wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );
event.SetEventObject( this );
- GetEventHandler()->ProcessEvent( event );
+ HandleWindowEvent( event );
}
}
LoadFile( event.GetFiles()[0] );
}
-void wxTextCtrl::OnEraseBackground(wxEraseEvent& event)
-{
- // all erasing should be done by the real mac control implementation
- // while this is true for MLTE under classic, the HITextView is somehow
- // transparent but background erase is not working correctly, so intercept
- // things while we can...
- event.Skip() ;
-}
-
void wxTextCtrl::OnChar(wxKeyEvent& event)
{
int key = event.GetKeyCode() ;
wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
event.SetEventObject( this );
event.SetString( GetValue() );
- if ( GetEventHandler()->ProcessEvent(event) )
+ if ( HandleWindowEvent(event) )
return;
}
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 GetPeer()->MacControlUserPaneHitTestProc( x , y ) ;
-}
-
-wxInt16 wxTextCtrl::MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc)
-{
- return GetPeer()->MacControlUserPaneTrackingProc( x , y , actionProc ) ;
-}
-
-void wxTextCtrl::MacControlUserPaneIdleProc()
-{
- GetPeer()->MacControlUserPaneIdleProc( ) ;
-}
-
-wxInt16 wxTextCtrl::MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers)
-{
- return GetPeer()->MacControlUserPaneKeyDownProc( keyCode , charCode , modifiers ) ;
-}
-
-void wxTextCtrl::MacControlUserPaneActivateProc(bool activating)
-{
- GetPeer()->MacControlUserPaneActivateProc( activating ) ;
-}
-
-wxInt16 wxTextCtrl::MacControlUserPaneFocusProc(wxInt16 action)
-{
- return GetPeer()->MacControlUserPaneFocusProc( action ) ;
-}
-
-void wxTextCtrl::MacControlUserPaneBackgroundProc(void* info)
-{
- GetPeer()->MacControlUserPaneBackgroundProc( info ) ;
-}
-
-#endif
-
// ----------------------------------------------------------------------------
// implementation base class
// ----------------------------------------------------------------------------
// standard unicode control implementation
// ----------------------------------------------------------------------------
-#if TARGET_API_MAC_OSX
-
// the current unicode textcontrol implementation has a bug : only if the control
// is currently having the focus, the selection can be retrieved by the corresponding
// data tag. So we have a mirroring using a member variable
else
{
from = wxMin(textLength,wxMax(from,0)) ;
- to = wxMax(0,wxMin(textLength,to)) ;
+ if ( to == -1 )
+ to = textLength;
+ else
+ to = wxMax(0,wxMin(textLength,to)) ;
}
sel.selStart = from ;
}
}
-#endif
-
// ----------------------------------------------------------------------------
// MLTE control implementation (common part)
// ----------------------------------------------------------------------------
if ( wxStyle & wxTE_MULTILINE )
{
- frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
+ if ( ! (wxStyle & wxTE_DONTWRAP ) )
+ frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
if ( !(wxStyle & wxTE_NO_VSCROLL) )
{
TXNBackground tback;
tback.bgType = kTXNBackgroundTypeRGB;
- tback.bg.color = MAC_WXCOLORREF( background.GetPixel() );
+ background.GetRGBColor( &tback.bg.color );
TXNSetBackground( m_txn , &tback );
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
- if ( UMAGetSystemVersion() >= 0x1040 )
+
+ TXNCommandEventSupportOptions options ;
+ if ( TXNGetCommandEventSupport( m_txn, &options ) == noErr )
{
- TXNCommandEventSupportOptions options ;
- if ( TXNGetCommandEventSupport( m_txn, &options ) == noErr )
- {
- options |=
- kTXNSupportEditCommandProcessing
- | kTXNSupportEditCommandUpdating
- | kTXNSupportFontCommandProcessing
- | kTXNSupportFontCommandUpdating;
-
- // only spell check when not read-only
- // use system options for the default
- bool checkSpelling = false ;
- if ( !(m_windowStyle & wxTE_READONLY) )
- {
+ options |=
+ kTXNSupportEditCommandProcessing
+ | kTXNSupportEditCommandUpdating
+ | kTXNSupportFontCommandProcessing
+ | kTXNSupportFontCommandUpdating;
+
+ // only spell check when not read-only
+ // use system options for the default
+ bool checkSpelling = false ;
+ if ( !(m_windowStyle & wxTE_READONLY) )
+ {
#if wxUSE_SYSTEM_OPTIONS
- if ( wxSystemOptions::HasOption( wxMAC_TEXTCONTROL_USE_SPELL_CHECKER ) && (wxSystemOptions::GetOptionInt( wxMAC_TEXTCONTROL_USE_SPELL_CHECKER ) == 1) )
- {
- checkSpelling = true ;
- }
-#endif
+ if ( wxSystemOptions::HasOption( wxMAC_TEXTCONTROL_USE_SPELL_CHECKER ) && (wxSystemOptions::GetOptionInt( wxMAC_TEXTCONTROL_USE_SPELL_CHECKER ) == 1) )
+ {
+ checkSpelling = true ;
}
-
- if ( checkSpelling )
- options |=
- kTXNSupportSpellCheckCommandProcessing
- | kTXNSupportSpellCheckCommandUpdating;
-
- TXNSetCommandEventSupport( m_txn , options ) ;
+#endif
}
+
+ if ( checkSpelling )
+ options |=
+ kTXNSupportSpellCheckCommandProcessing
+ | kTXNSupportSpellCheckCommandUpdating;
+
+ TXNSetCommandEventSupport( m_txn , options ) ;
}
-#endif
}
-void wxMacMLTEControl::SetBackground( const wxBrush &brush )
+void wxMacMLTEControl::SetBackgroundColour(const wxColour& col )
{
- // currently only solid background are supported
TXNBackground tback;
-
tback.bgType = kTXNBackgroundTypeRGB;
- tback.bg.color = MAC_WXCOLORREF( brush.GetColour().GetPixel() );
+ col.GetRGBColor(&tback.bg.color);
TXNSetBackground( m_txn , &tback );
}
+static inline int wxConvertToTXN(int x)
+{
+ return wx_static_cast(int, x / 254.0 * 72 + 0.5);
+}
+
void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , long to )
{
TXNTypeAttributes typeAttr[4] ;
TXNControlTag controlTags[4];
TXNControlData controlData[4];
size_t controlAttrCount = 0;
-
+
TXNTab* tabs = NULL;
-
+
bool relayout = false;
if ( style.HasFont() )
if ( style.HasTextColour() )
{
wxASSERT( typeAttrCount < WXSIZEOF(typeAttr) );
- color = MAC_WXCOLORREF(style.GetTextColour().GetPixel()) ;
-
+ style.GetTextColour().GetRGBColor( &color );
typeAttr[typeAttrCount].tag = kTXNQDFontColorAttribute ;
typeAttr[typeAttrCount].size = kTXNQDFontColorAttributeSize ;
typeAttr[typeAttrCount].data.dataPtr = (void*) &color ;
typeAttrCount++ ;
}
-
+
if ( style.HasAlignment() )
{
wxASSERT( controlAttrCount < WXSIZEOF(controlTags) );
SInt32 align;
-
+
switch ( style.GetAlignment() )
{
case wxTEXT_ALIGNMENT_LEFT:
break;
case wxTEXT_ALIGNMENT_JUSTIFIED:
align = kTXNFullJust;
- break;
+ break;
default :
case wxTEXT_ALIGNMENT_DEFAULT:
align = kTXNFlushDefault;
break;
}
-
+
controlTags[controlAttrCount] = kTXNJustificationTag ;
controlData[controlAttrCount].sValue = align ;
controlAttrCount++ ;
&controlTags[controlAttrCount], &controlData[controlAttrCount]) );
if ( style.HasLeftIndent() )
{
- margins.leftMargin = style.GetLeftIndent() / 254.0 * 72 + 0.5;
+ margins.leftMargin = wxConvertToTXN(style.GetLeftIndent());
}
if ( style.HasRightIndent() )
{
- margins.rightMargin = style.GetRightIndent() / 254.0 * 72 + 0.5;
+ margins.rightMargin = wxConvertToTXN(style.GetRightIndent());
}
controlAttrCount++ ;
}
-
+
if ( style.HasTabs() )
{
const wxArrayInt& tabarray = style.GetTabs();
// unfortunately Mac only applies a tab distance, not individually different tabs
controlTags[controlAttrCount] = kTXNTabSettingsTag;
if ( tabarray.size() > 0 )
- controlData[controlAttrCount].tabValue.value = tabarray[0] / 254.0 * 72 + 0.5;
+ controlData[controlAttrCount].tabValue.value = wxConvertToTXN(tabarray[0]);
else
- controlData[controlAttrCount].tabValue.value = 72 ;
+ controlData[controlAttrCount].tabValue.value = 72 ;
controlData[controlAttrCount].tabValue.tabType = kTXNLeftTab;
controlAttrCount++ ;
}
-
+
// unfortunately the relayout is not automatic
if ( controlAttrCount > 0 )
{
controlTags, controlData) );
relayout = true;
}
-
+
if ( typeAttrCount > 0 )
{
verify_noerr( TXNSetTypeAttributes( m_txn , typeAttrCount, typeAttr, from , to ) );
relayout = true;
}
-
+
if ( tabs != NULL )
{
delete[] tabs;
}
-
+
if ( relayout )
{
TXNRecalcTextLayout( m_txn );
wxMacWindowClipper c( m_peer ) ;
#endif
- TXNSetSelection( m_txn, from, to ) ;
+ TXNSetSelection( m_txn, from, to == -1 ? kTXNEndOffset : to ) ;
TXNClear( m_txn ) ;
SetTXNData( value, kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ;
}
if ((from == -1) && (to == -1))
TXNSelectAll( m_txn );
else
- TXNSetSelection( m_txn, from, to );
+ TXNSetSelection( m_txn, from, to == -1 ? kTXNEndOffset : to );
TXNShowSelection( m_txn, kTXNShowStart );
}
// 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 ....
+wxMacPortSaver::wxMacPortSaver( GrafPtr port )
+{
+ ::GetPort( &m_port );
+ ::SetPort( port );
+}
+
+wxMacPortSaver::~wxMacPortSaver()
+{
+ ::SetPort( m_port );
+}
+
+wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) :
+ wxMacPortSaver( (GrafPtr) GetWindowPort( (WindowRef) win->MacGetTopLevelWindowRef() ) )
+{
+ m_newPort = (GrafPtr) GetWindowPort( (WindowRef) win->MacGetTopLevelWindowRef() ) ;
+ m_formerClip = NewRgn() ;
+ m_newClip = NewRgn() ;
+ GetClip( m_formerClip ) ;
+
+ if ( win )
+ {
+ // guard against half constructed objects, this just leads to a empty clip
+ if ( win->GetPeer() )
+ {
+ int x = 0 , y = 0;
+ win->MacWindowToRootWindow( &x, &y ) ;
+
+ // get area including focus rect
+ HIShapeGetAsQDRgn( ((wxWindow*)win)->MacGetVisibleRegion(true).GetWXHRGN() , m_newClip );
+ if ( !EmptyRgn( m_newClip ) )
+ OffsetRgn( m_newClip , x , y ) ;
+ }
+
+ SetClip( m_newClip ) ;
+ }
+}
+
+wxMacWindowClipper::~wxMacWindowClipper()
+{
+ SetPort( m_newPort ) ;
+ SetClip( m_formerClip ) ;
+ DisposeRgn( m_newClip ) ;
+ DisposeRgn( m_formerClip ) ;
+}
+
TXNScrollInfoUPP gTXNScrollInfoProc = NULL ;
ControlActionUPP gTXNScrollActionProc = NULL ;
return ;
Rect bounds ;
- UMAGetControlBoundsInWindowCoords( m_controlRef, &bounds );
+ GetRectInWindowCoords( &bounds );
wxRect visRect = textctrl->MacGetClippedClientRect() ;
Rect visBounds = { visRect.y , visRect.x , visRect.y + visRect.height , visRect.x + visRect.width } ;
SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneFocusProcTag, sizeof(gTPFocusProc), &gTPFocusProc);
// calculate the rectangles used by the control
- UMAGetControlBoundsInWindowCoords( m_controlRef, &bounds );
+ GetRectInWindowCoords( &bounds );
m_txnControlBounds = bounds ;
m_txnVisBounds = bounds ;
{
case kEventTextInputUnicodeForKeyEvent :
{
- if ( UMAGetSystemVersion() >= 0x1040 )
- {
- TXNOffset from , to ;
- TXNGetSelection( focus->GetTXNObject() , &from , &to ) ;
- if ( from == to )
- TXNShowSelection( focus->GetTXNObject() , kTXNShowStart );
- }
+ TXNOffset from , to ;
+ TXNGetSelection( focus->GetTXNObject() , &from , &to ) ;
+ if ( from == to )
+ TXNShowSelection( focus->GetTXNObject() , kTXNShowStart );
result = CallNextEventHandler(handler,event);
break;
}
ControlRef control ;
if ( GetUserFocusWindow() == NULL )
return false;
-
+
GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
return control == m_textView ;
}
-void wxMacMLTEHIViewControl::SetBackground( const wxBrush &brush )
+void wxMacMLTEHIViewControl::SetBackgroundColour(const wxColour& col )
{
- wxMacMLTEControl::SetBackground( brush ) ;
-
-#if 0
- CGColorSpaceRef rgbSpace = CGColorSpaceCreateDeviceRGB();
- RGBColor col = MAC_WXCOLORREF(brush.GetColour().GetPixel()) ;
-
- float component[4] ;
- component[0] = col.red / 65536.0 ;
- component[1] = col.green / 65536.0 ;
- component[2] = col.blue / 65536.0 ;
- component[3] = 1.0 ; // alpha
-
- CGColorRef color = CGColorCreate( rgbSpace , component );
- HITextViewSetBackgroundColor( m_textView , color );
- CGColorSpaceRelease( rgbSpace );
-#endif
+ HITextViewSetBackgroundColor( m_textView, col.GetPixel() );
}
#endif // wxUSE_TEXTCTRL
projects / wxWidgets.git / blobdiff