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

make File->Exit work

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-05-02 03:18:18 +00:00
parent 3cf279b861
commit 3f6187f1d3
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
samples/minifram/minifram.cpp
View File

@@ -164,7 +164,6 @@ bool MyApp::InitToolbar(wxToolBar* toolBar)
// MyMiniFrame // MyMiniFrame
BEGIN_EVENT_TABLE(MyMiniFrame, wxMiniFrame) BEGIN_EVENT_TABLE(MyMiniFrame, wxMiniFrame)
EVT_CLOSE ( MyMiniFrame::OnCloseWindow)
EVT_BUTTON (ID_REPARENT, MyMiniFrame::OnReparent) EVT_BUTTON (ID_REPARENT, MyMiniFrame::OnReparent)
EVT_MENU (wxID_PRINT, MyMiniFrame::OnReparent) EVT_MENU (wxID_PRINT, MyMiniFrame::OnReparent)
END_EVENT_TABLE() END_EVENT_TABLE()
@@ -175,11 +174,11 @@ MyMiniFrame::MyMiniFrame(wxFrame* parent, wxWindowID id, const wxString& title,
{ {
} }
void MyMiniFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) bool MyMiniFrame::Destroy()
{ {
// make it known that the miniframe is no more // make it known that the miniframe is no more
mini_frame_exists = false; mini_frame_exists = false;
Destroy(); return wxMiniFrame::Destroy();
} }
void MyMiniFrame::OnReparent(wxCommandEvent& WXUNUSED(event)) void MyMiniFrame::OnReparent(wxCommandEvent& WXUNUSED(event))
@@ -193,7 +192,7 @@ void MyMiniFrame::OnReparent(wxCommandEvent& WXUNUSED(event))
// MyMainFrame // MyMainFrame
BEGIN_EVENT_TABLE(MyMainFrame, wxFrame) BEGIN_EVENT_TABLE(MyMainFrame, wxFrame)
EVT_CLOSE ( MyMainFrame::OnCloseWindow) EVT_MENU (wxID_EXIT, MyMainFrame::OnExit)
EVT_BUTTON (ID_REPARENT, MyMainFrame::OnReparent) EVT_BUTTON (ID_REPARENT, MyMainFrame::OnReparent)
EVT_MENU (wxID_PRINT, MyMainFrame::OnReparent) EVT_MENU (wxID_PRINT, MyMainFrame::OnReparent)
END_EVENT_TABLE() END_EVENT_TABLE()
@@ -204,9 +203,9 @@ MyMainFrame::MyMainFrame(wxFrame* parent, wxWindowID id, const wxString& title,
{ {
} }
void MyMainFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) void MyMainFrame::OnExit(wxCommandEvent&)
{ {
Destroy(); Close();
} }
void MyMainFrame::OnReparent(wxCommandEvent& WXUNUSED(event)) void MyMainFrame::OnReparent(wxCommandEvent& WXUNUSED(event))

4
samples/minifram/minifram.h
View File

@@ -26,7 +26,7 @@ public:
MyMiniFrame(wxFrame *parent, wxWindowID id = wxID_ANY, const wxString& title = _T("wxToolBar Sample"), MyMiniFrame(wxFrame *parent, wxWindowID id = wxID_ANY, const wxString& title = _T("wxToolBar Sample"),
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize ); const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize );
void OnCloseWindow(wxCloseEvent& event); virtual bool Destroy();
void OnReparent(wxCommandEvent& event); void OnReparent(wxCommandEvent& event);
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
@@ -39,7 +39,7 @@ public:
MyMainFrame(wxFrame *parent, wxWindowID id = wxID_ANY, const wxString& title = _T("wxToolBar Sample"), MyMainFrame(wxFrame *parent, wxWindowID id = wxID_ANY, const wxString& title = _T("wxToolBar Sample"),
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize ); const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize );
void OnCloseWindow(wxCloseEvent& event); void OnExit(wxCommandEvent&);
void OnReparent(wxCommandEvent& event); void OnReparent(wxCommandEvent& event);
void OnSetSize_150_150(wxCommandEvent &event); void OnSetSize_150_150(wxCommandEvent &event);
void OnSetSize_200_200(wxCommandEvent &event); void OnSetSize_200_200(wxCommandEvent &event);