summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-02-19 11:04:02 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-02-19 11:07:12 +0000
commit3d024d29fa7344240f6cf407d023ef3537b0a5a9 (patch)
treea65df80d3695abd1592421dcd13dc7d8f6e98d3e /vcl
parentda13dd9a3513fa003b5a3537f6d1fb4e8ce23262 (diff)
Related: fdo#74242 send selection change before caret change
because that's what I see gtk does Change-Id: Ifa20f4d84fd31ea6fcc640589b72efd00c9665fd
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/control/edit.cxx14
1 files changed, 8 insertions, 6 deletions
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 2e8b3f96bf39..f923c51e32d3 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2649,19 +2649,21 @@ void Edit::ImplSetSelection( const Selection& rSelection, sal_Bool bPaint )
bCaret = sal_True;
if (nGap != 0 || oGap != 0)
bSelection = sal_True;
- if (bCaret)
+
+ if (bSelection)
{
if ( mbIsSubEdit )
- ((Edit*)GetParent())->ImplCallEventListeners( VCLEVENT_EDIT_CARETCHANGED );
+ ((Edit*)GetParent())->ImplCallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED );
else
- ImplCallEventListeners( VCLEVENT_EDIT_CARETCHANGED );
+ ImplCallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED );
}
- if (bSelection)
+
+ if (bCaret)
{
if ( mbIsSubEdit )
- ((Edit*)GetParent())->ImplCallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED );
+ ((Edit*)GetParent())->ImplCallEventListeners( VCLEVENT_EDIT_CARETCHANGED );
else
- ImplCallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED );
+ ImplCallEventListeners( VCLEVENT_EDIT_CARETCHANGED );
}
// #103511# notify combobox listeners of deselection