More deprecated class mods

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

contrib/samples/deprecated/resource/Makefile.in

@@ -11,13 +11,16 @@
 
 top_srcdir = @top_srcdir@/..
 top_builddir = ../../../..
-program_dir = samples/resource
+program_dir = contrib/samples/deprecated/resource
 
 PROGRAM=resource
 
 OBJECTS =$(PROGRAM).o
 DEPFILES=$(PROGRAM).d
 
+APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_wxdeprecated-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRADEFS=-I$(top_srcdir)/contrib/include
+
 include ../../../../src/makeprog.env
 
 @IF_GNU_MAKE@-include $(DEPFILES)

contrib/samples/deprecated/resource/makefile.b32

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

contrib/samples/deprecated/resource/makefile.g95

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

contrib/samples/deprecated/resource/makefile.vc

@@ -10,8 +10,13 @@
 
 # Set WXDIR for your system
 WXDIR = $(WXWIN)
-
+FINAL=0
 PROGRAM=resource
+!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/resource/resource.cpp

@@ -24,6 +24,8 @@
 #include "wx/wx.h"
 #endif
 
+#include "wx/deprecated/setup.h"
+
 #if !wxUSE_RESOURCES
     #error "You should set wxUSE_RESOURCES to 1 to compile this sample"
 #endif
@@ -32,7 +34,7 @@
 // #error "This sample can't be compiled in Unicode mode."
 #endif // wxUSE_UNICODE
 
-#include "wx/resource.h"
+#include "wx/deprecated/resource.h"
 
 #include <ctype.h>
 #include "resource.h"
@@ -184,7 +186,7 @@ void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event) )
 {
     MyDialog *dialog = new MyDialog;
 
-    if (dialog->LoadFromResource(this, wxT("dialog1")))
+    if (wxLoadFromResource(dialog, this, wxT("dialog1")))
     {
         wxTextCtrl *text = (wxTextCtrl *)wxFindWindowByName(wxT("multitext3"), dialog);
         if (text)