From: Julian Smart Date: Tue, 17 May 2005 14:06:07 +0000 (+0000) Subject: Removed unnecessary bitmaps X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4e83306987a57fae066568f181903d3eac1a71c3?ds=inline Removed unnecessary bitmaps git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/contrib/samples/ogl/ogledit/bitmaps/arrow.bmp b/contrib/samples/ogl/ogledit/bitmaps/arrow.bmp deleted file mode 100644 index d406ceb64f..0000000000 Binary files a/contrib/samples/ogl/ogledit/bitmaps/arrow.bmp and /dev/null differ diff --git a/contrib/samples/ogl/ogledit/bitmaps/tool1.bmp b/contrib/samples/ogl/ogledit/bitmaps/tool1.bmp deleted file mode 100644 index cb1760d285..0000000000 Binary files a/contrib/samples/ogl/ogledit/bitmaps/tool1.bmp and /dev/null differ diff --git a/contrib/samples/ogl/ogledit/bitmaps/tool2.bmp b/contrib/samples/ogl/ogledit/bitmaps/tool2.bmp deleted file mode 100644 index a18faccff7..0000000000 Binary files a/contrib/samples/ogl/ogledit/bitmaps/tool2.bmp and /dev/null differ diff --git a/contrib/samples/ogl/ogledit/bitmaps/tool3.bmp b/contrib/samples/ogl/ogledit/bitmaps/tool3.bmp deleted file mode 100644 index 6a49f459c3..0000000000 Binary files a/contrib/samples/ogl/ogledit/bitmaps/tool3.bmp and /dev/null differ diff --git a/contrib/samples/ogl/ogledit/bitmaps/tool4.bmp b/contrib/samples/ogl/ogledit/bitmaps/tool4.bmp deleted file mode 100644 index 95c2061a90..0000000000 Binary files a/contrib/samples/ogl/ogledit/bitmaps/tool4.bmp and /dev/null differ diff --git a/contrib/samples/ogl/ogledit/palette.cpp b/contrib/samples/ogl/ogledit/palette.cpp index 1449340569..b149c30261 100644 --- a/contrib/samples/ogl/ogledit/palette.cpp +++ b/contrib/samples/ogl/ogledit/palette.cpp @@ -80,21 +80,12 @@ void EditorToolPalette::SetSize(int x, int y, int width, int height, int sizeFla EditorToolPalette *MyApp::CreatePalette(wxFrame *parent) { - // Load palette bitmaps. MSW-specific bitmaps no - // longer needed. -#if 0 - wxBitmap PaletteTool1(_T("TOOL1")); - wxBitmap PaletteTool2(_T("TOOL2")); - wxBitmap PaletteTool3(_T("TOOL3")); - wxBitmap PaletteTool4(_T("TOOL4")); - wxBitmap PaletteArrow(_T("ARROWTOOL")); -#else + // Load palette bitmaps. wxBitmap PaletteTool1(tool1_xpm); wxBitmap PaletteTool2(tool2_xpm); wxBitmap PaletteTool3(tool3_xpm); wxBitmap PaletteTool4(tool4_xpm); wxBitmap PaletteArrow(arrow_xpm); -#endif EditorToolPalette *palette = new EditorToolPalette(parent, wxPoint(0, 0), wxDefaultSize, wxTB_VERTICAL);