summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorShawn Hoffman <godisgovernment@gmail.com>2009-03-20 18:46:50 +0000
committerShawn Hoffman <godisgovernment@gmail.com>2009-03-20 18:46:50 +0000
commit6bacdc0af32f9feae92264f23c6bcefbb0e8ba2d (patch)
treefde79260ba637696b9d71061761f3259771bc352 /Source/Core
parenteacb9ccd803945ee9aa0a32ea3a6ef6b227c6d40 (diff)
uncheck logwindow's menuitem when it is closed
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2695 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinWX/Src/LogWindow.cpp7
-rw-r--r--Source/Core/DolphinWX/Src/LogWindow.h1
2 files changed, 8 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/Src/LogWindow.cpp b/Source/Core/DolphinWX/Src/LogWindow.cpp
index 694e0cc8e8..4947c294db 100644
--- a/Source/Core/DolphinWX/Src/LogWindow.cpp
+++ b/Source/Core/DolphinWX/Src/LogWindow.cpp
@@ -30,6 +30,7 @@
#define UPDATETIME 100
BEGIN_EVENT_TABLE(CLogWindow, wxDialog)
+ EVT_CLOSE(CLogWindow::OnClose)
EVT_TEXT_ENTER(IDM_SUBMITCMD, CLogWindow::OnSubmit)
EVT_BUTTON(IDM_CLEARLOG, CLogWindow::OnClear)
EVT_BUTTON(IDM_TOGGLEALL, CLogWindow::OnToggleAll)
@@ -129,6 +130,12 @@ CLogWindow::~CLogWindow()
SaveSettings();
}
+void CLogWindow::OnClose(wxCloseEvent& event)
+{
+ wxGetApp().GetCFrame()->ToggleLogWindow(false);
+ event.Skip();
+}
+
void CLogWindow::SaveSettings()
{
IniFile ini;
diff --git a/Source/Core/DolphinWX/Src/LogWindow.h b/Source/Core/DolphinWX/Src/LogWindow.h
index da1e6eabca..00075e0e72 100644
--- a/Source/Core/DolphinWX/Src/LogWindow.h
+++ b/Source/Core/DolphinWX/Src/LogWindow.h
@@ -66,6 +66,7 @@ private:
DECLARE_EVENT_TABLE()
void CreateGUIControls();
+ void OnClose(wxCloseEvent& event);
void OnSubmit(wxCommandEvent& event);
void OnOptionsCheck(wxCommandEvent& event);
void OnLogCheck(wxCommandEvent& event);