tabs fixed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 69a1ddfacc4b8c50d0834c8c6f937bd9a1f74a33..7d60383101b1bb6a9fe0bf04d9f7fed3d796e3b0 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -1446,20 +1446,20 @@ int wxTextCtrl::GetNumberOfLines() const
 {
     if ( m_macUsesTXN ) 
     {
 {
     if ( m_macUsesTXN ) 
     {

-       ItemCount lines ;
-               TXNGetLineCount((TXNObject)m_macTXN, &lines ) ;
-               return lines ;
+        ItemCount lines ;
+        TXNGetLineCount((TXNObject)m_macTXN, &lines ) ;
+        return lines ;

     }
     else
     {          
     }
     else
     {          

-           wxString content = GetValue() ;
+        wxString content = GetValue() ;

 
 

-           int count = 1;
-           for (size_t i = 0; i < content.Length() ; i++)
-           {
-               if (content[i] == '\r') count++;
-           }
-       return count;
+        int count = 1;
+        for (size_t i = 0; i < content.Length() ; i++)
+        {
+            if (content[i] == '\r') 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 ( m_macUsesTXN ) 
     {
 #if TARGET_RT_MAC_MACHO && defined(AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER)
     if ( m_macUsesTXN ) 
     {

-       Point current ;
-       Point desired ;
-       TXNOffset selstart , selend ;
+        Point current ;
+        Point desired ;
+        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,  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(  (TXNObject) m_macTXN , true ) ;
+        TXNOffsetToPoint( (TXNObject) m_macTXN,  selstart , &current);
+        TXNOffsetToPoint( (TXNObject) m_macTXN,  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(  (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
 }

diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp
index 69a1ddfacc4b8c50d0834c8c6f937bd9a1f74a33..7d60383101b1bb6a9fe0bf04d9f7fed3d796e3b0 100644 (file)
--- a/src/mac/textctrl.cpp
+++ b/src/mac/textctrl.cpp
@@ -1446,20 +1446,20 @@ int wxTextCtrl::GetNumberOfLines() const
 {
     if ( m_macUsesTXN ) 
     {
 {
     if ( m_macUsesTXN ) 
     {

-       ItemCount lines ;
-               TXNGetLineCount((TXNObject)m_macTXN, &lines ) ;
-               return lines ;
+        ItemCount lines ;
+        TXNGetLineCount((TXNObject)m_macTXN, &lines ) ;
+        return lines ;

     }
     else
     {          
     }
     else
     {          

-           wxString content = GetValue() ;
+        wxString content = GetValue() ;

 
 

-           int count = 1;
-           for (size_t i = 0; i < content.Length() ; i++)
-           {
-               if (content[i] == '\r') count++;
-           }
-       return count;
+        int count = 1;
+        for (size_t i = 0; i < content.Length() ; i++)
+        {
+            if (content[i] == '\r') 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 ( m_macUsesTXN ) 
     {
 #if TARGET_RT_MAC_MACHO && defined(AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER)
     if ( m_macUsesTXN ) 
     {

-       Point current ;
-       Point desired ;
-       TXNOffset selstart , selend ;
+        Point current ;
+        Point desired ;
+        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,  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(  (TXNObject) m_macTXN , true ) ;
+        TXNOffsetToPoint( (TXNObject) m_macTXN,  selstart , &current);
+        TXNOffsetToPoint( (TXNObject) m_macTXN,  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(  (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
 }