diff --git a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
index 13cc9a1a1..3034ce9b1 100644
--- a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
+++ b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
@@ -633,14 +633,6 @@
RelativePath="..\..\src\scintilla_text_ctrl.h"
>
-
-
-
-
diff --git a/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj b/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj
index 0d71961da..9ddb4a5fb 100644
--- a/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj
+++ b/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj
@@ -164,7 +164,6 @@
-
@@ -360,7 +359,6 @@
-
diff --git a/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj.filters b/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj.filters
index f0022c21b..ac2f6900a 100644
--- a/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj.filters
+++ b/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj.filters
@@ -636,9 +636,6 @@
Controls
-
- Controls
-
Video\Visual tools
@@ -1178,9 +1175,6 @@
Controls
-
- Controls
-
Video\Visual tools
diff --git a/aegisub/src/Makefile b/aegisub/src/Makefile
index 414640ce0..8c18e0758 100644
--- a/aegisub/src/Makefile
+++ b/aegisub/src/Makefile
@@ -210,7 +210,6 @@ SRC += \
spline.cpp \
spline_curve.cpp \
standard_paths.cpp \
- static_bmp.cpp \
string_codec.cpp \
subs_edit_box.cpp \
subs_edit_ctrl.cpp \
diff --git a/aegisub/src/dialog_about.h b/aegisub/src/dialog_about.h
index 07b0c06eb..9a1bfdee2 100644
--- a/aegisub/src/dialog_about.h
+++ b/aegisub/src/dialog_about.h
@@ -34,18 +34,10 @@
/// @ingroup configuration_ui
///
-
-
-
-////////////
-// Includes
#ifndef AGI_PRE
#include
#endif
-#include "static_bmp.h"
-
-
/// @class AboutScreen
/// @brief About dialogue.
class AboutScreen: public wxDialog {
@@ -53,5 +45,3 @@ public:
AboutScreen(wxWindow *parent);
~AboutScreen();
};
-
-
diff --git a/aegisub/src/static_bmp.cpp b/aegisub/src/static_bmp.cpp
deleted file mode 100644
index 493ccaeae..000000000
--- a/aegisub/src/static_bmp.cpp
+++ /dev/null
@@ -1,78 +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/
-//
-// $Id$
-
-/// @file static_bmp.cpp
-/// @brief Control displaying a static bitmapped image
-/// @ingroup custom_control
-///
-
-
-////////////
-// Includes
-#include "config.h"
-
-#ifndef AGI_PRE
-#include
-#endif
-
-#include "static_bmp.h"
-
-
-/// @brief Constructor
-/// @param parent
-/// @param _bmp
-/// @param style
-///
-BitmapControl::BitmapControl(wxWindow *parent,wxBitmap _bmp,int style) :
-wxWindow(parent, -1, wxDefaultPosition, wxDefaultSize, style)
-{
- bmp = _bmp;
- SetClientSize(bmp.GetWidth(),bmp.GetHeight());
-}
-
-
-///////////////
-// Event table
-BEGIN_EVENT_TABLE(BitmapControl, wxWindow)
- EVT_PAINT(BitmapControl::OnPaint)
-END_EVENT_TABLE()
-
-
-
-/// @brief OnPaint
-/// @param event
-///
-void BitmapControl::OnPaint(wxPaintEvent& event) {
- wxPaintDC dc(this);
- dc.DrawBitmap(bmp,0,0);
-}
-
-
diff --git a/aegisub/src/static_bmp.h b/aegisub/src/static_bmp.h
deleted file mode 100644
index 2292f311d..000000000
--- a/aegisub/src/static_bmp.h
+++ /dev/null
@@ -1,66 +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/
-//
-// $Id$
-
-/// @file static_bmp.h
-/// @see static_bmp.cpp
-/// @ingroup custom_control
-///
-
-
-
-
-////////////
-// Includes
-#ifndef AGI_PRE
-#include
-#include
-#endif
-
-
-/// DOCME
-/// @class BitmapControl
-/// @brief DOCME
-///
-/// DOCME
-class BitmapControl: public wxWindow {
-private:
-
- /// DOCME
- wxBitmap bmp;
- void OnPaint(wxPaintEvent& event);
-
-public:
- BitmapControl(wxWindow *parent,wxBitmap _bmp,int style=0);
-
- DECLARE_EVENT_TABLE()
-};
-
-