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

compilation/build fixes for wxUniv

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-09-26 00:47:52 +00:00
parent 55fb2c6cc2
commit 2e9f62dafb
11 changed files with 285 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/msw/window.cpp
View File

@@ -323,17 +323,21 @@ wxWindowMSW::~wxWindowMSW()
MSWDetachWindowMenu();
#ifndef __WXUNIVERSAL__
// VS: make sure there's no wxFrame with last focus set to us:
for (wxWindow *win = GetParent(); win; win = win->GetParent())
for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
{
wxFrame *frame = wxDynamicCast(win, wxFrame);
if ( frame )
{
if ( frame->GetLastFocus() == this )
frame->SetLastFocus((wxWindow*)NULL);
if ( frameMSW->GetLastFocus() == this )
{
frameMSW->SetLastFocus((wxWindow*)NULL);
}
break;
}
}
#endif // __WXUNIVERSAL__
// VS: destroy children first and _then_ detach *this from its parent.
// If we'd do it the other way around, children wouldn't be able
@@ -1642,6 +1646,8 @@ void wxWindowMSW::GetCaretPos(int *x, int *y) const
// popup menu
// ---------------------------------------------------------------------------
#if wxUSE_MENUS_NATIVE
// yield for WM_COMMAND events only, i.e. process all WM_COMMANDs in the queue
// immediately, without waiting for the next event loop iteration
//
@@ -1659,8 +1665,6 @@ static void wxYieldForCommandsOnly()
}
}
#if wxUSE_MENUS_NATIVE
bool wxWindowMSW::DoPopupMenu(wxMenu *menu, int x, int y)
{
menu->SetInvokingWindow(this);