Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch to implement wxChoice::SetString and to not send leave events

Browse Source 
when window is captured.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-01-27 10:05:49 +00:00
parent 9006f25eba
commit b4bfa4522e
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/msw/choice.cpp
View File

@@ -191,14 +191,11 @@ int wxChoice::FindString(const wxString& s) const
#endif // Watcom/!Watcom #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")); wxCHECK_RET( (n>=0)&&(n<GetCount()), wxT("invalid item index in wxChoice::SetString") );
SendMessage(GetHwnd(), CB_DELETESTRING, n, 0);
#if 0 // should do this, but no Insert() so far SendMessage(GetHwnd(), CB_INSERTSTRING, n, (LONG)s.c_str() );
Delete(n);
Insert(n + 1, s);
#endif
} }
wxString wxChoice::GetString(int n) const wxString wxChoice::GetString(int n) const

2
src/msw/window.cpp
View File

@@ -1180,7 +1180,7 @@ void wxWindowMSW::OnIdle(wxIdleEvent& WXUNUSED(event))
// Check if we need to send a LEAVE event // Check if we need to send a LEAVE event
if ( m_mouseInWindow ) if ( m_mouseInWindow )
{ {
if ( !IsMouseInWindow() ) if ( !IsMouseInWindow() && HasCapture())
{ {
// Generate a LEAVE event // Generate a LEAVE event
m_mouseInWindow = FALSE; m_mouseInWindow = FALSE;