More deprecated class mods

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

contrib/samples/deprecated/treelay/Makefile.in

@@ -3,7 +3,7 @@
 
 top_srcdir = @top_srcdir@/..
 top_builddir = ../../../..
-program_dir = samples/treelay
+program_dir = contrib/samples/deprecated/treelay
 
 PROGRAM=treelay
 
@@ -12,4 +12,7 @@ DEPFILES=$(PROGRAM).d
 
 include ../../../../src/makeprog.env
 
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_wxdeprecated-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRADEFS=-I$(top_srcdir)/contrib/include
+
 @IF_GNU_MAKE@-include $(DEPFILES)

contrib/samples/deprecated/treelay/makefile.b32

@@ -4,6 +4,7 @@
 WXDIR = $(WXWIN)
 
 TARGET=treelay
+EXTRALIBS=$(WXDIR)\lib\wxdeprecated.lib
 OBJECTS = $(TARGET).obj
 
 !include $(WXDIR)\src\makeprog.b32

contrib/samples/deprecated/treelay/makefile.g95

@@ -5,6 +5,8 @@ WXDIR = ../../../..
 
 TARGET=treelay
 OBJECTS = $(TARGET).o
+EXTRAINC = -I$(WXDIR)/contrib/include
+EXTRALIBS = -lwxdeprecated
 
 include $(WXDIR)/src/makeprog.g95
 

contrib/samples/deprecated/treelay/makefile.vc

@@ -5,6 +5,12 @@
 WXDIR = $(WXWIN)
 
 PROGRAM=treelay
+FINAL=0
+!if "$(FINAL)" == "0"
+EXTRALIBS=$(WXDIR)\lib\wxdeprecatedd.lib
+!else
+EXTRALIBS=$(WXDIR)\lib\wxdeprecated.lib
+!endif
 OBJECTS = $(PROGRAM).obj
 
 !include $(WXDIR)\src\makeprog.vc

contrib/samples/deprecated/treelay/treelay.cpp

@@ -20,7 +20,13 @@
 #include "wx/wx.h"
 #endif
 
-#include "wx/treelay.h"
+#include "wx/deprecated/setup.h"
+
+#if !wxUSE_TREELAYOUT
+#error Please set wxUSE_TREELAYOUT to 1 in contrib/include/wx/deprecated/setup.h and recompile.
+#endif
+
+#include "wx/deprecated/treelay.h"
 
 #include "treelay.h"