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

no message

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster 2000-03-10 22:24:07 +00:00
parent 0b7e77395d
commit 7bed7a507c
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/os2/app.cpp
View File

@ -478,28 +478,26 @@ int wxEntry(
{
if (wxTheApp->OnInit())
{
nRetValue = -1;
nRetValue = wxTheApp->OnRun();
// nRetValue = -1;
}
}
if (nRetValue == 0)
{
wxWindow* pTopWindow = wxTheApp->GetTopWindow();
wxWindow* pTopWindow = wxTheApp->GetTopWindow();
if (pTopWindow)
if (pTopWindow)
{
// Forcibly delete the window.
if (pTopWindow->IsKindOf(CLASSINFO(wxFrame)) ||
pTopWindow->IsKindOf(CLASSINFO(wxDialog)) )
{
// Forcibly delete the window.
if (pTopWindow->IsKindOf(CLASSINFO(wxFrame)) ||
pTopWindow->IsKindOf(CLASSINFO(wxDialog)) )
{
pTopWindow->Close(TRUE);
wxTheApp->DeletePendingObjects();
}
else
{
delete pTopWindow;
wxTheApp->SetTopWindow(NULL);
}
pTopWindow->Close(TRUE);
wxTheApp->DeletePendingObjects();
}
else
{
delete pTopWindow;
wxTheApp->SetTopWindow(NULL);
}
}
wxTheApp->OnExit();

9
src/os2/frame.cpp
View File

@ -344,6 +344,14 @@ void wxFrame::DoShowWindow(
{
HWND hClient;
//
// Send anything to initialize the frame
//
::WinSendMsg( GetHwnd()
,WM_UPDATEFRAME
,(MPARAM)FCF_MENU
,(MPARAM)0
);
hClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
::WinShowWindow(GetHwnd(), (BOOL)bShowCmd);
::WinShowWindow(hClient, (BOOL)bShowCmd);
@ -898,6 +906,7 @@ bool wxFrame::OS2Create(
,SWP_SIZE | SWP_MOVE
))
return FALSE;
WinQueryWindowPos(hClient, &vSwp);
return TRUE;
} // end of wxFrame::OS2Create