More deprecated class mods

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

contrib/samples/ogl/ogledit/doc.cpp

@@ -28,7 +28,6 @@
 #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
 #endif
 
-#include <wx/wxexpr.h>
 #include "ogledit.h"
 #include "doc.h"
 #include "view.h"

contrib/samples/ogl/ogledit/doc.h

@@ -19,8 +19,9 @@
 #include <wx/docview.h>
 #include <wx/cmdproc.h>
 #include <wx/string.h>
-#include <wx/wxexpr.h>
 
+#include <wx/deprecated/setup.h>
+#include <wx/deprecated/wxexpr.h>
 #include <wx/ogl/ogl.h>
 
 #if wxUSE_STD_IOSTREAM

contrib/samples/ogl/ogledit/makefile.vc

@@ -18,9 +18,9 @@ PROGRAM=ogledit
 FINAL=0
 
 !if "$(FINAL)" == "0"
-EXTRALIBS=$(WXDIR)\lib\ogld.lib
+EXTRALIBS=$(WXDIR)\lib\ogld.lib $(WXDIR)\lib\wxdeprecatedd.lib
 !else
-EXTRALIBS=$(WXDIR)\lib\ogl.lib
+EXTRALIBS=$(WXDIR)\lib\ogl.lib $(WXDIR)\lib\wxdeprecated.lib
 !endif
 
 OBJECTS = $(PROGRAM).obj doc.obj view.obj palette.obj