solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Remove unnecessary mondrian.{ico,xpm} files from samples directory.

Browse source 
Standardize on using sample.rc and sample icon in all the samples, it was
confusing that some of them used it and other didn't, without any apparent
logic.

Remove the now unnecessary icon files, including the dialogs sample icon which
seemed to be corrupted (this closes #11146).

Also replace multiple OS/2 resource files with a single one in the sample
directory. The OS/2 projects/makefiles would need to be updated to use them.

Remove dialogs sample icon.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2010-06-20 17:42:33 +00:00
parent 2613d67b9f
commit 3cb332c155
611 changed files with 1503 additions and 8123 deletions
Download patch file Download diff file Expand all files Collapse all files

4
samples/listctrl/listtest.cpp
View file

@ -21,7 +21,7 @@
#endif
#if !defined(__WXMSW__) && !defined(__WXPM__)
#include "mondrian.xpm"
#include "../sample.xpm"
#endif
#ifndef __WXMSW__
@ -173,7 +173,7 @@ MyFrame::MyFrame(const wxChar *title)
m_numListItems = 10;
// Give it an icon
SetIcon( wxICON(mondrian) );
SetIcon(wxICON(sample));
// Make an image list containing large icons
m_imageListNormal = new wxImageList(32, 32, true);

4
samples/listctrl/listtest.rc
View file

@ -1,6 +1,4 @@
aaaa ICON "mondrian.ico"
mondrian ICON "mondrian.ico"
#include "wx/msw/wx.rc"
#include "../sample.rc"
icon1 ICON "bitmaps/toolbrai.ico"
icon2 ICON "bitmaps/toolchar.ico"

BIN
samples/listctrl/mondrian.ico
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 766 B

44
samples/listctrl/mondrian.xpm
View file

@ -1,44 +0,0 @@
/* XPM */
static const char *const mondrian_xpm[] = {
/* columns rows colors chars-per-pixel */
"32 32 6 1",
" c Black",
". c Blue",
"X c #00bf00",
"o c Red",
"O c Yellow",
"+ c Gray100",
/* pixels */
" ",
" oooooo +++++++++++++++++++++++ ",
" oooooo +++++++++++++++++++++++ ",
" oooooo +++++++++++++++++++++++ ",
" oooooo +++++++++++++++++++++++ ",
" oooooo +++++++++++++++++++++++ ",
" oooooo +++++++++++++++++++++++ ",
" oooooo +++++++++++++++++++++++ ",
" ",
" ++++++ ++++++++++++++++++ .... ",
" ++++++ ++++++++++++++++++ .... ",
" ++++++ ++++++++++++++++++ .... ",
" ++++++ ++++++++++++++++++ .... ",
" ++++++ ++++++++++++++++++ .... ",
" ++++++ ++++++++++++++++++ ",
" ++++++ ++++++++++++++++++ ++++ ",
" ++++++ ++++++++++++++++++ ++++ ",
" ++++++ ++++++++++++++++++ ++++ ",
" ++++++ ++++++++++++++++++ ++++ ",
" ++++++ ++++++++++++++++++ ++++ ",
" ++++++ ++++++++++++++++++ ++++ ",
" ++++++ ++++++++++++++++++ ++++ ",
" ++++++ ++++++++++++++++++ ++++ ",
" ++++++ ++++++++++++++++++ ++++ ",
" ++++++ ++++ ",
" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
" "
};