fix for sf bug 1448153: Widgets sample hangs on Japanese radio label

[wxWidgets.git] / src / msw / combobox.cpp

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 124b364f81576e08cb12694832f35c3b694d55de..be00b321fe9c63a25420416de21b4122106462a7 100644 (file)
--- 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:
 // Purpose:     wxComboBox class
 // Author:      Julian Smart
 // Modified by:


@@ -323,14 +323,16 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD id)
     switch ( param )
     {
         case CBN_SELENDOK:
     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;
             // 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
             sel = GetSelection();
 
             // set these variables so that they could be also fixed in
             // CBN_EDITCHANGE below
             sel = GetSelection();

-            value = GetValue();
+            value = GetStringSelection();

             {
                 wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, GetId());
                 event.SetEventObject(this);
             {
                 wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, GetId());
                 event.SetEventObject(this);


@@ -786,4 +788,3 @@ void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event)
 }
 
 #endif // wxUSE_COMBOBOX
 }
 
 #endif // wxUSE_COMBOBOX

-