summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Yin <steve_y@apache.org>2014-01-28 09:55:07 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-01-28 11:37:23 +0000
commit05534b5523a264a18d5ee4b8014d6a0eb6470071 (patch)
tree54464f29268bb78493d2cfa3173d1bd3351ebbf6
parent7be0997a0235b05fed9d448e642e0575a4e6e017 (diff)
Resolves: #i124008# listbox entry's are selected automatically...
on mouse over instead of mouse click (cherry picked from commit ae97dcb5b8d2dead81b007c5c71daf608f0c7bc3) Change-Id: Ib1ce0db60785ddc96473ef4ce88b578287956164
-rw-r--r--accessibility/source/standard/vclxaccessiblebox.cxx1
-rw-r--r--accessibility/source/standard/vclxaccessiblelist.cxx1
-rw-r--r--include/vcl/vclevent.hxx1
-rw-r--r--vcl/source/control/combobox.cxx2
-rw-r--r--vcl/source/control/lstbox.cxx2
5 files changed, 5 insertions, 2 deletions
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index dbb5dcdd8fe2..b9f3a3e0b212 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -110,6 +110,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
{
switch ( rVclWindowEvent.GetId() )
{
+ case VCLEVENT_DROPDOWN_SELECT:
case VCLEVENT_LISTBOX_SELECT:
case VCLEVENT_LISTBOX_FOCUSITEMCHANGED:
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index 29a65b5d6dcb..cc0e5f791a36 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -345,6 +345,7 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve
{
switch ( rVclWindowEvent.GetId() )
{
+ case VCLEVENT_DROPDOWN_SELECT:
case VCLEVENT_LISTBOX_SELECT:
if ( !m_bDisableProcessEvent )
UpdateSelection_Impl_Acc(b_IsDropDownList);
diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index 92ffca93b02f..a4f4e29b0868 100644
--- a/include/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
@@ -151,6 +151,7 @@ namespace com { namespace sun { namespace star {
#define VCLEVENT_ITEM_EXPANDED 1174
#define VCLEVENT_ITEM_COLLAPSED 1175
#define VCLEVENT_DROPDOWN_PRE_OPEN 1176
+#define VCLEVENT_DROPDOWN_SELECT 1177
#define VCLEVENT_LISTBOX_FOCUSITEMCHANGED 1180
// VclMenuEvent
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 6fb9d4739a8b..aa34972a2b55 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -463,7 +463,7 @@ IMPL_LINK_NOARG(ComboBox, ImplSelectHdl)
IMPL_LINK( ComboBox, ImplListItemSelectHdl, void*, EMPTYARG )
{
- ImplCallEventListeners( VCLEVENT_LISTBOX_SELECT );
+ ImplCallEventListeners( VCLEVENT_DROPDOWN_SELECT );
return 1;
}
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 2af18e2a1996..551382d8493d 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -249,7 +249,7 @@ IMPL_LINK( ListBox, ImplFocusHdl, void *, nPos )
IMPL_LINK( ListBox, ImplListItemSelectHdl, void*, EMPTYARG )
{
- ImplCallEventListeners( VCLEVENT_LISTBOX_SELECT );
+ ImplCallEventListeners( VCLEVENT_DROPDOWN_SELECT );
return 1;
}