GetSelection --> GetStringSelection

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

diff --git a/docs/latex/wx/text.tex b/docs/latex/wx/text.tex
index 8bb889ce5db28d8fd48a71f16ff6e3b76e498f54..09e9b045fae30caf85394da744b366e03ca4cd7d 100644 (file)
--- a/docs/latex/wx/text.tex
+++ b/docs/latex/wx/text.tex
@@ -42,7 +42,7 @@ it to always show it. It doesn't do anything under other platforms.}
 \twocolitem{\windowstyle{wxHSCROLL}}{A horizontal scrollbar will be created. No effect under GTK+.}
 \end{twocollist}
 
-See also \helpref{window styles overview}{windowstyles} and 
+See also \helpref{window styles overview}{windowstyles} and
 \helpref{wxTextCtrl::wxTextCtrl}{wxtextctrlconstr}.
 
 \wxheading{wxTextCtrl and C++ streams}
@@ -138,7 +138,7 @@ generated when enter is pressed in a single-line text control.}
 \twocolitem{{\bf EVT\_TEXT\_URL(id, func)}}{A mouse event occured over an URL
 in the text control (Win32 only)}
 \twocolitem{{\bf EVT\_TEXT\_MAXLEN(id, func)}}{User tried to enter more text
-into the control than the limit set by 
+into the control than the limit set by
 \helpref{SetMaxLength}{wxtextctrlsetmaxlength}.}
 \end{twocollist}%
 
@@ -371,8 +371,8 @@ no selection.
 Please note that the indices returned may be used with the other wxTextctrl
 methods but don't necessarily represent the correct indices into the string
 returned by \helpref{GetValue()}{wxtextctrlgetvalue} for multiline controls
-under Windows, you should use another version of 
-\helpref{GetSelection()}{wxtextctrlgetselectionstring} to get the selected
+under Windows (at least,) you should use
+\helpref{GetStringSelection()}{wxtextctrlgetstringselection} to get the selected
 text.
 
 \wxheading{Parameters}
@@ -387,9 +387,9 @@ consisting of the from and to values.}
 \perlnote{In wxPerl this method takes no parameter and returns a
 2-element list {\tt ( from, to )}.}
 
-\membersection{wxTextCtrl::GetSelection}\label{wxtextctrlgetselectionstring}
+\membersection{wxTextCtrl::GetStringSelection}\label{wxtextctrlgetstringselection}
 
-\func{virtual wxString}{GetSelection}{\void}
+\func{virtual wxString}{GetStringSelection}{\void}
 
 Gets the text currently selected in the control. If there is no selection, the
 returned string is empty.
@@ -594,7 +594,7 @@ and the user may enter as much text as the underlying native text control
 widget supports (typically at least 32Kb).
 
 If the user tries to enter more characters into the text control when it
-already is filled up to the maximal length, a 
+already is filled up to the maximal length, a
 {\tt wxEVT\_COMMAND\_TEXT\_MAXLEN} event is sent to notify the program about it
 (giving it the possibility to show an explanatory message, for example) and the
 extra input is discarded.

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index 3e0174e66efb7fbeb8369c0225dc959be1031b16..e92791b29e6f2f0f57b393112e92afdd45bef719 100644 (file)
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -56,7 +56,7 @@ public:
     virtual bool IsEditable() const;
 
     virtual void GetSelection(long* from, long* to) const;
-    virtual wxString GetSelection() const;
+    virtual wxString GetStringSelection() const;
 
     // operations
     // ----------

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 98155be3077018b602f1497bd040d0e5a2017009..25c0c09dfafa8d3a33fef39a118adefea36031cd 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -157,7 +157,7 @@ public:
     // If the return values from and to are the same, there is no selection.
     virtual void GetSelection(long* from, long* to) const = 0;
 
-    virtual wxString GetSelection() const;
+    virtual wxString GetStringSelection() const;
 
     // operations
     // ----------

diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index 0ada7cb2f2f492a22f06e4f048a1f83ed66880d2..8b5744f1bf5815e5f37c47ed5218c7756d782dfe 100644 (file)
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -244,7 +244,7 @@ void wxTextCtrlBase::SelectAll()
     SetSelection(0, GetLastPosition());
 }
 
-wxString wxTextCtrlBase::GetSelection() const
+wxString wxTextCtrlBase::GetStringSelection() const
 {
     long from, to;
     GetSelection(&from, &to);

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 7d13ae10f4685b16f995a449a4b0d62fa66401ae..a6686ae562e574d275571f45f44c8bf20b864db2 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -648,7 +648,7 @@ void wxTextCtrl::GetSelection(long* from, long* to) const
     }
 }
 
-wxString wxTextCtrl::GetSelection() const
+wxString wxTextCtrl::GetStringSelection() const
 {
     // the base class version works correctly for the rich text controls
     // because there the lines are terminated with just '\r' which means that
@@ -657,7 +657,7 @@ wxString wxTextCtrl::GetSelection() const
     // we break the indices
 #if wxUSE_RICHEDIT
     if ( m_isRich )
-        return wxTextCtrlBase::GetSelection();
+        return wxTextCtrlBase::GetStringSelection();
 #endif // wxUSE_RICHEDIT
 
     long from, to;