AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Finally reverted treectrl name back to treetest after a long

Browse Source 
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
This commit is contained in:
Julian Smart 2002-03-12 12:22:02 +00:00
parent 59db9cfaa7
commit ec312631c6
17 changed files with 53 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/treectrl/makefile.b32
View File

@ -3,7 +3,7 @@
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
TARGET=treectrl TARGET=treetest
OBJECTS = $(TARGET).obj OBJECTS = $(TARGET).obj
!include $(WXDIR)\src\makeprog.b32 !include $(WXDIR)\src\makeprog.b32

2
samples/treectrl/makefile.bcc
View File

@ -7,7 +7,7 @@
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
TARGET=treectrl TARGET=treetest
OBJECTS=$(TARGET).obj OBJECTS=$(TARGET).obj
!include $(WXDIR)\src\makeprog.bcc !include $(WXDIR)\src\makeprog.bcc

2
samples/treectrl/makefile.dos
View File

@ -3,7 +3,7 @@
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
TARGET=treectrl TARGET=treetest
OBJECTS=$(TARGET).obj OBJECTS=$(TARGET).obj
!include $(WXDIR)\src\makeprog.msc !include $(WXDIR)\src\makeprog.msc

2
samples/treectrl/makefile.g95
View File

@ -3,7 +3,7 @@
WXDIR = ../.. WXDIR = ../..
TARGET=treectrl TARGET=treetest
OBJECTS = $(TARGET).o OBJECTS = $(TARGET).o
include $(WXDIR)/src/makeprog.g95 include $(WXDIR)/src/makeprog.g95

8
samples/treectrl/makefile.sc
View File

@ -1,17 +1,17 @@
# Purpose: makefile for treectrl example (Symantec C++) # Purpose: makefile for treetest example (Symantec C++)
# Created: 2000-03-15 # Created: 2000-03-15
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
WXLIB = $(WXDIR)\lib\wx.lib WXLIB = $(WXDIR)\lib\wx.lib
INCDIR = $(WXDIR)\include INCDIR = $(WXDIR)\include
INCLUDE=$(INCDIR) INCLUDE=$(INCDIR)
TARGET=treectrl TARGET=treetest
include $(WXDIR)\src\makesc.env include $(WXDIR)\src\makesc.env
treectrl.exe: treectrl.obj $(DEFFILE) treectrl.res treetest.exe: treetest.obj $(DEFFILE) treetest.res
*$(CC) $(LDFLAGS) -o$@ $** $(LIBS) *$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
*$(RC) -k treectrl.res *$(RC) -k treetest.res
sc32.def: sc32.def:
echo EXETYPE NT > sc32.def echo EXETYPE NT > sc32.def

2
samples/treectrl/makefile.sl
View File

@ -1,7 +1,7 @@
# Purpose: makefile for treectrl example (Salford C++) # Purpose: makefile for treectrl example (Salford C++)
# Created: 2000-03-15 # Created: 2000-03-15
PROGRAM = treectrl PROGRAM = treetest
OBJECTS = $(PROGRAM).obj OBJECTS = $(PROGRAM).obj
include ..\..\src\makeprog.sl include ..\..\src\makeprog.sl

28
samples/treectrl/makefile.twn
View File

@ -1,4 +1,4 @@
# Purpose: makefile for treectrl example (TWIN) # Purpose: makefile for treetest example (TWIN)
# Created: 2000-03-15 # Created: 2000-03-15
WXDIR = ../.. WXDIR = ../..
@ -7,29 +7,29 @@ WXDIR = ../..
# this central makefile. # this central makefile.
include $(WXDIR)/src/maketwin.env 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: wx:
$(OBJDIR): $(OBJDIR):
mkdir $(OBJDIR) mkdir $(OBJDIR)
treectrl$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) treetest$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB)
$(CC) $(LDFLAGS) -o treectrl$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) $(CC) $(LDFLAGS) -o treetest$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS)
$(OBJDIR)/treectrl.$(OBJSUFF): treectrl.$(SRCSUFF) $(OBJDIR)/treetest.$(OBJSUFF): treetest.$(SRCSUFF)
$(CC) -c $(CPPFLAGS) -o $@ treectrl.$(SRCSUFF) $(CC) -c $(CPPFLAGS) -o $@ treetest.$(SRCSUFF)
treectrl.c: treectrl.rc treetest.c: treetest.rc
$(RESCOMP) $(RCINPUTSWITCH) treectrl.rc $(RCOUTPUTSWITCH) treectrl.c $(RESFLAGS) $(RESCOMP) $(RCINPUTSWITCH) treetest.rc $(RCOUTPUTSWITCH) treetest.c $(RESFLAGS)
$(OBJDIR)/treectrl.$(OBJSUFF): treectrl.c $(OBJDIR)/treetest.$(OBJSUFF): treetest.c
$(CC) -c $(CPPFLAGS) -o $@ treectrl.c $(CC) -c $(CPPFLAGS) -o $@ treetest.c
#$(OBJDIR)/treectrl.o: treectrl.rc #$(OBJDIR)/treetest.o: treetest.rc
# $(RESCOMP) $(RCINPUTSWITCH) treectrl.rc $(RCOUTPUTSWITCH) $(OBJDIR)/treectrl.o $(RESFLAGS) # $(RESCOMP) $(RCINPUTSWITCH) treetest.rc $(RCOUTPUTSWITCH) $(OBJDIR)/treetest.o $(RESFLAGS)
clean: clean:
rm -f $(OBJECTS) treectrl$(GUISUFFIX).exe core *.rsc *.res rm -f $(OBJECTS) treetest$(GUISUFFIX).exe core *.rsc *.res

