Makefile fixes

Added resource sample (segvs) Added functions to menu, mdi, frame, dialog, window that were missing e.g. in wxPython git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-08-15 10:47:47 +00:00 · 1998-08-15 10:47:47 +00:00 · 942be9a749
commit 942be9a749
parent 03e9bead8a
61 changed files with 169 additions and 32 deletions
--- a/samples/config/.cvsignore
+++ b/samples/config/.cvsignore
@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
--- a/samples/config/Makefile
+++ b/samples/config/Makefile
@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp
--- a/samples/controls/.cvsignore
+++ b/samples/controls/.cvsignore
@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
--- a/samples/controls/Makefile
+++ b/samples/controls/Makefile
@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp
--- a/samples/controls/Makefile.in
+++ b/samples/controls/Makefile.in
@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin

 # define library name
-BIN_TARGET=test
+BIN_TARGET=controls
 # define library sources
 BIN_SRC=\
 controls.cpp
--- a/samples/dialogs/.cvsignore
+++ b/samples/dialogs/.cvsignore
@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
--- a/samples/dialogs/Makefile
+++ b/samples/dialogs/Makefile
@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp
--- a/samples/dnd/.cvsignore
+++ b/samples/dnd/.cvsignore
@ -1,3 +1,3 @@
 Linux
 linux-gnu
-linux-gnu
+linux
--- a/samples/dnd/Makefile
+++ b/samples/dnd/Makefile
@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp
--- a/samples/docview/.cvsignore
+++ b/samples/docview/.cvsignore
@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
--- a/samples/docview/Makefile
+++ b/samples/docview/Makefile
@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp
--- a/samples/docvwmdi/.cvsignore
+++ b/samples/docvwmdi/.cvsignore
@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
--- a/samples/docvwmdi/Makefile
+++ b/samples/docvwmdi/Makefile
@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp
--- a/samples/dynamic/.cvsignore
+++ b/samples/dynamic/.cvsignore
@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
--- a/samples/dynamic/Makefile
+++ b/samples/dynamic/Makefile
@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp
--- a/samples/dynamic/Makefile.in
+++ b/samples/dynamic/Makefile.in
@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin

 # define library name
-BIN_TARGET=test
+BIN_TARGET=dynamic
 # define library sources
 BIN_SRC=\
 minimal.cpp
--- a/samples/forty/.cvsignore
+++ b/samples/forty/.cvsignore
@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
--- a/samples/forty/Makefile
+++ b/samples/forty/Makefile
@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp
--- a/samples/grid/.cvsignore
+++ b/samples/grid/.cvsignore
@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
--- a/samples/grid/Makefile
+++ b/samples/grid/Makefile
@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp
--- a/samples/grid/Makefile.in
+++ b/samples/grid/Makefile.in
@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin

 # define library name
-BIN_TARGET=test
+BIN_TARGET=grid
 # define library sources
 BIN_SRC=\
 test.cpp
--- a/samples/internat/.cvsignore
+++ b/samples/internat/.cvsignore
@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
--- a/samples/internat/Makefile
+++ b/samples/internat/Makefile
@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp
--- a/samples/internat/Makefile.in
+++ b/samples/internat/Makefile.in
@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin

 # define library name
-BIN_TARGET=test
+BIN_TARGET=internat
 # define library sources
 BIN_SRC=\
 internat.cpp
--- a/samples/layout/.cvsignore
+++ b/samples/layout/.cvsignore
@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
--- a/samples/layout/Makefile
+++ b/samples/layout/Makefile
@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp
--- a/samples/layout/Makefile.in
+++ b/samples/layout/Makefile.in
@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin

 # define library name
-BIN_TARGET=test
+BIN_TARGET=layout
 # define library sources
 BIN_SRC=\
 layout.cpp
--- a/samples/mdi/.cvsignore
+++ b/samples/mdi/.cvsignore
@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
--- a/samples/mdi/Makefile
+++ b/samples/mdi/Makefile
@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp
--- a/samples/mdi/Makefile.in
+++ b/samples/mdi/Makefile.in
@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin

 # define library name
-BIN_TARGET=test
+BIN_TARGET=mdi
 # define library sources
 BIN_SRC=\
 mdi.cpp
--- a/samples/mdi/bitmaps/preview.xpm
+++ b/samples/mdi/bitmaps/preview.xpm
@ -0,0 +1,26 @@
+/* XPM */
+static char *preview_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 5 1",
+"  c Black",
+". c None",
+"X c Gray100",
+"o c #808080",
+"O c Cyan",
+/* pixels */
+"         .......",
+" XXXXXXX  ......",
+" XXXXXXX . .....",
+" XXXXXXX    ....",
+" XXXXXXXXXX ....",
+" XXXXXXX    ....",
+" XXXXXX o..o ...",
+" XXXXX oOO.oo ..",
+" XXXXX .O..o. ..",
+" XXXXX ....o. ..",
+" XXXXX o..Ooo ..",
+" XXXXXX o..o o..",
+" XXXXXXX    o  .",
+" XXXXXXXXXX .   ",
+"            ..  "
+};
--- a/samples/memcheck/.cvsignore
+++ b/samples/memcheck/.cvsignore
@ -0,0 +1,3 @@
+Linux
+linux-gnu
+linux
--- a/samples/memcheck/Makefile
+++ b/samples/memcheck/Makefile
@ -0,0 +1 @@
+include ../../install/unix/setup/general/makeapp
--- a/samples/memcheck/Makefile.in
+++ b/samples/memcheck/Makefile.in
@ -0,0 +1,26 @@
+# WXXT base directory
+WXBASEDIR=@WXBASEDIR@
+
+# set the OS type for compilation
+OS=@OS@
+# compile a library only
+RULE=bin
+
+# define library name
+BIN_TARGET=memcheck
+# define library sources
+BIN_SRC=\
+memcheck.cpp
+
+#define library objects
+BIN_OBJ=\
+memcheck.o
+
+# additional things needed to link
+BIN_LINK=
+
+# additional things needed to compile
+ADD_COMPILE=
+
+# include the definitions now
+include ../../../template.mak
--- a/samples/minimal/.cvsignore
+++ b/samples/minimal/.cvsignore
@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
--- a/samples/minimal/Makefile
+++ b/samples/minimal/Makefile
@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin

 # define library name
