recall initial font

[wxWidgets.git] / src / mac / carbon / textctrl.cpp

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index d95006ca297d28f62692b358528b92dbf123f37c..92e971a0190e59251f337d60385e253f72ab9c89 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -1200,7 +1200,7 @@ wxString wxMacUnicodeTextControl::GetStringValue() const
         wxMacCFStringHolder cf(value) ;
         result = cf.AsString() ;
     }
-#if TARGET_API_MAC_OSX
+#if '\n' == 10
     wxMacConvertNewlines13To10( &result ) ;
 #else
     wxMacConvertNewlines10To13( &result ) ;
@@ -1378,7 +1378,7 @@ wxString wxMacMLTEControl::GetStringValue() const
         }
 #endif
     }
-#if TARGET_API_MAC_OSX
+#if '\n' == 10
     wxMacConvertNewlines13To10( &result ) ;
 #else
     wxMacConvertNewlines10To13( &result ) ;
@@ -1839,7 +1839,7 @@ wxString wxMacMLTEControl::GetLineText(long lineNo) const
             currentHeight += lineHeight;
         }
         
-        Point thePoint = { firstPoint.v + Fix2Long(currentHeight), firstPoint.h + Fix2Long(0) };
+        Point thePoint = { firstPoint.v + (currentHeight >> 16), firstPoint.h + (0) };
         TXNOffset theOffset;
         TXNPointToOffset(m_txn, thePoint, &theOffset);
                     
@@ -1878,7 +1878,7 @@ int  wxMacMLTEControl::GetLineLength(long lineNo) const
             currentHeight += lineHeight;
         }
         
-        Point thePoint = { firstPoint.v + Fix2Long(currentHeight), firstPoint.h + Fix2Long(0) };
+        Point thePoint = { firstPoint.v + (currentHeight >> 16), firstPoint.h + (0) };
         TXNOffset theOffset;
         TXNPointToOffset(m_txn, thePoint, &theOffset);