From 912f244e455fd420b72a1ddba8177a07309591d4 Mon Sep 17 00:00:00 2001
From: chenall <chenall.cn@gmail.com>
Date: Wed, 9 Mar 2016 13:04:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8DWINDOWS=201?=
 =?UTF-8?q?0=E5=85=B3=E6=9C=BA=E6=97=B6=E5=87=BA=E7=8E=B0=E5=86=85?=
 =?UTF-8?q?=E5=AD=98=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Dialog/DlgAddNewCmd.cpp | 2 +-
 src/MerryFrame.cpp          | 2 +-
 src/MerryMainPanel.cpp      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Dialog/DlgAddNewCmd.cpp b/src/Dialog/DlgAddNewCmd.cpp
index 8b3c00f..bb517a0 100644
--- 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
index 9257736..b3cfe1b 100644
--- 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
index 0a2e1e2..40dbd0f 100644
--- 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())