From b4bfa4522e2b7f88b555e98491135f8fff9a04de Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Sun, 27 Jan 2002 10:05:49 +0000
Subject: [PATCH] Applied patch to implement wxChoice::SetString and to not
 send leave events when window is captured.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/choice.cpp | 11 ++++-------
 src/msw/window.cpp |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index 8ef52dbcff..fc53d9298d 100644
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -191,14 +191,11 @@ int wxChoice::FindString(const wxString& s) const
 #endif // Watcom/!Watcom
 }
 
-void wxChoice::SetString(int WXUNUSED(n), const wxString& WXUNUSED(s))
+void wxChoice::SetString(int n, const wxString& s)
 {
-    wxFAIL_MSG(wxT("not implemented"));
-
-#if 0 // should do this, but no Insert() so far
-    Delete(n);
-    Insert(n + 1, s);
-#endif
+    wxCHECK_RET( (n>=0)&&(n<GetCount()), wxT("invalid item index in wxChoice::SetString") );
+    SendMessage(GetHwnd(), CB_DELETESTRING, n, 0);
+    SendMessage(GetHwnd(), CB_INSERTSTRING, n, (LONG)s.c_str() );
 }
 
 wxString wxChoice::GetString(int n) const
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 271f8f0cb8..ccd1fa6a25 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1180,7 +1180,7 @@ void wxWindowMSW::OnIdle(wxIdleEvent& WXUNUSED(event))
     // Check if we need to send a LEAVE event
     if ( m_mouseInWindow )
     {
-        if ( !IsMouseInWindow() )
+        if ( !IsMouseInWindow() && HasCapture())
         {
             // Generate a LEAVE event
             m_mouseInWindow = FALSE;
-- 
2.47.2