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

tabs fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-02-08 11:06:06 +00:00
parent 3a05d58d94
commit f8e089e0c5
2 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1446,20 +1446,20 @@ int wxTextCtrl::GetNumberOfLines() const
{ {
if ( m_macUsesTXN ) if ( m_macUsesTXN )
{ {
ItemCount lines ; ItemCount lines ;
TXNGetLineCount((TXNObject)m_macTXN, &lines ) ; TXNGetLineCount((TXNObject)m_macTXN, &lines ) ;
return lines ; return lines ;
} }
else else
{ {
wxString content = GetValue() ; wxString content = GetValue() ;
int count = 1; int count = 1;
for (size_t i = 0; i < content.Length() ; i++) for (size_t i = 0; i < content.Length() ; i++)
{ {
if (content[i] == '\r') count++; if (content[i] == '\r') count++;
} }
return count; return count;
} }
} }
@@ -1479,22 +1479,22 @@ void wxTextCtrl::ShowPosition(long pos)
#if TARGET_RT_MAC_MACHO && defined(AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER) #if TARGET_RT_MAC_MACHO && defined(AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER)
if ( m_macUsesTXN ) if ( m_macUsesTXN )
{ {
Point current ; Point current ;
Point desired ; Point desired ;
TXNOffset selstart , selend ; TXNOffset selstart , selend ;
TXNGetSelection( (TXNObject) m_macTXN , &selstart , &selend) ; TXNGetSelection( (TXNObject) m_macTXN , &selstart , &selend) ;
TXNOffsetToPoint( (TXNObject) m_macTXN, selstart , &current); TXNOffsetToPoint( (TXNObject) m_macTXN, selstart , &current);
TXNOffsetToPoint( (TXNObject) m_macTXN, pos , &desired); TXNOffsetToPoint( (TXNObject) m_macTXN, pos , &desired);
//TODO use HIPoints for 10.3 and above //TODO use HIPoints for 10.3 and above
if ( (UInt32) TXNScroll != (UInt32) kUnresolvedCFragSymbolAddress ) if ( (UInt32) TXNScroll != (UInt32) kUnresolvedCFragSymbolAddress )
{ {
OSErr theErr = noErr; OSErr theErr = noErr;
SInt32 dv = desired.v - current.v ; SInt32 dv = desired.v - current.v ;
SInt32 dh = desired.h - current.h ; SInt32 dh = desired.h - current.h ;
TXNShowSelection( (TXNObject) m_macTXN , true ) ; TXNShowSelection( (TXNObject) m_macTXN , true ) ;
theErr = TXNScroll( (TXNObject) m_macTXN, kTXNScrollUnitsInPixels , kTXNScrollUnitsInPixels , &dv , &dh ); theErr = TXNScroll( (TXNObject) m_macTXN, kTXNScrollUnitsInPixels , kTXNScrollUnitsInPixels , &dv , &dh );
wxASSERT_MSG( theErr == noErr, _T("TXNScroll returned an error!") ); wxASSERT_MSG( theErr == noErr, _T("TXNScroll returned an error!") );
} }
} }
#endif #endif
} }

48
src/mac/textctrl.cpp
View File

@@ -1446,20 +1446,20 @@ int wxTextCtrl::GetNumberOfLines() const
{ {
if ( m_macUsesTXN ) if ( m_macUsesTXN )
{ {
ItemCount lines ; ItemCount lines ;
TXNGetLineCount((TXNObject)m_macTXN, &lines ) ; TXNGetLineCount((TXNObject)m_macTXN, &lines ) ;
return lines ; return lines ;
} }
else else
{ {
wxString content = GetValue() ; wxString content = GetValue() ;
int count = 1; int count = 1;
for (size_t i = 0; i < content.Length() ; i++) for (size_t i = 0; i < content.Length() ; i++)
{ {
if (content[i] == '\r') count++; if (content[i] == '\r') count++;
} }
return count; return count;
} }
} }
@@ -1479,22 +1479,22 @@ void wxTextCtrl::ShowPosition(long pos)
#if TARGET_RT_MAC_MACHO && defined(AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER) #if TARGET_RT_MAC_MACHO && defined(AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER)
if ( m_macUsesTXN ) if ( m_macUsesTXN )
{ {
Point current ; Point current ;
Point desired ; Point desired ;
TXNOffset selstart , selend ; TXNOffset selstart , selend ;
TXNGetSelection( (TXNObject) m_macTXN , &selstart , &selend) ; TXNGetSelection( (TXNObject) m_macTXN , &selstart , &selend) ;
TXNOffsetToPoint( (TXNObject) m_macTXN, selstart , &current); TXNOffsetToPoint( (TXNObject) m_macTXN, selstart , &current);
TXNOffsetToPoint( (TXNObject) m_macTXN, pos , &desired); TXNOffsetToPoint( (TXNObject) m_macTXN, pos , &desired);
//TODO use HIPoints for 10.3 and above //TODO use HIPoints for 10.3 and above
if ( (UInt32) TXNScroll != (UInt32) kUnresolvedCFragSymbolAddress ) if ( (UInt32) TXNScroll != (UInt32) kUnresolvedCFragSymbolAddress )
{ {
OSErr theErr = noErr; OSErr theErr = noErr;
SInt32 dv = desired.v - current.v ; SInt32 dv = desired.v - current.v ;
SInt32 dh = desired.h - current.h ; SInt32 dh = desired.h - current.h ;
TXNShowSelection( (TXNObject) m_macTXN , true ) ; TXNShowSelection( (TXNObject) m_macTXN , true ) ;
theErr = TXNScroll( (TXNObject) m_macTXN, kTXNScrollUnitsInPixels , kTXNScrollUnitsInPixels , &dv , &dh ); theErr = TXNScroll( (TXNObject) m_macTXN, kTXNScrollUnitsInPixels , kTXNScrollUnitsInPixels , &dv , &dh );
wxASSERT_MSG( theErr == noErr, _T("TXNScroll returned an error!") ); wxASSERT_MSG( theErr == noErr, _T("TXNScroll returned an error!") );
} }
} }
#endif #endif
} }