#include "wx/filefn.h"
#include "wx/sysopt.h"
-#if defined(__BORLANDC__) && !defined(__WIN32__)
- #include <alloc.h>
-#elif !defined(__MWERKS__) && !defined(__GNUWIN32) && !defined(__DARWIN__)
- #include <malloc.h>
-#endif
-
-#ifndef __DARWIN__
-#include <MacTextEditor.h>
-#include <ATSUnicode.h>
-#include <TextCommon.h>
-#include <TextEncodingConverter.h>
-#endif
-
#include "wx/mac/uma.h"
#include "wx/mac/carbon/private/mactext.h"
-#ifndef __WXMAC_OSX__
-enum
-{
- kTXNVisibilityTag = 'visb' // set the visibility state of the object
-};
-#endif
-
-
class wxMacFunctor
{
public :
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() ;
TXNObject m_txn ;
} ;
-#if TARGET_API_MAC_OSX
-
// implementation available under OSX
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
-
class wxMacMLTEHIViewControl : public wxMacMLTEControl
{
public :
HIViewRef m_textView ;
};
-#endif
-
-#endif
-
// 'classic' MLTE implementation
class wxMacMLTEClassicControl : public wxMacMLTEControl
Rect m_txnControlBounds ;
Rect m_txnVisBounds ;
-#ifdef __WXMAC_OSX__
static pascal void TXNScrollActionProc( ControlRef controlRef , ControlPartCode partCode ) ;
static pascal void TXNScrollInfoProc(
SInt32 iValue, SInt32 iMaximumValue,
SInt32 m_lastHorizontalValue ;
ControlRef m_sbVertical ;
SInt32 m_lastVerticalValue ;
-#endif
};
if ( UMAGetSystemVersion() >= 0x1050 )
forceMLTE = false;
- if ( UMAGetSystemVersion() >= 0x1030 && !forceMLTE )
+ if ( !forceMLTE )
{
if ( m_windowStyle & wxTE_MULTILINE )
m_peer = new wxMacMLTEHIViewControl( this , str , pos , size , style ) ;
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 ;
wxString st = str ;
wxMacConvertNewlines10To13( &st ) ;
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
if ( HasFocus() )
{
wxMacCFStringHolder cf(st , m_font.GetEncoding() ) ;
SetData<CFStringRef>( 0, kControlEditTextInsertCFStringRefTag, &value );
}
else
-#endif
{
wxString val = GetStringValue() ;
long start , end ;
}
}
-#endif
-
// ----------------------------------------------------------------------------
// MLTE control implementation (common part)
// ----------------------------------------------------------------------------
{
TXNFrameOptions frameOptions = kTXNDontDrawCaretWhenInactiveMask;
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
frameOptions |= kTXNDoFontSubstitutionMask;
-#endif
if ( ! (wxStyle & wxTE_NOHIDESEL) )
frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ;
// setting the default font:
// under 10.2 this causes a visible caret, therefore we avoid it
- if ( UMAGetSystemVersion() >= 0x1030 )
- {
- Str255 fontName ;
- SInt16 fontSize ;
- Style fontStyle ;
+ 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 } } ,
- } ;
-
- err = TXNSetTypeAttributes(
- m_txn, sizeof(typeAttr) / sizeof(TXNTypeAttributes),
- typeAttr, kTXNStartOffset, kTXNEndOffset );
- verify_noerr( err );
- }
+ TXNTypeAttributes typeAttr[] =
+ {
+ { kTXNQDFontNameAttribute , kTXNQDFontNameAttributeSize , { (void*) fontName } } ,
+ { kTXNQDFontSizeAttribute , kTXNFontSizeAttributeSize , { (void*) (fontSize << 16) } } ,
+ { kTXNQDFontStyleAttribute , kTXNQDFontStyleAttributeSize , { (void*) normal } } ,
+ } ;
+
+ err = TXNSetTypeAttributes(
+ m_txn, sizeof(typeAttr) / sizeof(TXNTypeAttributes),
+ typeAttr, kTXNStartOffset, kTXNEndOffset );
+ verify_noerr( err );
if ( m_windowStyle & wxTE_PASSWORD )
{
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 )
TXNBackground tback;
tback.bgType = kTXNBackgroundTypeRGB;
- tback.bg.color = MAC_WXCOLORREF( brush.GetColour().GetPixel() );
+ brush.GetColour().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 ....
-#ifdef __WXMAC_OSX__
-
TXNScrollInfoUPP gTXNScrollInfoProc = NULL ;
ControlActionUPP gTXNScrollActionProc = NULL ;
mlte->m_lastVerticalValue = newValue ;
}
}
-#endif
// make correct activations
void wxMacMLTEClassicControl::MacActivatePaneText(bool setActive)
m_txnVisBounds = visBounds ;
wxMacWindowClipper cl( textctrl ) ;
-#ifdef __WXMAC_OSX__
if ( m_sbHorizontal || m_sbVertical )
{
int w = bounds.right - bounds.left ;
m_txnControlBounds.right - (m_sbVertical ? 14 : 0),
m_txnFrameID );
#endif
-#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 under Classic sometimes does not correctly scroll a selection into sight after a
// movement, therefore we have to force it
wxMacControl::SuperChangedPosition() ;
}
-#ifdef __WXMAC_OSX__
-
ControlUserPaneDrawUPP gTPDrawProc = NULL;
ControlUserPaneHitTestUPP gTPHitProc = NULL;
ControlUserPaneTrackingUPP gTPTrackProc = NULL;
}
#endif
-#endif // __WXMAC_OSX__
-
// TXNRegisterScrollInfoProc
OSStatus wxMacMLTEClassicControl::DoCreate()
OSStatus err = noErr ;
// set up our globals
-#ifdef __WXMAC_OSX__
if (gTPDrawProc == NULL) gTPDrawProc = NewControlUserPaneDrawUPP(wxMacControlUserPaneDrawProc);
if (gTPHitProc == NULL) gTPHitProc = NewControlUserPaneHitTestUPP(wxMacControlUserPaneHitTestProc);
if (gTPTrackProc == NULL) gTPTrackProc = NewControlUserPaneTrackingUPP(wxMacControlUserPaneTrackingProc);
if (gTXNScrollInfoProc == NULL ) gTXNScrollInfoProc = NewTXNScrollInfoUPP(TXNScrollInfoProc) ;
if (gTXNScrollActionProc == NULL ) gTXNScrollActionProc = NewControlActionUPP(TXNScrollActionProc) ;
-#endif
// set the initial settings for our private data
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 );
// create the new edit field
TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( m_windowStyle );
-#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
frameOptions &= ~(kTXNWantHScrollBarMask | kTXNDrawGrowIconMask);
}
-#endif
-
err = TXNNewObject(
NULL, m_txnWindow, &bounds, frameOptions,
kTXNTextEditStyleFrameType, kTXNTextensionFile, kTXNSystemDefaultEncoding,
verify_noerr( TXNSetTXNObjectControls( m_txn, false, toptag, iControlTags, iControlData ) );
#endif
-#ifdef __WXMAC_OSX__
TXNRegisterScrollInfoProc( m_txn, gTXNScrollInfoProc, (SInt32)this );
-#endif
SetGWorld( origPort , origDev ) ;
// MLTE control implementation (OSX part)
// ----------------------------------------------------------------------------
-#if TARGET_API_MAC_OSX
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
-
// tiger multi-line textcontrols with no CR in the entire content
// don't scroll automatically, so we need a hack.
// This attempt only works 'before' the key (ie before CallNextEventHandler)
{
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 ;
}
#if 0
CGColorSpaceRef rgbSpace = CGColorSpaceCreateDeviceRGB();
- RGBColor col = MAC_WXCOLORREF(brush.GetColour().GetPixel()) ;
+ RGBColor col;
+ brush.GetColour().GetRGBColor(&col) ;
float component[4] ;
component[0] = col.red / 65536.0 ;
#endif
}
-#endif // MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
-
-
-#endif
-
#endif // wxUSE_TEXTCTRL