From 271f2c8c8b0026437a3bda729caa64e9dc08eb48 Mon Sep 17 00:00:00 2001 From: toshinagata1964 Date: Mon, 16 Jan 2012 10:13:37 +0000 Subject: [PATCH] Empty Console Window command is implemented. git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/molby/trunk@171 a2be9bc6-48de-4e38-9406-05402d4bc13c --- wxSources/ConsoleFrame.cpp | 7 +++++++ wxSources/ConsoleFrame.h | 3 ++- wxSources/MyApp.cpp | 9 +++++++++ wxSources/MyApp.h | 4 +++- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/wxSources/ConsoleFrame.cpp b/wxSources/ConsoleFrame.cpp index 4142a63..b1bb93f 100755 --- a/wxSources/ConsoleFrame.cpp +++ b/wxSources/ConsoleFrame.cpp @@ -283,3 +283,10 @@ ConsoleFrame::OnKeyDown(wxKeyEvent &event) else event.Skip(); } + +void +ConsoleFrame::EmptyBuffer() +{ + textCtrl->Clear(); + MyAppCallback_showRubyPrompt(); +} diff --git a/wxSources/ConsoleFrame.h b/wxSources/ConsoleFrame.h index 112b1cb..da9c3df 100755 --- a/wxSources/ConsoleFrame.h +++ b/wxSources/ConsoleFrame.h @@ -48,7 +48,8 @@ public: void OnCopy(wxCommandEvent &event); void OnPaste(wxCommandEvent &event); void OnClear(wxCommandEvent &event); - + void EmptyBuffer(); + private: DECLARE_EVENT_TABLE() }; diff --git a/wxSources/MyApp.cpp b/wxSources/MyApp.cpp index f7d307a..289ab3f 100755 --- a/wxSources/MyApp.cpp +++ b/wxSources/MyApp.cpp @@ -82,6 +82,7 @@ BEGIN_EVENT_TABLE(MyApp, wxApp) EVT_UPDATE_UI_RANGE(myMenuID_MyFirstMenuItem, myMenuID_MyLastMenuItem, MyApp::OnUpdateUI) EVT_MENU(myMenuID_ExecuteScript, MyApp::OnExecuteScript) EVT_MENU(myMenuID_OpenConsoleWindow, MyApp::OnOpenConsoleWindow) + EVT_MENU(myMenuID_EmptyConsoleWindow, MyApp::OnEmptyConsoleWindow) // EVT_MENU(myMenuID_ReadParameters, MyApp::OnReadParameters) EVT_MENU(myMenuID_ViewGlobalParameters, MyApp::OnViewGlobalParameters) EVT_MENU(myMenuID_ViewParameterFilesList, MyApp::OnViewParameterFilesList) @@ -453,6 +454,7 @@ MyApp::CreateMenuBar(int kind, wxMenu **out_file_history_menu, wxMenu **out_edit wxMenu *script_menu = new wxMenu; script_menu->Append(myMenuID_ExecuteScript, _T("Execute Script...")); script_menu->Append(myMenuID_OpenConsoleWindow, _T("Open Console Window...")); + script_menu->Append(myMenuID_EmptyConsoleWindow, _T("Empty Console Window")); script_menu->AppendSeparator(); countNonCustomScriptMenu = script_menu->GetMenuItemCount(); @@ -629,6 +631,12 @@ MyApp::OnOpenConsoleWindow(wxCommandEvent& event) } void +MyApp::OnEmptyConsoleWindow(wxCommandEvent& event) +{ + consoleFrame->EmptyBuffer(); +} + +void MyApp::OnViewGlobalParameters(wxCommandEvent& event) { if (parameterFrame == NULL) { @@ -891,6 +899,7 @@ MyApp::OnUpdateUI(wxUpdateUIEvent& event) switch (uid) { case myMenuID_ExecuteScript: case myMenuID_OpenConsoleWindow: + case myMenuID_EmptyConsoleWindow: case myMenuID_ViewParameterFilesList: case myMenuID_ViewGlobalParameters: case myMenuID_MDTools: diff --git a/wxSources/MyApp.h b/wxSources/MyApp.h index c831c3a..befa850 100755 --- a/wxSources/MyApp.h +++ b/wxSources/MyApp.h @@ -99,7 +99,8 @@ enum { myMenuID_CreateMOCube = 251, myMenuID_ExecuteScript = 300, myMenuID_OpenConsoleWindow = 301, - myMenuID_CustomScript = 302, + myMenuID_EmptyConsoleWindow = 302, + myMenuID_CustomScript = 303, myMenuID_PredefinedFragment = 350, myMenuID_MyLastMenuItem = 499 }; @@ -158,6 +159,7 @@ class MyApp: public wxApp void OnUpdateUI(wxUpdateUIEvent &event); void OnExecuteScript(wxCommandEvent &event); void OnOpenConsoleWindow(wxCommandEvent &event); + void OnEmptyConsoleWindow(wxCommandEvent &event); void OnViewGlobalParameters(wxCommandEvent &event); void OnViewParameterFilesList(wxCommandEvent &event); -- 2.11.0