From ec312631c66171d06b0a2844d669e8e899e4a4b3 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 12 Mar 2002 12:22:02 +0000 Subject: [PATCH] Finally reverted treectrl name back to treetest after a long history of problems with the name clash. This cures a link problem with the sample compiled with wxX11. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/treectrl/makefile.b32 | 2 +- samples/treectrl/makefile.bcc | 2 +- samples/treectrl/makefile.dos | 2 +- samples/treectrl/makefile.g95 | 2 +- samples/treectrl/makefile.sc | 8 ++--- samples/treectrl/makefile.sl | 2 +- samples/treectrl/makefile.twn | 28 +++++++-------- samples/treectrl/makefile.unx | 2 +- samples/treectrl/makefile.vc | 2 +- samples/treectrl/makefile.wat | 2 +- .../treectrl/{treectrl.cpp => treetest.cpp} | 11 +++--- .../treectrl/{treectrl.def => treetest.def} | 4 +-- .../treectrl/{treectrl.dsp => treetest.dsp} | 36 +++++++++---------- samples/treectrl/{treectrl.h => treetest.h} | 0 .../treectrl/{treectrl.pro => treetest.pro} | 6 ++-- samples/treectrl/{treectrl.rc => treetest.rc} | 0 .../{treectrlM5.xml => treetestM5.xml} | 0 17 files changed, 53 insertions(+), 56 deletions(-) rename samples/treectrl/{treectrl.cpp => treetest.cpp} (98%) rename samples/treectrl/{treectrl.def => treetest.def} (70%) rename samples/treectrl/{treectrl.dsp => treetest.dsp} (89%) rename samples/treectrl/{treectrl.h => treetest.h} (100%) rename samples/treectrl/{treectrl.pro => treetest.pro} (87%) rename samples/treectrl/{treectrl.rc => treetest.rc} (100%) rename samples/treectrl/{treectrlM5.xml => treetestM5.xml} (100%) diff --git a/samples/treectrl/makefile.b32 b/samples/treectrl/makefile.b32 index a773d2eca4..6aa6c305a0 100644 --- a/samples/treectrl/makefile.b32 +++ b/samples/treectrl/makefile.b32 @@ -3,7 +3,7 @@ WXDIR = $(WXWIN) -TARGET=treectrl +TARGET=treetest OBJECTS = $(TARGET).obj !include $(WXDIR)\src\makeprog.b32 diff --git a/samples/treectrl/makefile.bcc b/samples/treectrl/makefile.bcc index 1b873327e7..8915d6f236 100644 --- a/samples/treectrl/makefile.bcc +++ b/samples/treectrl/makefile.bcc @@ -7,7 +7,7 @@ WXDIR = $(WXWIN) -TARGET=treectrl +TARGET=treetest OBJECTS=$(TARGET).obj !include $(WXDIR)\src\makeprog.bcc diff --git a/samples/treectrl/makefile.dos b/samples/treectrl/makefile.dos index 5522bfd2d0..50832fa2c7 100644 --- a/samples/treectrl/makefile.dos +++ b/samples/treectrl/makefile.dos @@ -3,7 +3,7 @@ WXDIR = $(WXWIN) -TARGET=treectrl +TARGET=treetest OBJECTS=$(TARGET).obj !include $(WXDIR)\src\makeprog.msc diff --git a/samples/treectrl/makefile.g95 b/samples/treectrl/makefile.g95 index dac77c45d0..6e4727c8a1 100644 --- a/samples/treectrl/makefile.g95 +++ b/samples/treectrl/makefile.g95 @@ -3,7 +3,7 @@ WXDIR = ../.. -TARGET=treectrl +TARGET=treetest OBJECTS = $(TARGET).o include $(WXDIR)/src/makeprog.g95 diff --git a/samples/treectrl/makefile.sc b/samples/treectrl/makefile.sc index d45d3f8036..058a4bb27b 100644 --- a/samples/treectrl/makefile.sc +++ b/samples/treectrl/makefile.sc @@ -1,17 +1,17 @@ -# Purpose: makefile for treectrl example (Symantec C++) +# Purpose: makefile for treetest example (Symantec C++) # Created: 2000-03-15 WXDIR = $(WXWIN) WXLIB = $(WXDIR)\lib\wx.lib INCDIR = $(WXDIR)\include INCLUDE=$(INCDIR) -TARGET=treectrl +TARGET=treetest include $(WXDIR)\src\makesc.env -treectrl.exe: treectrl.obj $(DEFFILE) treectrl.res +treetest.exe: treetest.obj $(DEFFILE) treetest.res *$(CC) $(LDFLAGS) -o$@ $** $(LIBS) - *$(RC) -k treectrl.res + *$(RC) -k treetest.res sc32.def: echo EXETYPE NT > sc32.def diff --git a/samples/treectrl/makefile.sl b/samples/treectrl/makefile.sl index 6dc21d5a1c..6a091501c0 100644 --- a/samples/treectrl/makefile.sl +++ b/samples/treectrl/makefile.sl @@ -1,7 +1,7 @@ # Purpose: makefile for treectrl example (Salford C++) # Created: 2000-03-15 -PROGRAM = treectrl +PROGRAM = treetest OBJECTS = $(PROGRAM).obj include ..\..\src\makeprog.sl diff --git a/samples/treectrl/makefile.twn b/samples/treectrl/makefile.twn index 32e0d50e45..d9a85c47ab 100644 --- a/samples/treectrl/makefile.twn +++ b/samples/treectrl/makefile.twn @@ -1,4 +1,4 @@ -# Purpose: makefile for treectrl example (TWIN) +# Purpose: makefile for treetest example (TWIN) # Created: 2000-03-15 WXDIR = ../.. @@ -7,29 +7,29 @@ WXDIR = ../.. # this central makefile. include $(WXDIR)/src/maketwin.env -OBJECTS = $(OBJDIR)/treectrl.$(OBJSUFF) $(OBJDIR)/treectrl.$(OBJSUFF) +OBJECTS = $(OBJDIR)/treetest.$(OBJSUFF) $(OBJDIR)/treetest.$(OBJSUFF) -all: $(OBJDIR) treectrl$(GUISUFFIX)$(EXESUFF) +all: $(OBJDIR) treetest$(GUISUFFIX)$(EXESUFF) wx: $(OBJDIR): mkdir $(OBJDIR) -treectrl$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o treectrl$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) +treetest$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) + $(CC) $(LDFLAGS) -o treetest$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) -$(OBJDIR)/treectrl.$(OBJSUFF): treectrl.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ treectrl.$(SRCSUFF) +$(OBJDIR)/treetest.$(OBJSUFF): treetest.$(SRCSUFF) + $(CC) -c $(CPPFLAGS) -o $@ treetest.$(SRCSUFF) -treectrl.c: treectrl.rc - $(RESCOMP) $(RCINPUTSWITCH) treectrl.rc $(RCOUTPUTSWITCH) treectrl.c $(RESFLAGS) +treetest.c: treetest.rc + $(RESCOMP) $(RCINPUTSWITCH) treetest.rc $(RCOUTPUTSWITCH) treetest.c $(RESFLAGS) -$(OBJDIR)/treectrl.$(OBJSUFF): treectrl.c - $(CC) -c $(CPPFLAGS) -o $@ treectrl.c +$(OBJDIR)/treetest.$(OBJSUFF): treetest.c + $(CC) -c $(CPPFLAGS) -o $@ treetest.c -#$(OBJDIR)/treectrl.o: treectrl.rc -# $(RESCOMP) $(RCINPUTSWITCH) treectrl.rc $(RCOUTPUTSWITCH) $(OBJDIR)/treectrl.o $(RESFLAGS) +#$(OBJDIR)/treetest.o: treetest.rc +# $(RESCOMP) $(RCINPUTSWITCH) treetest.rc $(RCOUTPUTSWITCH) $(OBJDIR)/treetest.o $(RESFLAGS) clean: - rm -f $(OBJECTS) treectrl$(GUISUFFIX).exe core *.rsc *.res + rm -f $(OBJECTS) treetest$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/treectrl/makefile.unx b/samples/treectrl/makefile.unx index cabc284bef..5c422e1c8f 100644 --- a/samples/treectrl/makefile.unx +++ b/samples/treectrl/makefile.unx @@ -3,7 +3,7 @@ CXX = $(shell wx-config --cxx) -PROGRAM = treectrl +PROGRAM = treetest OBJECTS = $(PROGRAM).o diff --git a/samples/treectrl/makefile.vc b/samples/treectrl/makefile.vc index 9617fc4025..eb915fcca1 100644 --- a/samples/treectrl/makefile.vc +++ b/samples/treectrl/makefile.vc @@ -4,7 +4,7 @@ # Set WXDIR for your system WXDIR = $(WXWIN) -PROGRAM=treectrl +PROGRAM=treetest OBJECTS = $(PROGRAM).obj !include $(WXDIR)\src\makeprog.vc diff --git a/samples/treectrl/makefile.wat b/samples/treectrl/makefile.wat index 4c4dc94463..5125f13c6b 100644 --- a/samples/treectrl/makefile.wat +++ b/samples/treectrl/makefile.wat @@ -3,7 +3,7 @@ WXDIR = $(%WXWIN) -PROGRAM = treectrl +PROGRAM = treetest OBJECTS = $(PROGRAM).obj !include $(WXDIR)\src\makeprog.wat diff --git a/samples/treectrl/treectrl.cpp b/samples/treectrl/treetest.cpp similarity index 98% rename from samples/treectrl/treectrl.cpp rename to samples/treectrl/treetest.cpp index fd8e25c69d..b6474eaea3 100644 --- a/samples/treectrl/treectrl.cpp +++ b/samples/treectrl/treetest.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: treectrl.cpp +// Name: treetest.cpp // Purpose: wxTreeCtrl sample // Author: Julian Smart // Modified by: @@ -9,12 +9,9 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -// important: the #pragma argument must be different from treectrl.cpp, -// otherwise gcc gets confused (as there is also treectrl.cpp in the library -// which has identical #pragma) and the sample crashes on startup! #ifdef __GNUG__ - #pragma interface "treetest.cpp" - #pragma implementation "treetest.cpp" + #pragma implementation + #pragma interface #endif // For compilers that support precompilation, includes "wx/wx.h". @@ -42,7 +39,7 @@ #define NO_VARIABLE_HEIGHT #endif -#include "treectrl.h" +#include "treetest.h" // under Windows the icons are in the .rc file #ifndef __WXMSW__ diff --git a/samples/treectrl/treectrl.def b/samples/treectrl/treetest.def similarity index 70% rename from samples/treectrl/treectrl.def rename to samples/treectrl/treetest.def index 714586eb59..b14815bcf2 100644 --- a/samples/treectrl/treectrl.def +++ b/samples/treectrl/treetest.def @@ -1,5 +1,5 @@ -NAME TreeCtrl -DESCRIPTION 'TreeCtrl wxWindows application' +NAME TreeTest +DESCRIPTION 'TreeTest wxWindows application' EXETYPE WINDOWS STUB 'WINSTUB.EXE' CODE PRELOAD MOVEABLE DISCARDABLE diff --git a/samples/treectrl/treectrl.dsp b/samples/treectrl/treetest.dsp similarity index 89% rename from samples/treectrl/treectrl.dsp rename to samples/treectrl/treetest.dsp index 869e0e6e56..7d2fdbca7c 100644 --- a/samples/treectrl/treectrl.dsp +++ b/samples/treectrl/treetest.dsp @@ -1,26 +1,26 @@ -# Microsoft Developer Studio Project File - Name="treectrl" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="treetest" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Application" 0x0101 -CFG=treectrl - Win32 Debug +CFG=treetest - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE -!MESSAGE NMAKE /f "treectrl.mak". +!MESSAGE NMAKE /f "treetest.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "treectrl.mak" CFG="treectrl - Win32 Debug" +!MESSAGE NMAKE /f "treetest.mak" CFG="treetest - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "treectrl - Win32 Release DLL" (based on "Win32 (x86) Application") -!MESSAGE "treectrl - Win32 Debug DLL" (based on "Win32 (x86) Application") -!MESSAGE "treectrl - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "treectrl - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE "treetest - Win32 Release DLL" (based on "Win32 (x86) Application") +!MESSAGE "treetest - Win32 Debug DLL" (based on "Win32 (x86) Application") +!MESSAGE "treetest - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "treetest - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE # Begin Project @@ -30,7 +30,7 @@ CPP=cl.exe MTL=midl.exe RSC=rc.exe -!ELSEIF "$(CFG)" == "treectrl - Win32 Release DLL" +!ELSEIF "$(CFG)" == "treetest - Win32 Release DLL" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -56,7 +56,7 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.lib -!ELSEIF "$(CFG)" == "treectrl - Win32 Debug DLL" +!ELSEIF "$(CFG)" == "treetest - Win32 Debug DLL" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -82,7 +82,7 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.lib -!ELSEIF "$(CFG)" == "treectrl - Win32 Release" +!ELSEIF "$(CFG)" == "treetest - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -108,7 +108,7 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ..\..\lib\zlib.lib ..\..\lib\regex.lib ..\..\lib\png.lib ..\..\lib\jpeg.lib ..\..\lib\tiff.lib ..\..\lib\wxmsw.lib -!ELSEIF "$(CFG)" == "treectrl - Win32 Debug" +!ELSEIF "$(CFG)" == "treetest - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -138,17 +138,17 @@ LINK32=link.exe # Begin Target -# Name "treectrl - Win32 Release DLL" -# Name "treectrl - Win32 Debug DLL" -# Name "treectrl - Win32 Release" -# Name "treectrl - Win32 Debug" +# Name "treetest - Win32 Release DLL" +# Name "treetest - Win32 Debug DLL" +# Name "treetest - Win32 Release" +# Name "treetest - Win32 Debug" # Begin Source File -SOURCE=.\treectrl.cpp +SOURCE=.\treetest.cpp # End Source File # Begin Source File -SOURCE=.\treectrl.rc +SOURCE=.\treetest.rc # End Source File # End Target # End Project diff --git a/samples/treectrl/treectrl.h b/samples/treectrl/treetest.h similarity index 100% rename from samples/treectrl/treectrl.h rename to samples/treectrl/treetest.h diff --git a/samples/treectrl/treectrl.pro b/samples/treectrl/treetest.pro similarity index 87% rename from samples/treectrl/treectrl.pro rename to samples/treectrl/treetest.pro index 4a19d3ab3c..fd2a512d48 100644 --- a/samples/treectrl/treectrl.pro +++ b/samples/treectrl/treetest.pro @@ -12,6 +12,6 @@ CONFIG = wx #WXCONFIGS = Debug Release DebugDll ReleaseDll # project files -SOURCES = treectrl.cpp -RC_FILE = treectrl.rc -TARGET = treectrl +SOURCES = treetest.cpp +RC_FILE = treetest.rc +TARGET = treetest diff --git a/samples/treectrl/treectrl.rc b/samples/treectrl/treetest.rc similarity index 100% rename from samples/treectrl/treectrl.rc rename to samples/treectrl/treetest.rc diff --git a/samples/treectrl/treectrlM5.xml b/samples/treectrl/treetestM5.xml similarity index 100% rename from samples/treectrl/treectrlM5.xml rename to samples/treectrl/treetestM5.xml -- 2.45.2