From 8e25c1981bae103b15a8d4df6fa8eb8724218ba0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 14 Mar 2006 00:35:05 +0000 Subject: [PATCH] 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 --- src/msw/combobox.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 124b364f81..8b1841fb2e 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/combobox.cpp +// Name: src/msw/combobox.cpp // Purpose: wxComboBox class // Author: Julian Smart // Modified by: @@ -323,9 +323,11 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD id) switch ( param ) { case CBN_SELENDOK: +#ifndef __SMARTPHONE__ // we need to reset this to prevent the selection from being undone // by wxChoice, see wxChoice::MSWCommand() and comments there m_lastAcceptedSelection = wxID_NONE; +#endif // set these variables so that they could be also fixed in // CBN_EDITCHANGE below @@ -786,4 +788,3 @@ void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event) } #endif // wxUSE_COMBOBOX - -- 2.50.0