Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use EditUnicodeText control for single lines

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-04-05 13:58:51 +00:00
parent 8055b7443c
commit 4d7528a1df
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/mac/carbon/textctrl.cpp
View File

@@ -421,27 +421,27 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
style |= wxTE_PROCESS_ENTER ; style |= wxTE_PROCESS_ENTER ;
} }
#ifdef __WXMAC_OSX__ bool forceMLTE = false ;
#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
bool tryHIView = UMAGetSystemVersion() >= 0x1030 ;
#if wxUSE_SYSTEM_OPTIONS #if wxUSE_SYSTEM_OPTIONS
if ( (wxSystemOptions::HasOption(wxMAC_TEXTCONTROL_USE_MLTE) ) && ( wxSystemOptions::GetOptionInt( wxMAC_TEXTCONTROL_USE_MLTE ) == 1) ) if ( (wxSystemOptions::HasOption(wxMAC_TEXTCONTROL_USE_MLTE) ) && ( wxSystemOptions::GetOptionInt( wxMAC_TEXTCONTROL_USE_MLTE ) == 1) )
{ {
tryHIView = false ; forceMLTE = true ;
} }
#endif #endif
if ( tryHIView )
#ifdef __WXMAC_OSX__
#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
if ( UMAGetSystemVersion() >= 0x1030 && forceMLTE == false )
{ {
m_peer = new wxMacMLTEHIViewControl( this , str , pos , size , style ) ; if ( m_windowStyle & wxTE_MULTILINE )
m_peer = new wxMacMLTEHIViewControl( this , str , pos , size , style ) ;
} }
#endif #endif
#if !wxMAC_AWAYS_USE_MLTE
if ( !m_peer ) if ( !m_peer )
{ {
m_peer = new wxMacUnicodeTextControl( this , str , pos , size , style ) ; if ( !(m_windowStyle & wxTE_MULTILINE) && forceMLTE == false )
m_peer = new wxMacUnicodeTextControl( this , str , pos , size , style ) ;
} }
#endif
#endif #endif
if ( !m_peer ) if ( !m_peer )
{ {
@@ -1489,7 +1489,7 @@ TXNFrameOptions wxMacMLTEControl::FrameOptionsFromWXStyle( long wxStyle )
{ {
TXNFrameOptions frameOptions = TXNFrameOptions frameOptions =
kTXNDontDrawCaretWhenInactiveMask ; kTXNDontDrawCaretWhenInactiveMask ;
if ( ! ( wxStyle & wxTE_NOHIDESEL ) ) if ( ! ( wxStyle & wxTE_NOHIDESEL ) )
frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ; frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ;
@@ -1878,7 +1878,9 @@ void wxMacMLTEControl::ShowPosition( long pos )
SInt32 dh = desired.h - current.h ; SInt32 dh = desired.h - current.h ;
TXNShowSelection( m_txn , true ) ; TXNShowSelection( m_txn , true ) ;
theErr = TXNScroll( m_txn, kTXNScrollUnitsInPixels , kTXNScrollUnitsInPixels , &dv , &dh ); theErr = TXNScroll( m_txn, kTXNScrollUnitsInPixels , kTXNScrollUnitsInPixels , &dv , &dh );
wxASSERT_MSG( theErr == noErr, _T("TXNScroll returned an error!") ); // there will be an error returned for classic mlte implementation when the control is
// invisible, but HITextView works correctly, so we don't assert that one
// wxASSERT_MSG( theErr == noErr, _T("TXNScroll returned an error!") );
} }
} }
#endif #endif