尝试修复WINDOWS 10关机时出现内存错误的问题

chenall · Mar 9, 2016 · 912f244 · 912f244
1 parent 5e81e08
commit 912f244
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Dialog/DlgAddNewCmd.cpp b/src/Dialog/DlgAddNewCmd.cpp
@@ -250,7 +250,7 @@ void DlgAddNewCmd::OnCmdUpdate(wxCommandEvent& e)
 void DlgAddNewCmd::OnShow(wxShowEvent& e)
 {
 	e.Skip();
-	if (!e.GetShow())
+	if (!e.IsShown())
 		return;
 	this->SetFocus();
 	if (cmdID == -1 || !g_config)

diff --git a/src/MerryFrame.cpp b/src/MerryFrame.cpp
@@ -176,7 +176,7 @@ void MerryFrame::ShowTrayIcon(const bool show)
 void MerryFrame::OnClose()
 {
 	__DEBUG_BEGIN("")
-	this->Hide();
+//	this->Hide();
 
 	wxDELETE(g_lua);
 	wxDELETE(g_commands);

diff --git a/src/MerryMainPanel.cpp b/src/MerryMainPanel.cpp
@@ -91,7 +91,7 @@ void MerryMainPanel::OnMouseEvent(wxMouseEvent& e)
 
 void MerryMainPanel::OnPaintEvent(wxPaintEvent& e)
 {
-	wxPaintDC dc = wxPaintDC(this);
+	wxPaintDC dc(this);
 	dc.Clear();
 
 	if (m_background.IsOk())