From b2c82287f667c24909de369b35b5145090d9821c Mon Sep 17 00:00:00 2001
From: =?utf8?q?W=C5=82odzimierz=20Skiba?= <abx@abx.art.pl>
Date: Tue, 25 Jul 2006 06:43:18 +0000
Subject: [PATCH] Final steps to move to common icon.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 samples/treectrl/Makefile.in  |   4 ++--
 samples/treectrl/makefile.bcc |   6 ++---
 samples/treectrl/makefile.gcc |   6 ++---
 samples/treectrl/makefile.vc  |   6 ++---
 samples/treectrl/mondrian.ico | Bin 766 -> 0 bytes
 samples/treectrl/mondrian.xpm |  44 ----------------------------------
 samples/treectrl/treectrl.dsp |   4 ++--
 samples/treectrl/treetest.cpp |  13 +++++-----
 8 files changed, 19 insertions(+), 64 deletions(-)
 delete mode 100644 samples/treectrl/mondrian.ico
 delete mode 100644 samples/treectrl/mondrian.xpm

diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in
index a116017705..5e5a4fbd03 100644
--- a/samples/treectrl/Makefile.in
+++ b/samples/treectrl/Makefile.in
@@ -101,7 +101,7 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \
 COND_MONOLITHIC_0___WXLIB_BASE_p = \
 	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-@COND_PLATFORM_WIN32_1@__treectrl___win32rc = treectrl_treetest_rc.o
+@COND_PLATFORM_WIN32_1@__treectrl___win32rc = treectrl_sample_rc.o
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
@@ -181,7 +181,7 @@ treectrl.app/Contents/PkgInfo: treectrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
 treectrl_treetest.o: $(srcdir)/treetest.cpp
 	$(CXXC) -c -o $@ $(TREECTRL_CXXFLAGS) $(srcdir)/treetest.cpp
 
