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

fixed some frame cleanup stuff; The main frame (MyFrame) explicitely closes

Browse Source 
the helpframe now before deleting the config pointer and closing itself.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Harco de Hilster
1999-10-14 14:57:17 +00:00
parent f3ef286fee
commit 8f8ca6c952
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
samples/html/help/help.cpp
View File

@@ -55,7 +55,7 @@
// event handlers (these functions should _not_ be virtual) // event handlers (these functions should _not_ be virtual)
void OnQuit(wxCommandEvent& event); void OnQuit(wxCommandEvent& event);
void OnHelp(wxCommandEvent& event); void OnHelp(wxCommandEvent& event);
void OnClose(wxCloseEvent& event);
private: private:
wxHtmlHelpController help; wxHtmlHelpController help;
wxConfig* config; wxConfig* config;
@@ -86,6 +86,7 @@
BEGIN_EVENT_TABLE(MyFrame, wxFrame) BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(Minimal_Quit, MyFrame::OnQuit) EVT_MENU(Minimal_Quit, MyFrame::OnQuit)
EVT_MENU(Minimal_Help, MyFrame::OnHelp) EVT_MENU(Minimal_Help, MyFrame::OnHelp)
EVT_CLOSE(MyFrame::OnClose)
END_EVENT_TABLE() END_EVENT_TABLE()
// Create a new application object: this macro will allow wxWindows to create // Create a new application object: this macro will allow wxWindows to create
@@ -168,18 +169,25 @@
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{ {
// TRUE is to force the frame to close // TRUE is to force the frame to close
delete config;
Close(TRUE); Close(TRUE);
} }
void MyFrame::OnHelp(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnHelp(wxCommandEvent& WXUNUSED(event))
{ {
help.Display("Main page"); help.Display("Main page");
} }
void MyFrame::OnClose(wxCloseEvent& event)
{
// Close the help frame; this will cause the config data to
// get written.
if ( help.GetFrame() ) // returns NULL if no help frame active
help.GetFrame()->Close(TRUE);
// now we can safely delete the config pointer
delete config;
event.Skip();
}