mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Delete static_bmp.[h|cpp] as it isn't actually used anywhere

Browse source 
Originally committed to SVN as r5930.
This commit is contained in:
Thomas Goyne 2011-11-29 23:17:31 +00:00
parent a445512970
commit 3f90614fd0
7 changed files with 0 additions and 171 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
View file

@ -633,14 +633,6 @@
RelativePath="..\..\src\scintilla_text_ctrl.h" RelativePath="..\..\src\scintilla_text_ctrl.h"
> >
</File> </File>
<File
RelativePath="..\..\src\static_bmp.cpp"
>
</File>
<File
RelativePath="..\..\src\static_bmp.h"
>
</File>
<File <File
RelativePath="..\..\src\subs_edit_ctrl.cpp" RelativePath="..\..\src\subs_edit_ctrl.cpp"
> >

2
aegisub/build/msbuild/Aegisub/Aegisub.vcxproj
View file

@ -164,7 +164,6 @@
<ClInclude Include="$(SrcDir)spline.h" /> <ClInclude Include="$(SrcDir)spline.h" />
<ClInclude Include="$(SrcDir)spline_curve.h" /> <ClInclude Include="$(SrcDir)spline_curve.h" />
<ClInclude Include="$(SrcDir)standard_paths.h" /> <ClInclude Include="$(SrcDir)standard_paths.h" />
<ClInclude Include="$(SrcDir)static_bmp.h" />
<ClInclude Include="$(SrcDir)string_codec.h" /> <ClInclude Include="$(SrcDir)string_codec.h" />
<ClInclude Include="$(SrcDir)subs_edit_box.h" /> <ClInclude Include="$(SrcDir)subs_edit_box.h" />
<ClInclude Include="$(SrcDir)subs_edit_ctrl.h" /> <ClInclude Include="$(SrcDir)subs_edit_ctrl.h" />
@ -360,7 +359,6 @@
<ClCompile Include="$(SrcDir)spline.cpp" /> <ClCompile Include="$(SrcDir)spline.cpp" />
<ClCompile Include="$(SrcDir)spline_curve.cpp" /> <ClCompile Include="$(SrcDir)spline_curve.cpp" />
<ClCompile Include="$(SrcDir)standard_paths.cpp" /> <ClCompile Include="$(SrcDir)standard_paths.cpp" />
<ClCompile Include="$(SrcDir)static_bmp.cpp" />
<ClCompile Include="$(SrcDir)string_codec.cpp" /> <ClCompile Include="$(SrcDir)string_codec.cpp" />
<ClCompile Include="$(SrcDir)subs_edit_box.cpp" /> <ClCompile Include="$(SrcDir)subs_edit_box.cpp" />
<ClCompile Include="$(SrcDir)subs_edit_ctrl.cpp" /> <ClCompile Include="$(SrcDir)subs_edit_ctrl.cpp" />

6
aegisub/build/msbuild/Aegisub/Aegisub.vcxproj.filters
View file

@ -636,9 +636,6 @@
<ClInclude Include="$(SrcDir)toggle_bitmap.h"> <ClInclude Include="$(SrcDir)toggle_bitmap.h">
<Filter>Controls</Filter> <Filter>Controls</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SrcDir)static_bmp.h">
<Filter>Controls</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)vector2d.h"> <ClInclude Include="$(SrcDir)vector2d.h">
<Filter>Video\Visual tools</Filter> <Filter>Video\Visual tools</Filter>
</ClInclude> </ClInclude>
@ -1178,9 +1175,6 @@
<ClCompile Include="$(SrcDir)toggle_bitmap.cpp"> <ClCompile Include="$(SrcDir)toggle_bitmap.cpp">
<Filter>Controls</Filter> <Filter>Controls</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)static_bmp.cpp">
<Filter>Controls</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)vector2d.cpp"> <ClCompile Include="$(SrcDir)vector2d.cpp">
<Filter>Video\Visual tools</Filter> <Filter>Video\Visual tools</Filter>
</ClCompile> </ClCompile>

1
aegisub/src/Makefile
View file

@ -210,7 +210,6 @@ SRC += \
spline.cpp \ spline.cpp \
spline_curve.cpp \ spline_curve.cpp \
standard_paths.cpp \ standard_paths.cpp \
static_bmp.cpp \
string_codec.cpp \ string_codec.cpp \
subs_edit_box.cpp \ subs_edit_box.cpp \
subs_edit_ctrl.cpp \ subs_edit_ctrl.cpp \

10
aegisub/src/dialog_about.h
View file

@ -34,18 +34,10 @@
/// @ingroup configuration_ui /// @ingroup configuration_ui
/// ///
////////////
// Includes
#ifndef AGI_PRE #ifndef AGI_PRE
#include <wx/dialog.h> #include <wx/dialog.h>
#endif #endif
#include "static_bmp.h"
/// @class AboutScreen /// @class AboutScreen
/// @brief About dialogue. /// @brief About dialogue.
class AboutScreen: public wxDialog { class AboutScreen: public wxDialog {
@ -53,5 +45,3 @@ public:
AboutScreen(wxWindow *parent); AboutScreen(wxWindow *parent);
~AboutScreen(); ~AboutScreen();
}; };

78
aegisub/src/static_bmp.cpp
View file

@ -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 <wx/dcclient.h>
#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);
}

66
aegisub/src/static_bmp.h
View file

@ -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 <wx/bitmap.h>
#include <wx/window.h>
#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()
};