Delete SubtitlesGrid since it's now empty

aegisub/build/Aegisub/Aegisub.vcxproj

@@ -220,7 +220,6 @@
     <ClInclude Include="$(SrcDir)subs_controller.h" />
     <ClInclude Include="$(SrcDir)subs_edit_box.h" />
     <ClInclude Include="$(SrcDir)subs_edit_ctrl.h" />
-    <ClInclude Include="$(SrcDir)subs_grid.h" />
     <ClInclude Include="$(SrcDir)subs_preview.h" />
     <ClInclude Include="$(SrcDir)subtitle_format.h" />
     <ClInclude Include="$(SrcDir)subtitle_format_ass.h" />
@@ -417,7 +416,6 @@
     <ClCompile Include="$(SrcDir)subs_controller.cpp" />
     <ClCompile Include="$(SrcDir)subs_edit_box.cpp" />
     <ClCompile Include="$(SrcDir)subs_edit_ctrl.cpp" />
-    <ClCompile Include="$(SrcDir)subs_grid.cpp" />
     <ClCompile Include="$(SrcDir)subs_preview.cpp" />
     <ClCompile Include="$(SrcDir)subtitle_format.cpp" />
     <ClCompile Include="$(SrcDir)subtitle_format_ass.cpp" />

aegisub/build/Aegisub/Aegisub.vcxproj.filters

@@ -516,9 +516,6 @@
     <ClInclude Include="$(SrcDir)subs_edit_box.h">
       <Filter>Main UI\Edit box</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)subs_grid.h">
-      <Filter>Main UI\Grid</Filter>
-    </ClInclude>
     <ClInclude Include="$(SrcDir)charset_detect.h">
       <Filter>Features\Import</Filter>
     </ClInclude>
@@ -1073,9 +1070,6 @@
     <ClCompile Include="$(SrcDir)subs_edit_ctrl.cpp">
       <Filter>Main UI\Edit box</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)subs_grid.cpp">
-      <Filter>Main UI\Grid</Filter>
-    </ClCompile>
     <ClCompile Include="$(SrcDir)charset_detect.cpp">
       <Filter>Features\Import</Filter>
     </ClCompile>

aegisub/src/Makefile

@@ -214,7 +214,6 @@ SRC += \
 	subs_controller.cpp \
 	subs_edit_box.cpp \
 	subs_edit_ctrl.cpp \
-	subs_grid.cpp \
 	subs_preview.cpp \
 	subtitle_format.cpp \
 	subtitle_format_ass.cpp \

aegisub/src/command/edit.cpp

@@ -50,9 +50,9 @@
 #include "../initial_line_state.h"
 #include "../options.h"
 #include "../search_replace_engine.h"
+#include "../selection_controller.h"
 #include "../subs_controller.h"
 #include "../subs_edit_ctrl.h"
-#include "../subs_grid.h"
 #include "../text_selection_controller.h"
 #include "../utils.h"
 #include "../video_context.h"

aegisub/src/command/time.cpp

@@ -47,7 +47,6 @@
 #include "../include/aegisub/context.h"
 #include "../options.h"
 #include "../selection_controller.h"
-#include "../subs_grid.h"
 #include "../video_context.h"
 
 #include <libaegisub/of_type_adaptor.h>

aegisub/src/frame_main.cpp

@@ -49,6 +49,7 @@
 #include "audio_controller.h"
 #include "audio_box.h"
 #include "auto4_base.h"
+#include "base_grid.h"
 #include "compat.h"
 #include "command/command.h"
 #include "dialog_detached_video.h"
@@ -63,7 +64,6 @@
 #include "subs_controller.h"
 #include "subs_edit_box.h"
 #include "subs_edit_ctrl.h"
-#include "subs_grid.h"
 #include "utils.h"
 #include "version.h"
 #include "video_box.h"
