#endif
#include "wx/mac/uma.h"
-
-
-// if this is set to 1 then under OSX 10.2 the 'classic' MLTE implementation will be used
-// if set to 0 then the unicode textctrl will be used
-#ifndef wxMAC_AWAYS_USE_MLTE
-#define wxMAC_AWAYS_USE_MLTE 1
-#endif
+#include "wx/mac/carbon/private/mactext.h"
#ifndef __WXMAC_OSX__
enum
return result ;
}
-// common interface for all implementations
-class wxMacTextControl : public wxMacControl
-{
-public :
- wxMacTextControl( wxTextCtrl *peer ) ;
- virtual ~wxMacTextControl() ;
-
- virtual wxString GetStringValue() const = 0 ;
- virtual void SetStringValue( const wxString &val ) = 0 ;
- virtual void SetSelection( long from, long to ) = 0 ;
- virtual void GetSelection( long* from, long* to ) const = 0 ;
- virtual void WriteText( const wxString& str ) = 0 ;
-
- virtual void SetStyle( long start, long end, const wxTextAttr& style ) ;
- virtual void Copy() ;
- virtual void Cut() ;
- virtual void Paste() ;
- virtual bool CanPaste() const ;
- virtual void SetEditable( bool editable ) ;
- virtual wxTextPos GetLastPosition() const ;
- virtual void Replace( long from, long to, const wxString &str ) ;
- virtual void Remove( long from, long to ) ;
-
-
- virtual bool HasOwnContextMenu() const
- { return false ; }
-
- virtual bool SetupCursor( const wxPoint& pt )
- { return false ; }
-
- virtual void Clear() ;
- virtual bool CanUndo() const;
- virtual void Undo() ;
- virtual bool CanRedo() const;
- virtual void Redo() ;
- virtual int GetNumberOfLines() const ;
- virtual long XYToPosition(long x, long y) const;
- virtual bool PositionToXY(long pos, long *x, long *y) const ;
- virtual void ShowPosition(long WXUNUSED(pos)) ;
- virtual int GetLineLength(long lineNo) const ;
- virtual wxString GetLineText(long lineNo) const ;
-
-#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
return false ;
}
+ virtual void CheckSpelling(bool check)
+ {
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+ TXNSetSpellCheckAsYouType( m_txn, (Boolean) check );
+#endif
+ }
virtual void Clear() ;
virtual bool CanUndo() const ;
#endif
-class wxMacUnicodeTextControl : public wxMacTextControl
-{
-public :
- wxMacUnicodeTextControl( wxTextCtrl *wxPeer,
- const wxString& str,
- const wxPoint& pos,
- const wxSize& size, long style ) ;
- virtual ~wxMacUnicodeTextControl();
-
- virtual void VisibilityChanged(bool shown);
- virtual wxString GetStringValue() const ;
- virtual void SetStringValue( const wxString &str) ;
- virtual void Copy();
- virtual void Cut();
- virtual void Paste();
- virtual bool CanPaste() const;
- virtual void SetEditable(bool editable) ;
- virtual void GetSelection( long* from, long* to) const ;
- virtual void SetSelection( long from , long to ) ;
- virtual void WriteText(const wxString& str) ;
-
-protected :
- // contains the tag for the content (is different for password and non-password controls)
- OSType m_valueTag ;
-
- // as the selection tag only works correctly when the control has the focus we have to mirror the
- // intended value
- EventHandlerRef m_focusHandlerRef ;
-public :
- ControlEditTextSelectionRec m_selection ;
-};
-
#endif
// 'classic' MLTE implementation
style |= wxTE_PROCESS_ENTER ;
}
+ CreatePeer( 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::CreatePeer(
+ const wxString& str,
+ const wxPoint& pos,
+ const wxSize& size, long style )
+{
bool forceMLTE = false ;
#if wxUSE_SYSTEM_OPTIONS
forceMLTE = true ;
}
#endif
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+ forceMLTE = false;
+#endif
#ifdef __WXMAC_OSX__
#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
if ( !m_peer )
{
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
if ( !(m_windowStyle & wxTE_MULTILINE) && !forceMLTE )
+#endif
+ {
m_peer = new wxMacUnicodeTextControl( this , str , pos , size , style ) ;
+ }
}
#endif
+ // the horizontal single line scrolling bug that made us keep
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
if ( !m_peer )
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;
+#endif
}
void wxTextCtrl::MacSuperChangedPosition()
{
}
+void wxTextCtrl::MacCheckSpelling(bool check)
+{
+ GetPeer()->CheckSpelling(check);
+}
+
wxString wxTextCtrl::GetValue() const
{
return GetPeer()->GetStringValue() ;
DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacUnicodeTextControlEventHandler )
+wxMacUnicodeTextControl::wxMacUnicodeTextControl( wxTextCtrl *wxPeer ) : wxMacTextControl( wxPeer )
+{
+}
+
wxMacUnicodeTextControl::wxMacUnicodeTextControl( wxTextCtrl *wxPeer,
const wxString& str,
const wxPoint& pos,
const wxSize& size, long style )
: wxMacTextControl( wxPeer )
+{
+ Create( wxPeer, str, pos, size, style );
+}
+
+bool wxMacUnicodeTextControl::Create( wxTextCtrl *wxPeer,
+ const wxString& str,
+ const wxPoint& pos,
+ const wxSize& size, long style )
{
m_font = wxPeer->GetFont() ;
m_windowStyle = style ;
wxMacConvertNewlines10To13( &st ) ;
wxMacCFStringHolder cf(st , m_font.GetEncoding()) ;
CFStringRef cfr = cf ;
- Boolean isPassword = ( m_windowStyle & wxTE_PASSWORD ) != 0 ;
- m_valueTag = isPassword ? kControlEditTextPasswordCFStringTag : kControlEditTextCFStringTag ;
-
- OSStatus err = CreateEditUnicodeTextControl(
- MAC_WXHWND(wxPeer->MacGetTopLevelWindowRef()), &bounds , cfr ,
- isPassword , NULL , &m_controlRef ) ;
- verify_noerr( err );
+
+ m_valueTag = kControlEditTextCFStringTag ;
+ CreateControl( wxPeer, &bounds, cfr );
if ( !(m_windowStyle & wxTE_MULTILINE) )
SetData<Boolean>( kControlEditTextPart , kControlEditTextSingleLineTag , true ) ;
InstallControlEventHandler( m_controlRef , GetwxMacUnicodeTextControlEventHandlerUPP(),
GetEventTypeCount(unicodeTextControlEventList), unicodeTextControlEventList, this,
&m_focusHandlerRef);
+
+ return true;
}
wxMacUnicodeTextControl::~wxMacUnicodeTextControl()
verify_noerr( SetData<CFStringRef>( 0, m_valueTag , cf ) ) ;
}
+void wxMacUnicodeTextControl::CreateControl( wxTextCtrl* peer, const Rect* bounds, CFStringRef cfr )
+{
+ Boolean isPassword = ( m_windowStyle & wxTE_PASSWORD ) != 0 ;
+ if ( isPassword )
+ {
+ m_valueTag = kControlEditTextPasswordCFStringTag ;
+ }
+ OSStatus err = CreateEditUnicodeTextControl(
+ MAC_WXHWND(peer->MacGetTopLevelWindowRef()), bounds , cfr ,
+ isPassword , NULL , &m_controlRef ) ;
+ verify_noerr( err );
+}
+
void wxMacUnicodeTextControl::Copy()
{
SendHICommand( kHICommandCopy ) ;
wxMacConvertNewlines10To13( &st );
{
- wxMacWindowClipper c( m_peer );
+#ifndef __LP64__
+ wxMacWindowClipper c( m_peer ) ;
+#endif
{
wxMacEditHelper help( m_txn );
#else
typeAttr[attrCount].tag = kTXNATSUIStyle ;
typeAttr[attrCount].size = kTXNATSUIStyleSize ;
- typeAttr[attrCount].data.dataValue = (UInt32)font.MacGetATSUStyle() ;
+ typeAttr[attrCount].data.dataPtr = font.MacGetATSUStyle() ;
attrCount++ ;
#endif
}
wxMacConvertNewlines10To13( &value ) ;
wxMacEditHelper help( m_txn ) ;
+#ifndef __LP64__
wxMacWindowClipper c( m_peer ) ;
+#endif
TXNSetSelection( m_txn, from, to ) ;
TXNClear( m_txn ) ;
void wxMacMLTEControl::Remove( long from , long to )
{
+#ifndef __LP64__
wxMacWindowClipper c( m_peer ) ;
+#endif
wxMacEditHelper help( m_txn ) ;
TXNSetSelection( m_txn , from , to ) ;
TXNClear( m_txn ) ;
void wxMacMLTEControl::SetSelection( long from , long to )
{
+#ifndef __LP64__
wxMacWindowClipper c( m_peer ) ;
+#endif
// change the selection
if ((from == -1) && (to == -1))
long start , end , dummy ;
GetSelection( &start , &dummy ) ;
+#ifndef __LP64__
wxMacWindowClipper c( m_peer ) ;
+#endif
{
wxMacEditHelper helper( m_txn ) ;
void wxMacMLTEControl::Clear()
{
+#ifndef __LP64__
wxMacWindowClipper c( m_peer ) ;
+#endif
wxMacEditHelper st( m_txn ) ;
TXNSetSelection( m_txn , kTXNStartOffset , kTXNEndOffset ) ;
TXNClear( m_txn ) ;
void wxMacMLTEControl::ShowPosition( long pos )
{
-#if TARGET_RT_MAC_MACHO && defined(AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER)
- {
- Point current, desired ;
- TXNOffset selstart, selend;
+ Point current, desired ;
+ TXNOffset selstart, selend;
- TXNGetSelection( m_txn, &selstart, &selend );
- TXNOffsetToPoint( m_txn, selstart, ¤t );
- TXNOffsetToPoint( m_txn, pos, &desired );
+ TXNGetSelection( m_txn, &selstart, &selend );
+ TXNOffsetToPoint( m_txn, selstart, ¤t );
+ TXNOffsetToPoint( m_txn, pos, &desired );
- // TODO: use HIPoints for 10.3 and above
- if ( (UInt32)TXNScroll != (UInt32)kUnresolvedCFragSymbolAddress )
- {
- OSErr theErr = noErr;
- SInt32 dv = desired.v - current.v;
- SInt32 dh = desired.h - current.h;
- TXNShowSelection( m_txn, kTXNShowStart ) ; // NB: should this be kTXNShowStart or kTXNShowEnd ??
- theErr = TXNScroll( m_txn, kTXNScrollUnitsInPixels, kTXNScrollUnitsInPixels, &dv, &dh );
-
- // 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
+ // TODO: use HIPoints for 10.3 and above
+
+ OSErr theErr = noErr;
+ long dv = desired.v - current.v;
+ long dh = desired.h - current.h;
+ TXNShowSelection( m_txn, kTXNShowStart ) ; // NB: should this be kTXNShowStart or kTXNShowEnd ??
+ theErr = TXNScroll( m_txn, kTXNScrollUnitsInPixels, kTXNScrollUnitsInPixels, &dv, &dh );
+
+ // 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!") );
}
void wxMacMLTEControl::SetTXNData( const wxString& st, TXNOffset start, TXNOffset end )
return theLength ;
}
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
+
// ----------------------------------------------------------------------------
// MLTE control implementation (classic part)
// ----------------------------------------------------------------------------
return err;
}
+#endif
// ----------------------------------------------------------------------------
// MLTE control implementation (OSX part)
m_scrollView = NULL ;
TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( style ) ;
- if ( frameOptions & (kTXNWantVScrollBarMask | kTXNWantHScrollBarMask) )
+ if (( frameOptions & (kTXNWantVScrollBarMask | kTXNWantHScrollBarMask)) || !(frameOptions &kTXNSingleLineOnlyMask))
{
- HIScrollViewCreate(
- (frameOptions & kTXNWantHScrollBarMask ? kHIScrollViewOptionsHorizScroll : 0)
- | (frameOptions & kTXNWantVScrollBarMask ? kHIScrollViewOptionsVertScroll : 0) ,
- &m_scrollView ) ;
+ if ( frameOptions & (kTXNWantVScrollBarMask | kTXNWantHScrollBarMask) )
+ {
+ HIScrollViewCreate(
+ (frameOptions & kTXNWantHScrollBarMask ? kHIScrollViewOptionsHorizScroll : 0)
+ | (frameOptions & kTXNWantVScrollBarMask ? kHIScrollViewOptionsVertScroll : 0) ,
+ &m_scrollView ) ;
+ }
+ else
+ {
+ HIScrollViewCreate(kHIScrollViewOptionsVertScroll,&m_scrollView);
+ HIScrollViewSetScrollBarAutoHide(m_scrollView,true);
+ }
HIViewSetFrame( m_scrollView, &hr );
HIViewSetVisible( m_scrollView, true );
}
AdjustCreationAttributes( *wxWHITE , true ) ;
-
+#ifndef __LP64__
wxMacWindowClipper c( m_peer ) ;
+#endif
SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ;
TXNSetSelection( m_txn, 0, 0 );
projects / wxWidgets.git / blobdiff