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())