wxComboBox with SmartphoneCE has different members due to differnt wxChoice.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: msw/combobox.cpp
|
// Name: src/msw/combobox.cpp
|
||||||
// Purpose: wxComboBox class
|
// Purpose: wxComboBox class
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
@@ -323,9 +323,11 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD id)
|
|||||||
switch ( param )
|
switch ( param )
|
||||||
{
|
{
|
||||||
case CBN_SELENDOK:
|
case CBN_SELENDOK:
|
||||||
|
#ifndef __SMARTPHONE__
|
||||||
// we need to reset this to prevent the selection from being undone
|
// we need to reset this to prevent the selection from being undone
|
||||||
// by wxChoice, see wxChoice::MSWCommand() and comments there
|
// by wxChoice, see wxChoice::MSWCommand() and comments there
|
||||||
m_lastAcceptedSelection = wxID_NONE;
|
m_lastAcceptedSelection = wxID_NONE;
|
||||||
|
#endif
|
||||||
|
|
||||||
// set these variables so that they could be also fixed in
|
// set these variables so that they could be also fixed in
|
||||||
// CBN_EDITCHANGE below
|
// CBN_EDITCHANGE below
|
||||||
@@ -786,4 +788,3 @@ void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#endif // wxUSE_COMBOBOX
|
#endif // wxUSE_COMBOBOX
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user