Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

32
samples/controls/controls.cpp
View File

@@ -33,12 +33,7 @@
#endif // __WXMSW__
#endif // wxUSE_TOOLTIPS
#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
#define USE_XPM
#endif
#ifdef USE_XPM
#include "mondrian.xpm"
#ifndef __WXMSW__
#include "icons/choice.xpm"
#include "icons/combo.xpm"
#include "icons/list.xpm"
@@ -62,6 +57,10 @@
#define EVT_TOGGLEBUTTON EVT_CHECKBOX
#endif
#if !defined(__WXMSW__) && !defined(__WXPM__)
#include "../sample.xpm"
#endif
//----------------------------------------------------------------------
// class definitions
//----------------------------------------------------------------------
@@ -662,7 +661,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
wxT("examples.")
};
#ifdef USE_XPM
#ifndef __WXMSW__
// image ids
enum
{
@@ -691,7 +690,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
imagelist-> Add( wxBitmap( gauge_xpm ));
#endif // wxUSE_GAUGE
m_book->SetImageList(imagelist);
#elif defined(__WXMSW__)
#else
// load images from resources
enum
{
@@ -730,19 +729,6 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
}
m_book->SetImageList(imagelist);
#else
// No images for now
#define Image_List -1
#define Image_Choice -1
#define Image_Combo -1
#define Image_Text -1
#define Image_Radio -1
#if wxUSE_GAUGE
#define Image_Gauge -1
#endif // wxUSE_GAUGE
#define Image_Max -1
#endif
wxPanel *panel = new wxPanel(m_book);
@@ -1800,9 +1786,7 @@ MyFrame::MyFrame(const wxChar *title, int x, int y)
// The wxICON() macros loads an icon from a resource under Windows
// and uses an #included XPM image under GTK+ and Motif
#ifdef USE_XPM
SetIcon( wxICON(mondrian) );
#endif
SetIcon( wxICON(sample) );
wxMenu *file_menu = new wxMenu;