removed assert which could be provoked by correct code

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

diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp
index cda4bcd0de5e581b3a3e8e64bee03f5fd38f3826..69da2912c7daa85033ac7e96be0cfb1952891271 100644 (file)
--- a/src/mac/textctrl.cpp
+++ b/src/mac/textctrl.cpp
@@ -553,8 +553,16 @@ void wxTextCtrl::DiscardEdits()
 
 int wxTextCtrl::GetNumberOfLines() const
 {
-    // TODO
-    return 0;
+       Size actualsize;
+       UMAGetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ;
+       
+       int count = 1;
+       for (int i = 0; i < actualsize; i++)
+       {
+           if (wxBuffer[i] == '\r') count++;
+       }
+       
+    return count;
 }
 
 long wxTextCtrl::XYToPosition(long x, long y) const
@@ -575,12 +583,59 @@ void wxTextCtrl::ShowPosition(long pos)
 
 int wxTextCtrl::GetLineLength(long lineNo) const
 {
-    return GetValue().Length();
+       Size actualsize;
+       UMAGetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ;
+       
+       // Find line first
+       int count = 0;
+       for (int i = 0; i < actualsize; i++)
+       {
+           if (count == lineNo)
+           {
+               // Count chars in line then
+               count = 0;
+               for (int j = i; j < actualsize; j++)
+               {
+                   count++;
+                   if (wxBuffer[j] == '\r') return count;
+               }
+               
+               return count;
+           }
+           if (wxBuffer[i] == '\r') count++;
+       }
+       
+    return 0;
 }
 
 wxString wxTextCtrl::GetLineText(long lineNo) const
 {
-    return GetValue();
+       Size actualsize;
+       UMAGetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ;
+       
+       // Find line first
+       int count = 0;
+       for (int i = 0; i < actualsize; i++)
+       {
+           if (count == lineNo)
+           {
+               // Add chars in line then
+               wxString tmp("");
+               
+               for (int j = i; j < actualsize; j++)
+               {
+                   if (wxBuffer[j] == '\r')
+                       return tmp;
+                       
+                   tmp += wxBuffer[j];
+               }
+               
+               return tmp;
+           }
+           if (wxBuffer[i] == '\r') count++;
+       }
+       
+    return wxString("");
 }
 
 /*