Remove unnecessary mondrian.{ico,xpm} files from samples directory.
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:
@@ -33,7 +33,7 @@ include the XPM inline as below, since it's C code, or you can load it at
|
||||
run-time.
|
||||
|
||||
@code
|
||||
#include "mondrian.xpm"
|
||||
#include "sample.xpm"
|
||||
@endcode
|
||||
|
||||
Sometimes you wish to use a .ico resource on Windows, and XPMs on other
|
||||
@@ -44,16 +44,16 @@ A macro, wxICON(), is available which creates an icon using an XPM on the
|
||||
appropriate platform, or an icon resource on Windows:
|
||||
|
||||
@code
|
||||
wxIcon icon(wxICON(mondrian));
|
||||
wxIcon icon(wxICON(sample));
|
||||
|
||||
// The above line is equivalent to this:
|
||||
|
||||
#if defined(__WXGTK__) || defined(__WXMOTIF__)
|
||||
wxIcon icon(mondrian_xpm);
|
||||
wxIcon icon(sample_xpm);
|
||||
#endif
|
||||
|
||||
#if defined(__WXMSW__)
|
||||
wxIcon icon("mondrian");
|
||||
wxIcon icon("sample");
|
||||
#endif
|
||||
@endcode
|
||||
|
||||
|
@@ -427,13 +427,13 @@ g++ myfoo.cpp `wx-config --cxxflags --libs` -o myfoo
|
||||
Using this way, a make file for the minimal sample would look
|
||||
like this
|
||||
|
||||
CC = gcc
|
||||
CXX = g++
|
||||
|
||||
minimal: minimal.o
|
||||
$(CC) -o minimal minimal.o `wx-config --libs`
|
||||
$(CXX) -o minimal minimal.o `wx-config --libs`
|
||||
|
||||
minimal.o: minimal.cpp mondrian.xpm
|
||||
$(CC) `wx-config --cxxflags` -c minimal.cpp -o minimal.o
|
||||
minimal.o: minimal.cpp
|
||||
$(CXX) `wx-config --cxxflags` -c minimal.cpp -o minimal.o
|
||||
|
||||
clean:
|
||||
rm -f *.o minimal
|
||||
|
@@ -99,10 +99,10 @@ will output necessary C++ compiler flags and wx-config --libs will list all
|
||||
needed libraries. See an example of wxWidgets application makefile:
|
||||
|
||||
minimal: minimal.o
|
||||
$(CC) -o minimal minimal.o `wx-config --libs`
|
||||
$(CXX) -o minimal minimal.o `wx-config --libs`
|
||||
|
||||
minimal.o: minimal.cpp mondrian.xpm
|
||||
$(CC) `wx-config --cxxflags` -c minimal.cpp -o minimal.o
|
||||
minimal.o: minimal.cpp
|
||||
$(CXX) `wx-config --cxxflags` -c minimal.cpp -o minimal.o
|
||||
|
||||
|
||||
* Using configure to build MS-DOS version
|
||||
|
@@ -455,15 +455,12 @@ CXX = g++
|
||||
minimal: minimal.o
|
||||
$(CXX) -o minimal minimal.o `wx-config --libs`
|
||||
|
||||
minimal.o: minimal.cpp mondrian.xpm
|
||||
minimal.o: minimal.cpp
|
||||
$(CXX) `wx-config --cxxflags` -c minimal.cpp -o minimal.o
|
||||
|
||||
clean:
|
||||
rm -f *.o minimal
|
||||
|
||||
This is certain to become the standard way unless we decide
|
||||
to stick to tmake.
|
||||
|
||||
If your application uses only some of wxWidgets libraries, you can
|
||||
specify required libraries when running wx-config. For example,
|
||||
`wx-config --libs=html,core` will only output link command to link
|
||||
|
@@ -308,13 +308,13 @@ g++ myfoo.cpp `wx-config --libs` `wx-config --cflags` -o myfoo
|
||||
Using this way, a make file for the minimal sample would look
|
||||
like this
|
||||
|
||||
CC = g++
|
||||
CXX = g++
|
||||
|
||||
minimal: minimal.o
|
||||
$(CC) -o minimal minimal.o `wx-config --libs`
|
||||
$(CXX) -o minimal minimal.o `wx-config --libs`
|
||||
|
||||
minimal.o: minimal.cpp mondrian.xpm
|
||||
$(CC) `wx-config --cflags` -c minimal.cpp -o minimal.o
|
||||
minimal.o: minimal.cpp
|
||||
$(CXX) `wx-config --cflags` -c minimal.cpp -o minimal.o
|
||||
|
||||
clean:
|
||||
rm -f *.o minimal
|
||||
|
@@ -437,7 +437,7 @@ CXX = g++
|
||||
minimal: minimal.o
|
||||
$(CXX) -o minimal minimal.o `wx-config --libs`
|
||||
|
||||
minimal.o: minimal.cpp mondrian.xpm
|
||||
minimal.o: minimal.cpp
|
||||
$(CXX) `wx-config --cxxflags` -c minimal.cpp -o minimal.o
|
||||
|
||||
clean:
|
||||
|
Reference in New Issue
Block a user