don't give empty message box if Parse(FALSE) was called and there was --help on the...

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

diff --git a/src/x11/textctrl.cpp b/src/x11/textctrl.cpp
index 50329f67fe389cd0b9ccd63d9041fd3ffc9133b6..c65341d9972982abc1fc38cca5a9e677553c77ec 100644 (file)
--- a/src/x11/textctrl.cpp
+++ b/src/x11/textctrl.cpp
@@ -275,12 +275,8 @@ void wxTextCtrl::SetValue(const wxString& value)
 {
     m_modified = FALSE;
 
-    if ((GetWindowStyle() & wxTE_MULTILINE) == 0)
-    {
-        if (value == GetValue())
-            return;
-    }
-    
+    wxString oldValue = GetValue();
+
     m_cursorX = 0;
     m_cursorY = 0;
     ClearSelection();
@@ -330,6 +326,13 @@ void wxTextCtrl::SetValue(const wxString& value)
             }
         }
     }
+
+    // Don't need to refresh if the value hasn't changed
+    if ((GetWindowStyle() & wxTE_MULTILINE) == 0)
+    {
+        if (value == oldValue)
+            return;
+    }
     
     MyAdjustScrollbars();
     
@@ -369,6 +372,17 @@ bool wxTextCtrl::IsEditable() const
 
 void wxTextCtrl::GetSelection(long* from, long* to) const
 {
+    if (m_selStartX == -1 || m_selStartY == -1 ||
+        m_selEndX == -1 || m_selEndY == -1)
+    {
+        *from = GetInsertionPoint();
+        *to = GetInsertionPoint();
+    }
+    else
+    {
+        *from = XYToPosition(m_selStartX, m_selStartY);
+        *to = XYToPosition(m_selEndX, m_selEndY);
+    }
 }
 
 void wxTextCtrl::Clear()
@@ -749,14 +763,15 @@ long wxTextCtrl::XYToPosition(long x, long y) const
     {
         if (i < (size_t)y)
         {
-            ret += m_lines[i].m_text.Len();
+            // Add one for the end-of-line character
+            ret += m_lines[i].m_text.Len() + 1;
             continue;
         }
         
-        if ((size_t)x < m_lines[i].m_text.Len())
+        if ((size_t)x < (m_lines[i].m_text.Len()+1))
             return (ret + x);
         else
-            return (ret + m_lines[i].m_text.Len());
+            return (ret + m_lines[i].m_text.Len() + 1);
     }
      
     return ret;
@@ -777,19 +792,25 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
     
     for (size_t i = 0; i < m_lines.GetCount(); i++)
     {
-        pos -= m_lines[i].m_text.Len();
-        if (pos <= 0)
+        //pos -= m_lines[i].m_text.Len();
+        //if (pos <= 0)
+
+        // Add one for the end-of-line character. (In Windows,
+        // there are _two_ positions for each end of line.)
+        if (pos <= ((int)m_lines[i].m_text.Len()))
         {
-            xx = -pos;
+            xx = pos;
             if (x) *x = xx;
             if (y) *y = yy;
             return TRUE;
         }
+        pos -= (m_lines[i].m_text.Len() + 1);
         yy++;
     }
     
     // Last pos
-    xx = m_lines[ m_lines.GetCount()-1 ].m_text.Len();
+    //xx = m_lines[ m_lines.GetCount()-1 ].m_text.Len();
+    xx = pos;
     if (x) *x = xx;
     if (y) *y = yy;
     
@@ -963,10 +984,18 @@ void wxTextCtrl::Undo()
 
 void wxTextCtrl::SetInsertionPoint(long pos)
 {
+    ClearSelection();
+    long x, y;
+    PositionToXY(pos, & x, & y);
+    m_cursorX = x;
+    m_cursorY = y;
+    // TODO: scroll to this position if necessary
+    Refresh();
 }
 
 void wxTextCtrl::SetInsertionPointEnd()
 {
+    SetInsertionPoint(GetLastPosition());
 }
 
 long wxTextCtrl::GetInsertionPoint() const
