diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-17 14:37:24 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-17 14:37:24 +0000 |
| commit | 85d32ee1481d3d0496c113653ed30baefea617d4 (patch) | |
| tree | a00774cc73824c73c187aeaaf4ffba8a45d38f04 /vcl | |
| parent | b6678b9fa263ce32ee95e6a85c3651fd343ed68e (diff) | |
CWS-TOOLING: integrate CWS os136
2009-09-08 08:51:21 +0200 os r275915 : #i104757# dropdown events also for key events
2009-09-04 13:13:14 +0200 os r275798 : #i104757# send event before opening a drop down list
2009-09-04 13:11:48 +0200 os r275797 : #i104757# dynamically load sub-regions in format/sections dialog
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/vcl/vclevent.hxx | 1 | ||||
| -rw-r--r-- | vcl/source/control/combobox.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/control/lstbox.cxx | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/vcl/inc/vcl/vclevent.hxx b/vcl/inc/vcl/vclevent.hxx index a28127dd6f82..ff0639d70e82 100644 --- a/vcl/inc/vcl/vclevent.hxx +++ b/vcl/inc/vcl/vclevent.hxx @@ -150,6 +150,7 @@ class Menu; #define VCLEVENT_LISTBOX_ENTRY_EXPANDED 1174 #define VCLEVENT_LISTBOX_ENTRY_COLLAPSED 1175 // <-- +#define VCLEVENT_DROPDOWN_PRE_OPEN 1176 // VclMenuEvent #define VCLEVENT_MENU_ACTIVATE 1200 diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 9f5160a2af11..f83e46e38302 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -287,6 +287,7 @@ BOOL ComboBox::IsAutocompleteEnabled() const IMPL_LINK( ComboBox, ImplClickBtnHdl, void*, EMPTYARG ) { + ImplCallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN ); mpSubEdit->GrabFocus(); if ( !mpImplLB->GetEntryList()->GetMRUCount() ) ImplUpdateFloatSelection(); @@ -523,6 +524,7 @@ void ComboBox::ToggleDropDown() ImplUpdateFloatSelection(); else mpImplLB->SelectEntry( 0 , TRUE ); + ImplCallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN ); mpBtn->SetPressed( TRUE ); SetSelection( Selection( 0, SELECTION_MAX ) ); mpFloatWin->StartFloat( TRUE ); @@ -824,6 +826,7 @@ long ComboBox::Notify( NotifyEvent& rNEvt ) ImplUpdateFloatSelection(); if( ( nKeyCode == KEY_DOWN ) && mpFloatWin && !mpFloatWin->IsInPopupMode() && aKeyEvt.GetKeyCode().IsMod2() ) { + ImplCallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN ); mpBtn->SetPressed( TRUE ); if ( mpImplLB->GetEntryList()->GetMRUCount() ) mpImplLB->SelectEntry( 0 , TRUE ); diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index a5e9ff1cc7d0..a4d3cbc22544 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -303,6 +303,7 @@ IMPL_LINK( ListBox, ImplClickBtnHdl, void*, EMPTYARG ) { if( !mpFloatWin->IsInPopupMode() ) { + ImplCallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN ); mpImplWin->GrabFocus(); mpBtn->SetPressed( TRUE ); mpFloatWin->StartFloat( TRUE ); @@ -363,6 +364,7 @@ void ListBox::ToggleDropDown() mpFloatWin->EndPopupMode(); else { + ImplCallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN ); mpImplWin->GrabFocus(); mpBtn->SetPressed( TRUE ); mpFloatWin->StartFloat( TRUE ); @@ -919,6 +921,7 @@ long ListBox::PreNotify( NotifyEvent& rNEvt ) if( mpFloatWin && !mpFloatWin->IsInPopupMode() && aKeyEvt.GetKeyCode().IsMod2() ) { + ImplCallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN ); mpBtn->SetPressed( TRUE ); mpFloatWin->StartFloat( FALSE ); ImplCallEventListeners( VCLEVENT_DROPDOWN_OPEN ); |