2
samples/treectrl/makefile.unx
View File

@ -3,7 +3,7 @@
CXX = $(shell wx-config --cxx) CXX = $(shell wx-config --cxx)
PROGRAM = treectrl PROGRAM = treetest
OBJECTS = $(PROGRAM).o OBJECTS = $(PROGRAM).o

2
samples/treectrl/makefile.vc
View File

@ -4,7 +4,7 @@
# Set WXDIR for your system # Set WXDIR for your system
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
PROGRAM=treectrl PROGRAM=treetest
OBJECTS = $(PROGRAM).obj OBJECTS = $(PROGRAM).obj
!include $(WXDIR)\src\makeprog.vc !include $(WXDIR)\src\makeprog.vc

2
samples/treectrl/makefile.wat
View File

@ -3,7 +3,7 @@
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
PROGRAM = treectrl PROGRAM = treetest
OBJECTS = $(PROGRAM).obj OBJECTS = $(PROGRAM).obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

11
samples/treectrl/treectrl.cpp → samples/treectrl/treetest.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: treectrl.cpp // Name: treetest.cpp
// Purpose: wxTreeCtrl sample // Purpose: wxTreeCtrl sample
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
@ -9,12 +9,9 @@
// Licence: wxWindows license // 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__ #ifdef __GNUG__
#pragma interface "treetest.cpp" #pragma implementation
#pragma implementation "treetest.cpp" #pragma interface
#endif #endif
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes "wx/wx.h".
@ -42,7 +39,7 @@
#define NO_VARIABLE_HEIGHT #define NO_VARIABLE_HEIGHT
#endif #endif
#include "treectrl.h" #include "treetest.h"
// under Windows the icons are in the .rc file // under Windows the icons are in the .rc file
#ifndef __WXMSW__ #ifndef __WXMSW__

4
samples/treectrl/treectrl.def → samples/treectrl/treetest.def
View File

@ -1,5 +1,5 @@
NAME TreeCtrl NAME TreeTest
DESCRIPTION 'TreeCtrl wxWindows application' DESCRIPTION 'TreeTest wxWindows application'
EXETYPE WINDOWS EXETYPE WINDOWS
STUB 'WINSTUB.EXE' STUB 'WINSTUB.EXE'
CODE PRELOAD MOVEABLE DISCARDABLE CODE PRELOAD MOVEABLE DISCARDABLE

36
samples/treectrl/treectrl.dsp → samples/treectrl/treetest.dsp
View File

@ -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 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101 # 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 This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run !MESSAGE use the Export Makefile command and run
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "treectrl.mak". !MESSAGE NMAKE /f "treetest.mak".
!MESSAGE !MESSAGE
!MESSAGE You can specify a configuration when running NMAKE !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "treectrl.mak" CFG="treectrl - Win32 Debug" !MESSAGE NMAKE /f "treetest.mak" CFG="treetest - Win32 Debug"
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
!MESSAGE "treectrl - Win32 Release DLL" (based on "Win32 (x86) Application") !MESSAGE "treetest - Win32 Release DLL" (based on "Win32 (x86) Application")
!MESSAGE "treectrl - Win32 Debug DLL" (based on "Win32 (x86) Application") !MESSAGE "treetest - Win32 Debug DLL" (based on "Win32 (x86) Application")
!MESSAGE "treectrl - Win32 Release" (based on "Win32 (x86) Application") !MESSAGE "treetest - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "treectrl - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE "treetest - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE !MESSAGE
# Begin Project # Begin Project
@ -30,7 +30,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!ELSEIF "$(CFG)" == "treectrl - Win32 Release DLL" !ELSEIF "$(CFG)" == "treetest - Win32 Release DLL"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 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 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 # 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_MFC 0
# PROP BASE Use_Debug_Libraries 1 # 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 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 # 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_MFC 0
# PROP BASE Use_Debug_Libraries 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 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 # 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_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
@ -138,17 +138,17 @@ LINK32=link.exe
# Begin Target # Begin Target
# Name "treectrl - Win32 Release DLL" # Name "treetest - Win32 Release DLL"
# Name "treectrl - Win32 Debug DLL" # Name "treetest - Win32 Debug DLL"
# Name "treectrl - Win32 Release" # Name "treetest - Win32 Release"
# Name "treectrl - Win32 Debug" # Name "treetest - Win32 Debug"
# Begin Source File # Begin Source File
SOURCE=.\treectrl.cpp SOURCE=.\treetest.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\treectrl.rc SOURCE=.\treetest.rc
# End Source File # End Source File
# End Target # End Target
# End Project # End Project

0
samples/treectrl/treectrl.h → samples/treectrl/treetest.h
View File

6
samples/treectrl/treectrl.pro → samples/treectrl/treetest.pro
View File

@ -12,6 +12,6 @@ CONFIG = wx
#WXCONFIGS = Debug Release DebugDll ReleaseDll #WXCONFIGS = Debug Release DebugDll ReleaseDll
# project files # project files
SOURCES = treectrl.cpp SOURCES = treetest.cpp
RC_FILE = treectrl.rc RC_FILE = treetest.rc
TARGET = treectrl TARGET = treetest

0
samples/treectrl/treectrl.rc → samples/treectrl/treetest.rc
View File

0
samples/treectrl/treectrlM5.xml → samples/treectrl/treetestM5.xml
View File