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

Fix for exiting on Windows

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@44611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-03-05 11:34:19 +00:00
parent 658ba84dc9
commit 9d90b84e1b
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
samples/html/helpview/helpview.cpp
View File

@@ -78,7 +78,7 @@ bool MyApp::OnInit()
SetAppName(wxT("wxHTMLHelp")); SetAppName(wxT("wxHTMLHelp"));
wxConfig::Get(); // create an instance wxConfig::Get(); // create an instance
help = new wxHtmlHelpController; help = new wxHtmlHelpController(wxHF_DEFAULT_STYLE|wxHF_OPEN_FILES);
if (argc < 2) { if (argc < 2) {
wxLogError(wxT("Usage : helpview <helpfile> [<more helpfiles>]")); wxLogError(wxT("Usage : helpview <helpfile> [<more helpfiles>]"));
@@ -104,6 +104,9 @@ void MyApp::OnIdle(wxIdleEvent& event)
{ {
if (m_exitIfNoMainWindow && !GetTopWindow()) if (m_exitIfNoMainWindow && !GetTopWindow())
ExitMainLoop(); ExitMainLoop();
event.Skip();
event.RequestMore();
} }
int MyApp::OnExit() int MyApp::OnExit()

5
utils/helpview/src/helpview.cpp
View File

@@ -72,7 +72,7 @@ bool hvApp::OnInit()
wxFileName::MacRegisterDefaultTypeAndCreator( wxT("htb") , 'HTBD' , 'HTBA' ) ; wxFileName::MacRegisterDefaultTypeAndCreator( wxT("htb") , 'HTBD' , 'HTBA' ) ;
#endif #endif
int istyle = wxHF_DEFAULT_STYLE; int istyle = wxHF_DEFAULT_STYLE|wxHF_OPEN_FILES;
wxString service, windowName, titleFormat, argStr; wxString service, windowName, titleFormat, argStr;
wxString book[10]; wxString book[10];
@@ -238,6 +238,9 @@ void hvApp::OnIdle(wxIdleEvent& event)
{ {
if (m_exitIfNoMainWindow && !GetTopWindow()) if (m_exitIfNoMainWindow && !GetTopWindow())
ExitMainLoop(); ExitMainLoop();
event.Skip();
event.RequestMore();
} }
int hvApp::OnExit() int hvApp::OnExit()