-treectrl_treetest_rc.o: $(srcdir)/treetest.rc
+treectrl_sample_rc.o: $(srcdir)/../sample.rc
 	$(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
 
 
diff --git a/samples/treectrl/makefile.bcc b/samples/treectrl/makefile.bcc
index 3b3b3fb96c..6733a0b351 100644
--- a/samples/treectrl/makefile.bcc
+++ b/samples/treectrl/makefile.bcc
@@ -212,14 +212,14 @@ clean:
 	-if exist $(OBJS)\treectrl.ilf del $(OBJS)\treectrl.ilf
 	-if exist $(OBJS)\treectrl.ils del $(OBJS)\treectrl.ils
 
-$(OBJS)\treectrl.exe: $(TREECTRL_OBJECTS)  $(OBJS)\treectrl_treetest.res
+$(OBJS)\treectrl.exe: $(TREECTRL_OBJECTS)  $(OBJS)\treectrl_sample.res
 	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(TREECTRL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\treectrl_treetest.res
+	c0w32.obj $(TREECTRL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\treectrl_sample.res
 |
 
 $(OBJS)\treectrl_treetest.obj: .\treetest.cpp
 	$(CXX) -q -c -P -o$@ $(TREECTRL_CXXFLAGS) $**
 
-$(OBJS)\treectrl_treetest.res: .\treetest.rc
+$(OBJS)\treectrl_sample.res: .\..\sample.rc
 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH $**
 
diff --git a/samples/treectrl/makefile.gcc b/samples/treectrl/makefile.gcc
index 824f2c752e..e6868db218 100644
--- a/samples/treectrl/makefile.gcc
+++ b/samples/treectrl/makefile.gcc
@@ -28,7 +28,7 @@ TREECTRL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
 	$(CPPFLAGS) $(CXXFLAGS)
 TREECTRL_OBJECTS =  \
 	$(OBJS)\treectrl_treetest.o \
-	$(OBJS)\treectrl_treetest_rc.o
+	$(OBJS)\treectrl_sample_rc.o
 
 ### Conditionally set variables: ###
 
@@ -207,13 +207,13 @@ clean:
 	-if exist $(OBJS)\*.d del $(OBJS)\*.d
 	-if exist $(OBJS)\treectrl.exe del $(OBJS)\treectrl.exe
 
-$(OBJS)\treectrl.exe: $(TREECTRL_OBJECTS) $(OBJS)\treectrl_treetest_rc.o
+$(OBJS)\treectrl.exe: $(TREECTRL_OBJECTS) $(OBJS)\treectrl_sample_rc.o
 	$(CXX) -o $@ $(TREECTRL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
 
 $(OBJS)\treectrl_treetest.o: ./treetest.cpp
 	$(CXX) -c -o $@ $(TREECTRL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\treectrl_treetest_rc.o: ./treetest.rc
+$(OBJS)\treectrl_sample_rc.o: ./../sample.rc
 	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
 
 .PHONY: all clean
diff --git a/samples/treectrl/makefile.vc b/samples/treectrl/makefile.vc
index f6d2039c3b..117a19bc98 100644
--- a/samples/treectrl/makefile.vc
+++ b/samples/treectrl/makefile.vc
@@ -28,7 +28,7 @@ TREECTRL_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
 	$(CXXFLAGS)
 TREECTRL_OBJECTS =  \
 	$(OBJS)\treectrl_treetest.obj \
-	$(OBJS)\treectrl_treetest.res
+	$(OBJS)\treectrl_sample.res
 
 ### Conditionally set variables: ###
 
@@ -287,7 +287,7 @@ clean:
 	-if exist $(OBJS)\treectrl.ilk del $(OBJS)\treectrl.ilk
 	-if exist $(OBJS)\treectrl.pdb del $(OBJS)\treectrl.pdb
 
-$(OBJS)\treectrl.exe: $(TREECTRL_OBJECTS) $(OBJS)\treectrl_treetest.res
+$(OBJS)\treectrl.exe: $(TREECTRL_OBJECTS) $(OBJS)\treectrl_sample.res
 	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
 	$(TREECTRL_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
 <<
@@ -295,6 +295,6 @@ $(OBJS)\treectrl.exe: $(TREECTRL_OBJECTS) $(OBJS)\treectrl_treetest.res
 $(OBJS)\treectrl_treetest.obj: .\treetest.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TREECTRL_CXXFLAGS) $**
 
-$(OBJS)\treectrl_treetest.res: .\treetest.rc
+$(OBJS)\treectrl_sample.res: .\..\sample.rc
 	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH $**
 
diff --git a/samples/treectrl/mondrian.ico b/samples/treectrl/mondrian.ico
deleted file mode 100644
index 2310c5d275a87af295d5ea8dc79ea417a5e74c53..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 766
zcmZQzU<5)11px*Sc)`TLAO@s0fLH;D9e|jTfdxnc0Z<M**w4TKL=5})Lnt5#WHKB$
zaDbtqp#doIAB-6O{|B*v7zjZ^AOa2W|NsACHyAJ}De?dRKnp(HN~rljcR;{k;{zQE
i@;}UZ|9Q?Fpp*~yJCwmWbLIrN`9Qm9%}2L?p!oo$cZ4ed

diff --git a/samples/treectrl/mondrian.xpm b/samples/treectrl/mondrian.xpm
deleted file mode 100644
index 409f27a843..0000000000
--- a/samples/treectrl/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char *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 ++++ ",
-"                                "
-};
diff --git a/samples/treectrl/treectrl.dsp b/samples/treectrl/treectrl.dsp
index 64b355858f..2626514aa6 100644
--- a/samples/treectrl/treectrl.dsp
+++ b/samples/treectrl/treectrl.dsp
@@ -468,11 +468,11 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\treetest.cpp
+SOURCE=.\..\sample.rc
 # End Source File
 # Begin Source File
 
-SOURCE=.\treetest.rc
+SOURCE=.\treetest.cpp
 # End Source File
 # End Group
 # End Target
diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index 069506f86a..b090afb31b 100644
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -13,12 +13,12 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-  #include "wx/wx.h"
-  #include "wx/log.h"
+    #include "wx/wx.h"
+    #include "wx/log.h"
 #endif
 
 #include "wx/colordlg.h"
@@ -42,11 +42,10 @@
 #include "icon4.xpm"
 #include "icon5.xpm"
 
-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXPM__)
-#include "mondrian.xpm"
+#ifndef __WXMSW__
+    #include "../sample.xpm"
 #endif
 
-
 // verify that the item is ok and insult the user if it is not
 #define CHECK_ITEM( item ) if ( !item.IsOk() ) {                                 \
                              wxMessageBox(wxT("Please select some item first!"), \
@@ -179,7 +178,7 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h)
     SetBackgroundColour(wxColour(255, 255, 255));
 
     // Give it an icon
-    SetIcon(wxICON(mondrian));
+    SetIcon(wxICON(sample));
 
 #if wxUSE_MENUS
     // Make a menubar
-- 
2.45.2