-BIN_TARGET=test
+BIN_TARGET=minimal
 # define library sources
 BIN_SRC=\
 minimal.cpp
--- a/samples/png/.cvsignore
+++ b/samples/png/.cvsignore
@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
--- a/samples/png/Makefile
+++ b/samples/png/Makefile
@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp
--- a/samples/png/Makefile.in
+++ b/samples/png/Makefile.in
@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin

 # define library name
-BIN_TARGET=test
+BIN_TARGET=pngdemo
 # define library sources
 BIN_SRC=\
 pngdemo.cpp
--- a/samples/printing/.cvsignore
+++ b/samples/printing/.cvsignore
@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
--- a/samples/printing/Makefile
+++ b/samples/printing/Makefile
@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp
--- a/samples/printing/Makefile.in
+++ b/samples/printing/Makefile.in
@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin

 # define library name
-BIN_TARGET=TEST
+BIN_TARGET=printing
 # define library sources
 BIN_SRC=\
 printing.cpp
--- a/samples/resource/.cvsignore
+++ b/samples/resource/.cvsignore
@ -0,0 +1,3 @@
+Linux
+linux-gnu
+linux
--- a/samples/resource/Makefile
+++ b/samples/resource/Makefile
@ -0,0 +1 @@
+include ../../install/unix/setup/general/makeapp
--- a/samples/resource/Makefile.in
+++ b/samples/resource/Makefile.in
@ -0,0 +1,26 @@
+# WXXT base directory
+WXBASEDIR=@WXBASEDIR@
+
+# set the OS type for compilation
+OS=@OS@
+# compile a library only
+RULE=bin
+
+# define library name
+BIN_TARGET=resource
+# define library sources
+BIN_SRC=\
+resource.cpp
+
+#define library objects
+BIN_OBJ=\
+resource.o
+
+# additional things needed to link
+BIN_LINK=
+
+# additional things needed to compile
+ADD_COMPILE=
+
+# include the definitions now
+include ../../../template.mak
--- a/samples/splitter/.cvsignore
+++ b/samples/splitter/.cvsignore
@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
--- a/samples/splitter/Makefile
+++ b/samples/splitter/Makefile
@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp
--- a/samples/splitter/Makefile.in
+++ b/samples/splitter/Makefile.in
@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin

 # define library name
-BIN_TARGET=test
+BIN_TARGET=splitter
 # define library sources
 BIN_SRC=\
 test.cpp
--- a/samples/tab/.cvsignore
+++ b/samples/tab/.cvsignore
@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
--- a/samples/tab/Makefile
+++ b/samples/tab/Makefile
@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp
--- a/samples/tab/Makefile.in
+++ b/samples/tab/Makefile.in
@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin

 # define library name
-BIN_TARGET=test
+BIN_TARGET=tab
 # define library sources
 BIN_SRC=\
 test.cpp
--- a/samples/thread/.cvsignore
+++ b/samples/thread/.cvsignore
@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
--- a/samples/thread/Makefile
+++ b/samples/thread/Makefile
@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp
--- a/samples/thread/Makefile.in
+++ b/samples/thread/Makefile.in
@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin

 # define library name
-BIN_TARGET=test
+BIN_TARGET=thread
 # define library sources
 BIN_SRC=\
 test.cpp
--- a/samples/toolbar/.cvsignore
+++ b/samples/toolbar/.cvsignore
@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
--- a/samples/toolbar/Makefile.in
+++ b/samples/toolbar/Makefile.in
@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin

 # define library name
-BIN_TARGET=test
+BIN_TARGET=toolbar
 # define library sources
 BIN_SRC=\
 test.cpp
--- a/samples/treectrl/.cvsignore
+++ b/samples/treectrl/.cvsignore
@ -0,0 +1,3 @@
+Linux
+linux-gnu
+linux
--- a/samples/treectrl/Makefile
+++ b/samples/treectrl/Makefile
@ -0,0 +1 @@
+include ../../install/unix/setup/general/makeapp
--- a/samples/treectrl/Makefile.in
+++ b/samples/treectrl/Makefile.in
@ -0,0 +1,26 @@
+# WXXT base directory
+WXBASEDIR=@WXBASEDIR@
+
+# set the OS type for compilation
+OS=@OS@
+# compile a library only
+RULE=bin
+
+# define library name
+BIN_TARGET=treetest
+# define library sources
+BIN_SRC=\
+treetest.cpp
+
+#define library objects
+BIN_OBJ=\
+treetest.o
+
+# additional things needed to link
+BIN_LINK=
+
+# additional things needed to compile
+ADD_COMPILE=
+
+# include the definitions now
+include ../../../template.mak
--- a/samples/validate/.cvsignore
+++ b/samples/validate/.cvsignore
@ -0,0 +1,3 @@
+Linux
+linux-gnu
+linux
				`@ -0,0 +1 @@`
				`include ../../install/unix/setup/general/makeapp`