Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GetSelection() always returns from <= to as wxMSW does

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-05-07 15:08:38 +00:00
parent 779cedff87
commit 2d4cc5b600
2 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gtk/textctrl.cpp
View File

@@ -916,20 +916,34 @@ bool wxTextCtrl::CanRedo() const
// If the return values from and to are the same, there is no // If the return values from and to are the same, there is no
// selection. // selection.
void wxTextCtrl::GetSelection(long* from, long* to) const void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const
{ {
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
if (!(GTK_EDITABLE(m_text)->has_selection)) long from, to;
if ( !(GTK_EDITABLE(m_text)->has_selection) )
{ {
long i = GetInsertionPoint(); from =
if (from) *from = i; to = GetInsertionPoint();
if (to) *to = i; }
return; else // got selection
{
from = (long) GTK_EDITABLE(m_text)->selection_start_pos;
to = (long) GTK_EDITABLE(m_text)->selection_end_pos;
if ( from > to )
{
// exchange them to be compatible with wxMSW
long tmp = from;
from = to;
to = tmp;
}
} }
if (from) *from = (long) GTK_EDITABLE(m_text)->selection_start_pos; if ( fromOut )
if (to) *to = (long) GTK_EDITABLE(m_text)->selection_end_pos; *fromOut = from;
if ( toOut )
*toOut = to;
} }
bool wxTextCtrl::IsEditable() const bool wxTextCtrl::IsEditable() const

30
src/gtk1/textctrl.cpp
View File

@@ -916,20 +916,34 @@ bool wxTextCtrl::CanRedo() const
// If the return values from and to are the same, there is no // If the return values from and to are the same, there is no
// selection. // selection.
void wxTextCtrl::GetSelection(long* from, long* to) const void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const
{ {
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
if (!(GTK_EDITABLE(m_text)->has_selection)) long from, to;
if ( !(GTK_EDITABLE(m_text)->has_selection) )
{ {
long i = GetInsertionPoint(); from =
if (from) *from = i; to = GetInsertionPoint();
if (to) *to = i; }
return; else // got selection
{
from = (long) GTK_EDITABLE(m_text)->selection_start_pos;
to = (long) GTK_EDITABLE(m_text)->selection_end_pos;
if ( from > to )
{
// exchange them to be compatible with wxMSW
long tmp = from;
from = to;
to = tmp;
}
} }
if (from) *from = (long) GTK_EDITABLE(m_text)->selection_start_pos; if ( fromOut )
if (to) *to = (long) GTK_EDITABLE(m_text)->selection_end_pos; *fromOut = from;
if ( toOut )
*toOut = to;
} }
bool wxTextCtrl::IsEditable() const bool wxTextCtrl::IsEditable() const