@@ -977,7 +1006,9 @@ long wxTextCtrl::GetInsertionPoint() const
 long wxTextCtrl::GetLastPosition() const
 {
     size_t lineCount = m_lines.GetCount() - 1;
-    return XYToPosition( m_lines[lineCount].m_text.Len()-1, lineCount );
+    // It's the length of the line, not the length - 1,
+    // because there's a position after the last character.
+    return XYToPosition( m_lines[lineCount].m_text.Len(), lineCount );
 }
 
 void wxTextCtrl::SetSelection(long from, long to)
@@ -1040,7 +1071,7 @@ void wxTextCtrl::SearchForBrackets()
     char bracket = ' ';
     
     if (m_cursorX > 0)
-        bracket = current[m_cursorX-1];
+        bracket = current[(size_t) (m_cursorX-1)];
         
     if (bracket == ')' || bracket == ']' || bracket == '}')
     {
@@ -1061,13 +1092,13 @@ void wxTextCtrl::SearchForBrackets()
             for (int n = current.Len()-1; n >= 0; n--)
             {
                 // ignore chars
-                if (current[n] == '\'')
+                if (current[(size_t) (n)] == '\'')
                 {
                     for (int m = n-1; m >= 0; m--)
                     {
-                        if (current[m] == '\'')
+                        if (current[(size_t) (m)] == '\'')
                         {
-                            if (m == 0 || current[m-1] != '\\')
+                            if (m == 0 || current[(size_t) (m-1)] != '\\')
                                 break;
                         }
                         n = m-1;
@@ -1076,13 +1107,13 @@ void wxTextCtrl::SearchForBrackets()
                 }
                 
                 // ignore strings
-                if (current[n] == '\"')
+                if (current[(size_t) (n)] == '\"')
                 {
                     for (int m = n-1; m >= 0; m--)
                     {
-                        if (current[m] == '\"')
+                        if (current[(size_t) (m)] == '\"')
                         {
-                            if (m == 0 || current[m-1] != '\\')
+                            if (m == 0 || current[(size_t) (m-1)] != '\\')
                                 break;
                         }
                         n = m-1;
@@ -1090,7 +1121,7 @@ void wxTextCtrl::SearchForBrackets()
                     continue;
                 }
             
-                if (current[n] == antibracket)
+                if (current[(size_t) (n)] == antibracket)
                 {
                     count--;
                     if (count == 0)
@@ -1104,7 +1135,7 @@ void wxTextCtrl::SearchForBrackets()
                         return;
                     }
                 }
-                else if (current[n] == bracket)
+                else if (current[(size_t) (n)] == bracket)
                 {
                     count++;
                 }
@@ -1116,7 +1147,7 @@ void wxTextCtrl::SearchForBrackets()
 
     bracket = ' ';
     if ((int)current.Len() > m_cursorX)
-        bracket = current[m_cursorX];
+        bracket = current[(size_t) (m_cursorX)];
     if (bracket == '(' || bracket == '[' || bracket == '{')
     {
         char antibracket = ')';
@@ -1137,13 +1168,13 @@ void wxTextCtrl::SearchForBrackets()
             for (int n = start; n < (int)current.Len(); n++)
             {
                 // ignore chars
-                if (current[n] == '\'')
+                if (current[(size_t) (n)] == '\'')
                 {
                     for (int m = n+1; m < (int)current.Len(); m++)
                     {
-                        if (current[m] == '\'')
+                        if (current[(size_t) (m)] == '\'')
                         {
-                            if (m == 0 || (current[m-1] != '\\') || (m >= 2 && current[m-2] == '\\'))
+                            if (m == 0 || (current[(size_t) (m-1)] != '\\') || (m >= 2 && current[(size_t) (m-2)] == '\\'))
                                 break;
                         }
                         n = m+1;
@@ -1152,13 +1183,13 @@ void wxTextCtrl::SearchForBrackets()
                 }
                 
                 // ignore strings
-                if (current[n] == '\"')
+                if (current[(size_t) (n)] == '\"')
                 {
                     for (int m = n+1; m < (int)current.Len(); m++)
                     {
-                        if (current[m] == '\"')
+                        if (current[(size_t) (m)] == '\"')
                         {
-                            if (m == 0 || (current[m-1] != '\\') || (m >= 2 && current[m-2] == '\\'))
+                            if (m == 0 || (current[(size_t) (m-1)] != '\\') || (m >= 2 && current[(size_t) (m-2)] == '\\'))
                                 break;
                         }
                         n = m+1;
@@ -1166,7 +1197,7 @@ void wxTextCtrl::SearchForBrackets()
                     continue;
                 }
                 
-                if (current[n] == antibracket)
+                if (current[(size_t) (n)] == antibracket)
                 {
                     count--;
                     if (count == 0)
@@ -1180,7 +1211,7 @@ void wxTextCtrl::SearchForBrackets()
                         return;
                     }
                 }
-                else if (current[n] == bracket)
+                else if (current[(size_t) (n)] == bracket)
                 {
                     count++;
                 }
@@ -1484,7 +1515,7 @@ void wxTextCtrl::DoDClick()
     wxString line( m_lines[ m_cursorY ].m_text );
     if (m_cursorX >= (int)line.Len()) return;
     int p = m_cursorX;
-    char ch = line[p];
+    char ch = line[(size_t) (p)];
     if (((ch >= 'a') && (ch <= 'z')) ||
         ((ch >= 'A') && (ch <= 'Z')) ||
         ((ch >= '0') && (ch <= '9')) ||
@@ -1494,7 +1525,7 @@ void wxTextCtrl::DoDClick()
         m_selEndY = m_cursorY;
         if (p > 0)
         {
-            ch = line[p-1];
+            ch = line[(size_t) (p-1)];
             while (((ch >= 'a') && (ch <= 'z')) ||
                    ((ch >= 'A') && (ch <= 'Z')) ||
                    ((ch >= '0') && (ch <= '9')) ||
@@ -1502,7 +1533,7 @@ void wxTextCtrl::DoDClick()
             {
                 p--;
                 if (p == 0) break;
-                ch = line[p-1];
+                ch = line[(size_t) (p-1)];
             }
         }
         m_selStartX = p;
@@ -1510,7 +1541,7 @@ void wxTextCtrl::DoDClick()
         p = m_cursorX;
         if (p < (int)line.Len())
         {
-            ch = line[p];
+            ch = line[(size_t) (p)];
             while (((ch >= 'a') && (ch <= 'z')) ||
                    ((ch >= 'A') && (ch <= 'Z')) ||
                    ((ch >= '0') && (ch <= '9')) ||
@@ -1518,7 +1549,7 @@ void wxTextCtrl::DoDClick()
             {
                 if (p >= (int)line.Len()) break;
                 p++;
-                ch = line[p];
+                ch = line[(size_t) (p)];
             }
         }
         m_selEndX = p;
@@ -1544,7 +1575,7 @@ wxString wxTextCtrl::GetNextToken( wxString &line, size_t &pos )
         }
         else
         {
-            if ((line[p] == '/') && (p+1 < len) && (line[p+1] == '/'))
+            if ((line[p] == '/') && (p+1 < len) && (line[(size_t) (p+1)] == '/'))
             {
                 for (size_t q = p; q < len; q++)
                     ret.Append( line[q] );
@@ -1559,7 +1590,7 @@ wxString wxTextCtrl::GetNextToken( wxString &line, size_t &pos )
             for (size_t q = p+1; q < len; q++)
             {
                 ret.Append( line[q] );
-                if ((line[q] == '"') && ((line[q-1] != '\\') || (q >= 2 && line[q-2] == '\\')))
+                if ((line[q] == '"') && ((line[(size_t) (q-1)] != '\\') || (q >= 2 && line[(size_t) (q-2)] == '\\')))
                    break;
             }
             pos = p;
@@ -1572,7 +1603,7 @@ wxString wxTextCtrl::GetNextToken( wxString &line, size_t &pos )
             for (size_t q = p+1; q < len; q++)
             {
                 ret.Append( line[q] );
-                if ((line[q] == '\'') && ((line[q-1] != '\\') || (q >= 2 && line[q-2] == '\\')))
+                if ((line[q] == '\'') && ((line[(size_t) (q-1)] != '\\') || (q >= 2 && line[(size_t) (q-2)] == '\\')))
                    break;
             }
             pos = p;
@@ -1686,7 +1717,7 @@ void wxTextCtrl::DrawLine( wxDC &dc, int x, int y, const wxString &line2, int li
             wxString red( ' ', line.Len() );
             if (m_bracketX < (int)line.Len())
             {
-                red.SetChar( m_bracketX, line[m_bracketX] );
+                red.SetChar( m_bracketX, line[(size_t) (m_bracketX)] );
                 line.SetChar( m_bracketX, ' ' );
                 dc.SetTextForeground( *wxRED );
                 dc.DrawText( red, x, y );
@@ -1717,7 +1748,7 @@ void wxTextCtrl::DrawLine( wxDC &dc, int x, int y, const wxString &line2, int li
                 }
             } else
             if ((m_variables.Index( token ) != wxNOT_FOUND) ||
-                ((token.Len() > 2) && (token[0] == 'w') && (token[1] == 'x')))
+                ((token.Len() > 2) && (token[(size_t) (0)] == 'w') && (token[(size_t) (1)] == 'x')))
             {
                 size_t end_pos = pos + token.Len();
                 for (size_t i = pos; i < end_pos; i++)
@@ -1726,7 +1757,7 @@ void wxTextCtrl::DrawLine( wxDC &dc, int x, int y, const wxString &line2, int li
                     line[i] = ' ';
                 }
             } else
-            if ((token.Len() >= 2) && (token[0] == '/') && (token[1] == '/') && (m_lang == wxSOURCE_LANG_CPP))
+            if ((token.Len() >= 2) && (token[(size_t) (0)] == '/') && (token[(size_t) (1)] == '/') && (m_lang == wxSOURCE_LANG_CPP))
             {
                 size_t end_pos = pos + token.Len();
                 for (size_t i = pos; i < end_pos; i++)
@@ -1735,7 +1766,7 @@ void wxTextCtrl::DrawLine( wxDC &dc, int x, int y, const wxString &line2, int li
                     line[i] = ' ';
                 }
             } else
-            if ((token[0] == '#') &&
+            if ((token[(size_t) (0)] == '#') &&
                 ((m_lang == wxSOURCE_LANG_PYTHON) || (m_lang == wxSOURCE_LANG_PERL)))
             {
                 size_t end_pos = pos + token.Len();
@@ -1745,7 +1776,7 @@ void wxTextCtrl::DrawLine( wxDC &dc, int x, int y, const wxString &line2, int li
                     line[i] = ' ';
                 }
             } else
-            if ((token[0] == '"') || (token[0] == '\''))
+            if ((token[(size_t) (0)] == '"') || (token[(size_t) (0)] == '\''))
             {
                 size_t end_pos = pos + token.Len();
                 for (size_t i = pos; i < end_pos; i++)
@@ -2224,7 +2255,7 @@ void wxTextCtrl::MoveCursor( int new_x, int new_y, bool shift, bool centre )
 
     // if (IsSingleLine() || (m_lang == wxSOURCE_LANG_NONE))
     {
-        if (new_x > m_lines[new_y].m_text.Len())
+        if (new_x > (int) (m_lines[new_y].m_text.Len()))
             new_x = m_lines[new_y].m_text.Len();
     }
 
@@ -2429,7 +2460,7 @@ void wxTextCtrl::MyAdjustScrollbars()
     int height = 0;
     GetClientSize( NULL, &height );
     height -= 4;
-    if (height >= m_lines.GetCount() *m_lineHeight)
+    if (height >= (int)m_lines.GetCount() *m_lineHeight)
         y_range = 0;
     
     int view_x = 0;