From 11e2dfd37dcac4e8c155807de8e1ba222c3e83fb Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Tue, 14 Mar 2000 19:47:10 +0000 Subject: [PATCH] renamed dragimag sample git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/dragimag/Makefile.in | 16 ++------- samples/dragimag/{test.cpp => dragimag.cpp} | 12 +++---- samples/dragimag/{test.def => dragimag.def} | 4 +-- samples/dragimag/{test.h => dragimag.h} | 2 +- samples/dragimag/{test.rc => dragimag.rc} | 0 samples/dragimag/makefile.b32 | 12 ++----- samples/dragimag/makefile.bcc | 11 ++---- samples/dragimag/makefile.dos | 13 ++----- samples/dragimag/makefile.g95 | 14 +++----- samples/dragimag/makefile.sc | 9 ++--- samples/dragimag/makefile.sl | 12 +++---- samples/dragimag/makefile.twn | 38 ++++++++------------- samples/dragimag/makefile.unx | 20 +++-------- samples/dragimag/makefile.va | 2 +- samples/dragimag/makefile.vc | 13 ++----- samples/dragimag/makefile.wat | 10 ++---- 16 files changed, 60 insertions(+), 128 deletions(-) rename samples/dragimag/{test.cpp => dragimag.cpp} (98%) rename samples/dragimag/{test.def => dragimag.def} (67%) rename samples/dragimag/{test.h => dragimag.h} (99%) rename samples/dragimag/{test.rc => dragimag.rc} (100%) diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in index 4396949711..1e8c6416bf 100644 --- a/samples/dragimag/Makefile.in +++ b/samples/dragimag/Makefile.in @@ -1,21 +1,11 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for dragimag example (UNIX). +# Purpose: makefile for dragimag example (UNIX). +# Created: 2000-03-15 top_srcdir = @top_srcdir@/.. top_builddir = ../.. program_dir = samples/dragimag -PROGRAM=test - -DATAFILES = backgrnd.png shape01.png shape02.png shape03.png +PROGRAM=dragimag OBJECTS=$(PROGRAM).o diff --git a/samples/dragimag/test.cpp b/samples/dragimag/dragimag.cpp similarity index 98% rename from samples/dragimag/test.cpp rename to samples/dragimag/dragimag.cpp index 08acf09f1d..2ef5db853c 100644 --- a/samples/dragimag/test.cpp +++ b/samples/dragimag/dragimag.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: test.cpp +// Name: dragimag.cpp // Purpose: wxDragImage sample // Author: Julian Smart // Modified by: @@ -17,10 +17,10 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif -#include +#include "wx/image.h" // Under Windows, change this to 1 // to use wxGenericDragImage @@ -28,13 +28,13 @@ #define wxUSE_GENERIC_DRAGIMAGE 0 #if wxUSE_GENERIC_DRAGIMAGE -#include +#include "wx/generic/dragimgg.h" #define wxDragImage wxGenericDragImage #else -#include +#include "wx/dragimag.h" #endif -#include "test.h" +#include "dragimag.h" #if defined(__WXGTK__) || defined(__WXMOTIF__) #include "mondrian.xpm" diff --git a/samples/dragimag/test.def b/samples/dragimag/dragimag.def similarity index 67% rename from samples/dragimag/test.def rename to samples/dragimag/dragimag.def index 59f0db711d..6a2bb3d0b8 100644 --- a/samples/dragimag/test.def +++ b/samples/dragimag/dragimag.def @@ -1,5 +1,5 @@ -NAME Minimal -DESCRIPTION 'Minimal wxWindows application' +NAME Dragimag +DESCRIPTION 'wxWindows dragimag sample' EXETYPE WINDOWS CODE PRELOAD MOVEABLE DISCARDABLE DATA PRELOAD MOVEABLE MULTIPLE diff --git a/samples/dragimag/test.h b/samples/dragimag/dragimag.h similarity index 99% rename from samples/dragimag/test.h rename to samples/dragimag/dragimag.h index 6d94bf49bf..bba436184e 100644 --- a/samples/dragimag/test.h +++ b/samples/dragimag/dragimag.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: test.h +// Name: dragimag.h // Purpose: wxDragImage sample // Author: Julian Smart // Modified by: diff --git a/samples/dragimag/test.rc b/samples/dragimag/dragimag.rc similarity index 100% rename from samples/dragimag/test.rc rename to samples/dragimag/dragimag.rc diff --git a/samples/dragimag/makefile.b32 b/samples/dragimag/makefile.b32 index 95ddc80d76..071c350074 100644 --- a/samples/dragimag/makefile.b32 +++ b/samples/dragimag/makefile.b32 @@ -1,15 +1,9 @@ -# -# File: makefile.b32 -# Author: Julian Smart -# Created: 1999 -# Updated: -# Copyright: -# -# Makefile : Builds sample for 32-bit BC++ +# Purpose: makefile for dragimag example (BC++ 32bit) +# Created: 2000-03-15 WXDIR = $(WXWIN) -TARGET=test +TARGET=dragimag OBJECTS = $(TARGET).obj !include $(WXDIR)\src\makeprog.b32 diff --git a/samples/dragimag/makefile.bcc b/samples/dragimag/makefile.bcc index 669f01905a..69a8b50dce 100644 --- a/samples/dragimag/makefile.bcc +++ b/samples/dragimag/makefile.bcc @@ -1,10 +1,5 @@ -# -# File: makefile.bcc -# Author: Julian Smart -# Created: 1998 -# Updated: -# -# Builds a BC++ 16-bit sample +# Purpose: makefile for dragimag example (BC++ 16bit) +# Created: 2000-03-15 !if "$(WXWIN)" == "" !error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx @@ -12,7 +7,7 @@ WXDIR = $(WXWIN) -TARGET=test +TARGET=dragimag OBJECTS=$(TARGET).obj !include $(WXDIR)\src\makeprog.bcc diff --git a/samples/dragimag/makefile.dos b/samples/dragimag/makefile.dos index 983ef2da8b..271446849e 100644 --- a/samples/dragimag/makefile.dos +++ b/samples/dragimag/makefile.dos @@ -1,16 +1,9 @@ -# -# File: makefile.dos -# Author: Julian Smart -# Created: 1998 -# Updated: -# -# Makefile : Builds 16-bit sample, VC++ 1.5 -# Use FINAL=1 argument to nmake to build final version with no debugging -# info +# Purpose: makefile for dragimag example (VC++ 1.5x) +# Created: 2000-03-15 WXDIR = $(WXWIN) -TARGET=test +TARGET=dragimag OBJECTS=$(TARGET).obj !include $(WXDIR)\src\makeprog.msc diff --git a/samples/dragimag/makefile.g95 b/samples/dragimag/makefile.g95 index b4a920f047..dd6a09ce52 100644 --- a/samples/dragimag/makefile.g95 +++ b/samples/dragimag/makefile.g95 @@ -1,16 +1,10 @@ -# -# File: makefile.g95 -# Author: Julian Smart -# Created: 1999 -# Updated: -# Copyright: (c) Julian Smart, 1999 -# -# Makefile for wxWindows sample (Cygwin/Mingw32). +# Purpose: makefile for dragimag example (Cygwin/Mingw32) +# Created: #03.01.00 WXDIR = ../.. -TARGET=test +TARGET=dragimag OBJECTS = $(TARGET).o -include $(WXDIR)/src/makeprog.g95 +include $(WXDIR)\src\makeprog.g95 diff --git a/samples/dragimag/makefile.sc b/samples/dragimag/makefile.sc index 9f70cf6b36..7a02278dc4 100644 --- a/samples/dragimag/makefile.sc +++ b/samples/dragimag/makefile.sc @@ -1,16 +1,17 @@ -# Symantec C++ makefile +# Purpose: makefile for dragimag example (Symantec C++) +# Created: 2000-03-15 WXDIR = $(WXWIN) WXLIB = $(WXDIR)\lib\wx.lib INCDIR = $(WXDIR)\include INCLUDE=$(INCDIR) -TARGET=test +TARGET=dragimag include $(WXDIR)\src\makesc.env -test.exe: test.obj $(DEFFILE) test.res +dragimag.exe: dragimag.obj $(DEFFILE) dragimag.res *$(CC) $(LDFLAGS) -o$@ $** $(LIBS) - *$(RC) -k test.res + *$(RC) -k dragimag.res sc32.def: echo EXETYPE NT > sc32.def diff --git a/samples/dragimag/makefile.sl b/samples/dragimag/makefile.sl index c604d39654..45beba2c35 100644 --- a/samples/dragimag/makefile.sl +++ b/samples/dragimag/makefile.sl @@ -1,11 +1,7 @@ -# -# File: makefile.sl -# Author: Julian Smart -# Created: 1998 -# -# Makefile : Builds a wxWindows sample for Salford C++, WIN32 +# Purpose: makefile for dragimag example (Salford C++) +# Created: 2000-03-15 -PROGRAM = test +PROGRAM = dragimag OBJECTS = $(PROGRAM).obj include ..\..\src\makeprog.sl @@ -14,5 +10,5 @@ all: wx $(TARGET) wx: cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all - cd $(WXDIR)\samples\test + cd $(WXDIR)\samples\dragimag diff --git a/samples/dragimag/makefile.twn b/samples/dragimag/makefile.twn index 76ab72b692..00061d4198 100644 --- a/samples/dragimag/makefile.twn +++ b/samples/dragimag/makefile.twn @@ -1,13 +1,5 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile for test example (UNIX). +# Purpose: makefile for dragimag example (TWIN) +# Created: 2000-03-15 WXDIR = ../.. @@ -15,29 +7,29 @@ WXDIR = ../.. # this central makefile. include $(WXDIR)/src/maketwin.env -OBJECTS = $(OBJDIR)/test.$(OBJSUFF) $(OBJDIR)/test_resources.$(OBJSUFF) +OBJECTS = $(OBJDIR)/dragimag.$(OBJSUFF) $(OBJDIR)/dragimag.$(OBJSUFF) -all: $(OBJDIR) test$(GUISUFFIX)$(EXESUFF) +all: $(OBJDIR) dragimag$(GUISUFFIX)$(EXESUFF) wx: $(OBJDIR): mkdir $(OBJDIR) -test$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o test$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) +dragimag$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) + $(CC) $(LDFLAGS) -o dragimag$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) -$(OBJDIR)/test.$(OBJSUFF): test.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ test.$(SRCSUFF) +$(OBJDIR)/dragimag.$(OBJSUFF): dragimag.$(SRCSUFF) + $(CC) -c $(CPPFLAGS) -o $@ dragimag.$(SRCSUFF) -test_resources.c: test.rc - $(RESCOMP) $(RCINPUTSWITCH) test.rc $(RCOUTPUTSWITCH) test_resources.c $(RESFLAGS) +dragimag.c: dragimag.rc + $(RESCOMP) $(RCINPUTSWITCH) dragimag.rc $(RCOUTPUTSWITCH) dragimag.c $(RESFLAGS) -$(OBJDIR)/test_resources.$(OBJSUFF): test_resources.c - $(CC) -c $(CPPFLAGS) -o $@ test_resources.c +$(OBJDIR)/dragimag.$(OBJSUFF): dragimag.c + $(CC) -c $(CPPFLAGS) -o $@ dragimag.c -#$(OBJDIR)/test_resources.o: test.rc -# $(RESCOMP) $(RCINPUTSWITCH) test.rc $(RCOUTPUTSWITCH) $(OBJDIR)/test_resources.o $(RESFLAGS) +#$(OBJDIR)/dragimag.o: dragimag.rc +# $(RESCOMP) $(RCINPUTSWITCH) dragimag.rc $(RCOUTPUTSWITCH) $(OBJDIR)/dragimag.o $(RESFLAGS) clean: - rm -f $(OBJECTS) test$(GUISUFFIX).exe core *.rsc *.res + rm -f $(OBJECTS) dragimag$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/dragimag/makefile.unx b/samples/dragimag/makefile.unx index 21cab3c677..7022f314df 100644 --- a/samples/dragimag/makefile.unx +++ b/samples/dragimag/makefile.unx @@ -1,21 +1,9 @@ -# -# File: Makefile for samples -# Author: Robert Roebling -# Created: 1999 -# Updated: -# Copyright: (c) 1998 Robert Roebling -# -# This makefile requires a Unix version of wxWindows -# to be installed on your system. This is most often -# done typing "make install" when using the complete -# sources of wxWindows or by installing the two -# RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm -# under Linux. -# +# Purpose: makefile for dragimag example (Unix) +# Created: 2000-03-15 CC = gcc -PROGRAM = test +PROGRAM = dragimag OBJECTS = $(PROGRAM).o @@ -31,5 +19,5 @@ all: $(PROGRAM) $(PROGRAM): $(OBJECTS) $(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -clean: +clean: rm -f *.o $(PROGRAM) diff --git a/samples/dragimag/makefile.va b/samples/dragimag/makefile.va index 3cfa8cb8a8..899e5224f1 100644 --- a/samples/dragimag/makefile.va +++ b/samples/dragimag/makefile.va @@ -15,7 +15,7 @@ WXUSINGDLL=0 !include $(WXDIR)\src\makeva.env -PROGRAM=$D\test +PROGRAM=$D\dragimag OBJECTS = $(PROGRAM).obj !if [md $D] diff --git a/samples/dragimag/makefile.vc b/samples/dragimag/makefile.vc index 4ada748eda..9352089a18 100644 --- a/samples/dragimag/makefile.vc +++ b/samples/dragimag/makefile.vc @@ -1,17 +1,10 @@ -# -# File: makefile.vc -# Author: Julian Smart -# Created: 1999 -# Updated: -# Copyright: (c) Julian Smart -# -# Makefile : Builds sample (VC++, WIN32) -# Use FINAL=1 argument to nmake to build final version with no debug info. +# Purpose: makefile for dragimag example (VC++ 32bit) +# Created: 2000-03-15 # Set WXDIR for your system WXDIR = $(WXWIN) -PROGRAM=test +PROGRAM=dragimag OBJECTS = $(PROGRAM).obj !include $(WXDIR)\src\makeprog.vc diff --git a/samples/dragimag/makefile.wat b/samples/dragimag/makefile.wat index 81a83e42a9..8be0d5aec8 100644 --- a/samples/dragimag/makefile.wat +++ b/samples/dragimag/makefile.wat @@ -1,13 +1,9 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# +# Purpose: makefile for dragimag example (Watcom) +# Created: 2000-03-15 WXDIR = $(%WXWIN) -PROGRAM = test +PROGRAM = dragimag OBJECTS = $(PROGRAM).obj !include $(WXDIR)\src\makeprog.wat -- 2.45.2