From 9c07798cb540a72e326420d177448413dd709028 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Fri, 21 Jan 2011 04:57:12 +0000 Subject: [PATCH] Delete some dead code in FrameMain Originally committed to SVN as r5253. --- aegisub/src/frame_main.cpp | 28 ---------------------------- aegisub/src/frame_main.h | 7 ------- 2 files changed, 35 deletions(-) diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp index 575373a75..fa8a5410b 100644 --- a/aegisub/src/frame_main.cpp +++ b/aegisub/src/frame_main.cpp @@ -106,7 +106,6 @@ FrameMain::FrameMain (wxArrayString args) , context(new agi::Context) , showVideo(true) , showAudio(true) -, HasSelection(false) , blockVideoLoad(false) { StartupLog("Entering FrameMain constructor"); @@ -329,8 +328,6 @@ void FrameMain::InitContents() { MainSizer->Add(TopSizer,0,wxEXPAND | wxALL,0); MainSizer->Add(SubsGrid,1,wxEXPAND | wxALL,0); Panel->SetSizer(MainSizer); - //MainSizer->SetSizeHints(Panel); - //SetSizer(MainSizer); StartupLog("Perform layout"); Layout(); @@ -355,7 +352,6 @@ void FrameMain::DeInitContents() { void FrameMain::UpdateToolbar() { // Collect flags bool isVideo = context->videoController->IsLoaded(); - HasSelection = true; int selRows = SubsGrid->GetNumberSelection(); // Update @@ -568,11 +564,6 @@ void FrameMain::LoadVFR(wxString filename) { } } -/// @brief Open help -void FrameMain::OpenHelp(wxString) { - HelpButton::OpenPage(_T("Main")); -} - /// @brief Detach video window /// @param detach void FrameMain::DetachVideo(bool detach) { @@ -684,14 +675,6 @@ bool FrameMain::LoadList(wxArrayString list) { return subs.size() || audio.size() || video.size(); } - -/// @brief Sets the descriptions for undo/redo -void FrameMain::SetUndoRedoDesc() { - wxMenu *editMenu = menu::menu->GetMenu("main/edit"); - editMenu->SetHelpString(0,_T("Undo ")+context->ass->GetUndoDescription()); - editMenu->SetHelpString(1,_T("Redo ")+context->ass->GetRedoDescription()); -} - /// @brief Check if ASSDraw is available bool FrameMain::HasASSDraw() { #ifdef __WINDOWS__ @@ -721,11 +704,7 @@ BEGIN_EVENT_TABLE(FrameMain, wxFrame) EVT_MENU_OPEN(FrameMain::OnMenuOpen) EVT_KEY_DOWN(FrameMain::OnKeyDown) -// EVT_MENU(cmd::id("subtitle/new"), FrameMain::cmd_call) -// EVT_MENU(cmd::id("subtitle/open"), FrameMain::cmd_call) -// EVT_MENU(cmd::id("subtitle/save"), FrameMain::cmd_call) -// EVT_MENU_RANGE(MENU_GRID_START+1,MENU_GRID_END-1,FrameMain::OnGridEvent) // EVT_COMBOBOX(Toolbar_Zoom_Dropdown, FrameMain::OnSetZoom) // EVT_TEXT_ENTER(Toolbar_Zoom_Dropdown, FrameMain::OnSetZoom) @@ -735,13 +714,6 @@ BEGIN_EVENT_TABLE(FrameMain, wxFrame) #endif END_EVENT_TABLE() - -/// @brief Redirect grid events to grid -/// @param event -void FrameMain::OnGridEvent (wxCommandEvent &event) { - SubsGrid->GetEventHandler()->ProcessEvent(event); -} - /// @brief Rebuild recent list /// @param listName /// @param menu diff --git a/aegisub/src/frame_main.h b/aegisub/src/frame_main.h index 33f142d5d..93a854e16 100644 --- a/aegisub/src/frame_main.h +++ b/aegisub/src/frame_main.h @@ -100,9 +100,6 @@ private: /// DOCME bool showVideo,showAudio; - /// DOCME - bool HasSelection; - /// DOCME wxTimer AutoSave; @@ -136,10 +133,7 @@ private: void InitMenu(); - void SetUndoRedoDesc(); - void OnKeyDown(wxKeyEvent &event); - void OnGridEvent (wxCommandEvent &event); void OnMenuOpen (wxMenuEvent &event); void OnAudioBoxResize(wxSashEvent &event); @@ -191,7 +185,6 @@ public: ~FrameMain(); void UpdateToolbar(); - static void OpenHelp(wxString page=_T("")); bool HasASSDraw(); DECLARE_EVENT_TABLE()