projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed some warnings
[wxWidgets.git]
/
src
/
msw
/
combobox.cpp
diff --git
a/src/msw/combobox.cpp
b/src/msw/combobox.cpp
index d0b9836bafcb077eb970211ac46a20233ff7fce4..b823cc589942d478e1a1ca3ec6d166b0d15e4b69 100644
(file)
--- a/
src/msw/combobox.cpp
+++ b/
src/msw/combobox.cpp
@@
-274,26
+274,27
@@
bool wxComboBox::MSWCommand(WXUINT param, WXWORD id)
case CBN_DROPDOWN:
// remember the last selection, just as wxChoice does
m_lastAcceptedSelection = GetCurrentSelection();
case CBN_DROPDOWN:
// remember the last selection, just as wxChoice does
m_lastAcceptedSelection = GetCurrentSelection();
- if ( m_lastAcceptedSelection == -1 )
- {
- // but unlike with wxChoice we may have no selection but still
- // have some text and we should avoid erasing it if the drop
- // down is cancelled (see #8474)
- m_lastAcceptedSelection = wxID_NONE;
- }
{
wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_DROPDOWN, GetId());
event.SetEventObject(this);
ProcessCommand(event);
}
break;
{
wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_DROPDOWN, GetId());
event.SetEventObject(this);
ProcessCommand(event);
}
break;
+
case CBN_CLOSEUP:
case CBN_CLOSEUP:
+ // Do the same thing as in wxChoice but using different event type.
+ if ( m_pendingSelection != wxID_NONE )
+ {
+ SendSelectionChangedEvent(wxEVT_COMMAND_COMBOBOX_SELECTED);
+ m_pendingSelection = wxID_NONE;
+ }
{
wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_CLOSEUP, GetId());
event.SetEventObject(this);
ProcessCommand(event);
}
break;
{
wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_CLOSEUP, GetId());
event.SetEventObject(this);
ProcessCommand(event);
}
break;
+
case CBN_SELENDOK:
#ifndef __SMARTPHONE__
// we need to reset this to prevent the selection from being undone
case CBN_SELENDOK:
#ifndef __SMARTPHONE__
// we need to reset this to prevent the selection from being undone