From f34d37d0910fbef62fb6a53778400f41d1d80cad Mon Sep 17 00:00:00 2001
From: Karl Blomster <kalle.blomster@gmail.com>
Date: Sun, 7 Nov 2010 19:32:40 +0000
Subject: [PATCH] remove assorted forgotten traces of the splash screen

Originally committed to SVN as r4831.
---
 aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj | 8 --------
 aegisub/src/dialog_selected_choices.cpp            | 4 ++++
 aegisub/src/libresrc/default_config.json           | 1 -
 aegisub/src/preferences.cpp                        | 1 -
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
index affa66c71..8a613a2a1 100644
--- a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
+++ b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
@@ -1131,14 +1131,6 @@
 				RelativePath="..\..\src\dialog_spellchecker.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\dialog_splash.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\dialog_splash.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\dialog_style_editor.cpp"
 				>
diff --git a/aegisub/src/dialog_selected_choices.cpp b/aegisub/src/dialog_selected_choices.cpp
index cfda2006f..47f596a98 100644
--- a/aegisub/src/dialog_selected_choices.cpp
+++ b/aegisub/src/dialog_selected_choices.cpp
@@ -37,6 +37,10 @@
 
 #include <numeric>
 
+#ifdef __VISUALC__
+#pragma warning(disable:4996)
+#endif
+
 SelectedChoicesDialog::SelectedChoicesDialog(wxWindow *parent, wxString const& message, wxString const& caption, wxArrayString const& choices) {
 	Create(parent, message, caption, choices);
 
diff --git a/aegisub/src/libresrc/default_config.json b/aegisub/src/libresrc/default_config.json
index c09cfca76..d71ddc41e 100644
--- a/aegisub/src/libresrc/default_config.json
+++ b/aegisub/src/libresrc/default_config.json
@@ -14,7 +14,6 @@
 		"Maximized" : false,
 		"Nonstandard Milisecond Times" : false,
 		"Save Charset" : "UTF-8",
-		"Splash" : true,
 		"Tips" : false
 	},
 
diff --git a/aegisub/src/preferences.cpp b/aegisub/src/preferences.cpp
index 7573d2ba3..b96ad4d3b 100644
--- a/aegisub/src/preferences.cpp
+++ b/aegisub/src/preferences.cpp
@@ -54,7 +54,6 @@ General::General(wxTreebook *book, Preferences *parent): OptionPage(book, parent
 
 	wxFlexGridSizer *startup = PageSizer(_("Startup"));
 	OptionAdd(startup, _("Check for updates"), "App/Auto/Check For Updates");
-	OptionAdd(startup, _("Show Splash Screen"), "App/Splash");
 
 	wxFlexGridSizer *recent = PageSizer(_("Recently Used Lists"));
 	OptionAdd(recent, _("Files"), "Limits/MRU");