@@ -366,7 +366,7 @@ void FrameMain::InitContents() {
 	wxPanel *Panel = new wxPanel(this,-1,wxDefaultPosition,wxDefaultSize,wxTAB_TRAVERSAL | wxCLIP_CHILDREN);
 
 	StartupLog("Create subtitles grid");
-	context->subsGrid = SubsGrid = new SubtitlesGrid(Panel, context.get());
+	context->subsGrid = SubsGrid = new BaseGrid(Panel, context.get(), wxDefaultSize, wxWANTS_CHARS | wxSUNKEN_BORDER);
 	context->selectionController = context->subsGrid;
 	context->search = new SearchReplaceEngine(context.get());
 	context->initialLineState = new InitialLineState(context.get());

aegisub/src/frame_main.h

@@ -49,7 +49,7 @@ class AegisubApp;
 class AegisubFileDropTarget;
 class AudioBox;
 class AudioProvider;
-class SubtitlesGrid;
+class BaseGrid;
 class VideoBox;
 
 namespace agi { struct Context; class OptionValue; }
@@ -98,7 +98,7 @@ class FrameMain: public wxFrame {
 
 	void EnableToolBar(agi::OptionValue const& opt);
 
-	SubtitlesGrid *SubsGrid; ///< The subtitle editing area
+	BaseGrid *SubsGrid; ///< The subtitle editing area
 	AudioBox *audioBox;      ///< The audio area
 	VideoBox *videoBox;      ///< The video area
 

aegisub/src/include/aegisub/context.h

@@ -9,7 +9,7 @@ class InitialLineState;
 template<class T> class SelectionController;
 class SubsController;
 class SubsTextEditCtrl;
-class SubtitlesGrid;
+class BaseGrid;
 class TextSelectionController;
 class VideoContext;
 class VideoDisplay;
@@ -42,7 +42,7 @@ struct Context {
 	AudioBox *audioBox;
 	AudioKaraoke *karaoke;
 	DialogManager *dialog;
-	SubtitlesGrid *subsGrid;
+	BaseGrid *subsGrid;
 	VideoDisplay *videoDisplay;
 };
 

aegisub/src/subs_edit_box.cpp

@@ -38,6 +38,7 @@
 
 #include "ass_dialogue.h"
 #include "ass_file.h"
+#include "base_grid.h"
 #include "command/command.h"
 #include "compat.h"
 #include "include/aegisub/context.h"
@@ -48,7 +49,6 @@
 #include "placeholder_ctrl.h"
 #include "scintilla_text_selection_controller.h"
 #include "subs_edit_ctrl.h"
-#include "subs_grid.h"
 #include "timeedit_ctrl.h"
 #include "tooltip_manager.h"
 #include "utils.h"

aegisub/src/subs_grid.cpp

@@ -1,42 +0,0 @@
-// Copyright (c) 2006, Rodrigo Braz Monteiro
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-//   * Redistributions of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//   * Redistributions in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//   * Neither the name of the Aegisub Group nor the names of its contributors
-//     may be used to endorse or promote products derived from this software
-//     without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Aegisub Project http://www.aegisub.org/
-
-/// @file subs_grid.cpp
-/// @brief Subtitles grid control in main window
-/// @ingroup main_ui
-///
-
-#include "config.h"
-
-#include "subs_grid.h"
-
-SubtitlesGrid::SubtitlesGrid(wxWindow *parent, agi::Context *context)
-: BaseGrid(parent, context, wxDefaultSize, wxWANTS_CHARS | wxSUNKEN_BORDER)
-{
-}

aegisub/src/subs_grid.h

@@ -1,40 +0,0 @@
-// Copyright (c) 2005, Rodrigo Braz Monteiro
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-//   * Redistributions of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//   * Redistributions in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//   * Neither the name of the Aegisub Group nor the names of its contributors
-//     may be used to endorse or promote products derived from this software
-//     without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Aegisub Project http://www.aegisub.org/
-
-/// @file subs_grid.h
-/// @see subs_grid.cpp
-/// @ingroup main_ui
-///
-
-#include "base_grid.h"
-
-class SubtitlesGrid: public BaseGrid {
-public:
-	SubtitlesGrid(wxWindow *parent, agi::Context *context);
-};

aegisub/src/video_slider.cpp

@@ -34,16 +34,17 @@
 
 #include "config.h"
 
-#include <wx/dcbuffer.h>
+#include "video_slider.h"
-#include <wx/settings.h>
 
+#include "base_grid.h"
 #include "include/aegisub/context.h"
 #include "include/aegisub/hotkey.h"
 #include "options.h"
-#include "subs_grid.h"
 #include "utils.h"
 #include "video_context.h"
-#include "video_slider.h"
+
+#include <wx/dcbuffer.h>
+#include <wx/settings.h>
 
 VideoSlider::VideoSlider (wxWindow* parent, agi::Context *c)
 : wxWindow(parent, -1, wxDefaultPosition, wxDefaultSize, wxWANTS_CHARS | wxFULL_REPAINT_ON_RESIZE)