More deprecated class mods

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-31 10:24:36 +00:00
parent f2638c97a5
commit 7c9955d147
103 changed files with 466 additions and 11735 deletions
--- a/contrib/samples/animate/makefile.vc
+++ b/contrib/samples/animate/makefile.vc
@@ -2,7 +2,11 @@ WXDIR = $(WXWIN)
 PROGRAM = anitest

 OBJECTS = $(PROGRAM).obj
-EXTRALIBS = $(WXDIR)\lib\anim$(LIBEXT).lib
+!if "$(FINAL)" == "0"
+EXTRALIBS=$(WXDIR)\lib\animd.lib
+!else
+EXTRALIBS=$(WXDIR)\lib\anim.lib
+!endif
 EXTRAINC = -I$(WXDIR)\contrib\include

 !include $(WXDIR)\src\makeprog.vc
--- a/contrib/samples/deprecated/proplist/Makefile.in
+++ b/contrib/samples/deprecated/proplist/Makefile.in
@@ -10,6 +10,9 @@ PROGRAM=proplist
 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)
--- a/contrib/samples/deprecated/proplist/makefile.b32
+++ b/contrib/samples/deprecated/proplist/makefile.b32
@@ -4,6 +4,7 @@
 WXDIR = $(WXWIN)

 TARGET=proplist
+EXTRALIBS=$(WXDIR)\lib\wxdeprecated.lib
 OBJECTS = $(TARGET).obj

 !include $(WXDIR)\src\makeprog.b32
--- a/contrib/samples/deprecated/proplist/makefile.g95
+++ b/contrib/samples/deprecated/proplist/makefile.g95
@@ -5,6 +5,8 @@ WXDIR = ../../../..

 TARGET=proplist
 OBJECTS = $(TARGET).o
+EXTRAINC = -I$(WXDIR)/contrib/include
+EXTRALIBS = -lwxdeprecated

 include $(WXDIR)/src/makeprog.g95

--- a/contrib/samples/deprecated/proplist/makefile.vc
+++ b/contrib/samples/deprecated/proplist/makefile.vc
@@ -5,6 +5,12 @@
 WXDIR = $(WXWIN)

 PROGRAM=proplist
+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
--- a/contrib/samples/deprecated/proplist/proplist.cpp
+++ b/contrib/samples/deprecated/proplist/proplist.cpp
@@ -24,9 +24,10 @@
 #include "wx/wx.h"
 #endif

+#include "wx/deprecated/setup.h"

 #if !wxUSE_PROPSHEET
-#error Please set wxUSE_PROPSHEET to 1 in include/wx/msw/setup.h and recompile.
+#error Please set wxUSE_PROPSHEET to 1 in contrib/include/wx/deprecated/setup.h and recompile.
 #endif

 #include "proplist.h"
--- a/contrib/samples/deprecated/resource/Makefile.in
+++ b/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)
--- a/contrib/samples/deprecated/resource/makefile.b32
+++ b/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
--- a/contrib/samples/deprecated/resource/makefile.g95
+++ b/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

--- a/contrib/samples/deprecated/resource/makefile.vc
+++ b/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
--- a/contrib/samples/deprecated/resource/resource.cpp
+++ b/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)
--- a/contrib/samples/deprecated/treelay/Makefile.in
+++ b/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)
--- a/contrib/samples/deprecated/treelay/makefile.b32
+++ b/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
--- a/contrib/samples/deprecated/treelay/makefile.g95
+++ b/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

--- a/contrib/samples/deprecated/treelay/makefile.vc
+++ b/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
--- a/contrib/samples/deprecated/treelay/treelay.cpp
+++ b/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"

--- a/contrib/samples/ogl/ogledit/doc.cpp
+++ b/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"
--- a/contrib/samples/ogl/ogledit/doc.h
+++ b/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
--- a/contrib/samples/ogl/ogledit/makefile.vc
+++ b/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
--- a/contrib/samples/ogl/studio/csprint.cpp
+++ b/contrib/samples/ogl/studio/csprint.cpp
@@ -24,7 +24,9 @@
 #include <wx/wx.h>
 #endif

-#include <wx/wxexpr.h>
+#include <wx/deprecated/setup.h>
+#include <wx/deprecated/wxexpr.h>
+
 #include <wx/clipbrd.h>

 #ifdef __WXMSW__
--- a/contrib/samples/ogl/studio/dialogs.cpp
+++ b/contrib/samples/ogl/studio/dialogs.cpp
@@ -24,7 +24,8 @@
 #include <wx/wx.h>
 #endif

-#include <wx/resource.h>
+#include <wx/deprecated/setup.h>
+#include <wx/deprecated/resource.h>
 #include "dialogs.h"
 #include "doc.h"
 #include "view.h"
@@ -39,7 +40,7 @@ END_EVENT_TABLE()

 csLabelEditingDialog::csLabelEditingDialog(wxWindow* parent)
 {
-    LoadFromResource(parent, "shape_label_dialog");
+    wxLoadFromResource(this, parent, "shape_label_dialog");

    // Accelerators
    wxAcceleratorEntry entries[1];
@@ -99,13 +100,13 @@ csSettingsDialog::csSettingsDialog(wxWindow* parent):

    m_generalSettings = new wxPanel;

-    bool success = m_generalSettings->LoadFromResource(m_notebook, "general_settings_dialog");
+    bool success = wxLoadFromResource(m_generalSettings, m_notebook, "general_settings_dialog");
    wxASSERT_MSG( (success), "Could not load general settings panel.");
    m_notebook->AddPage(m_generalSettings, "General", TRUE);

    m_diagramSettings = new wxPanel;

-    success = m_diagramSettings->LoadFromResource(m_notebook, "diagram_settings_dialog");
+    success = wxLoadFromResource(m_diagramSettings, m_notebook, "diagram_settings_dialog");
    wxASSERT_MSG( (success), "Could not load diagram settings panel.");
    m_notebook->AddPage(m_diagramSettings, "Diagram");

@@ -258,11 +259,11 @@ csShapePropertiesDialog::csShapePropertiesDialog(wxWindow* parent, const wxStrin
         wxPoint(2, 2), wxSize(SHAPE_PROPERTY_DIALOG_WIDTH - 4, SHAPE_PROPERTY_DIALOG_HEIGHT - 4));

    m_generalPropertiesDialog = new csGeneralShapePropertiesDialog;
-    bool success = m_generalPropertiesDialog->LoadFromResource(m_notebook, "general_shape_properties_dialog");
+    bool success = wxLoadFromResource(m_generalPropertiesDialog, m_notebook, "general_shape_properties_dialog");
    wxASSERT_MSG( (success), "Could not load general properties panel.");
    m_notebook->AddPage(m_generalPropertiesDialog, "General");

-    success = m_attributeDialog->LoadFromResource(m_notebook, attributeDialogName);
+    success = wxLoadFromResource(m_attributeDialog, m_notebook, attributeDialogName);
    if (!success)
    {
        wxMessageBox("Could not load the attribute dialog for this shape.", "Studio", wxICON_EXCLAMATION);
@@ -278,7 +279,7 @@ csShapePropertiesDialog::csShapePropertiesDialog(wxWindow* parent, const wxStrin
    wxString str(attributeDialogName);
    str += "1";
    m_alternativeAttributeDialog = new wxPanel;
-    success = m_alternativeAttributeDialog->LoadFromResource(m_notebook, str);
+    success = wxLoadFromResource(m_alternativeAttributeDialog, m_notebook, str);
    if (success)
    {
        m_notebook->AddPage(m_alternativeAttributeDialog, "Attributes (alternative)");
--- a/contrib/samples/ogl/studio/doc.cpp
+++ b/contrib/samples/ogl/studio/doc.cpp
@@ -24,8 +24,6 @@
 #include <wx/wx.h>
 #endif

-#include <wx/wxexpr.h>
-
 #include "studio.h"
 #include "doc.h"
 #include "view.h"
--- a/contrib/samples/ogl/studio/doc.h
+++ b/contrib/samples/ogl/studio/doc.h
@@ -19,7 +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>
 #include "shapes.h"
--- a/contrib/samples/ogl/studio/makefile.vc
+++ b/contrib/samples/ogl/studio/makefile.vc
@@ -18,9 +18,9 @@ PROGRAM=studio
 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 shapes.obj symbols.obj view.obj cspalette.obj\
--- a/contrib/samples/ogl/studio/shapes.cpp
+++ b/contrib/samples/ogl/studio/shapes.cpp
@@ -28,7 +28,8 @@
 #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
 #endif

-#include <wx/wxexpr.h>
+#include <wx/deprecated/setup.h>
+#include <wx/deprecated/wxexpr.h>

 #include "studio.h"
 #include "doc.h"
--- a/contrib/samples/ogl/studio/shapes.h
+++ b/contrib/samples/ogl/studio/shapes.h
@@ -18,7 +18,8 @@

 #include <wx/docview.h>
 #include <wx/string.h>
-#include <wx/wxexpr.h>
+#include <wx/deprecated/setup.h>
+#include <wx/deprecated/wxexpr.h>

 #include <wx/ogl/ogl.h>
 #include <wx/ogl/basicp.h>
--- a/contrib/samples/ogl/studio/studio.cpp
+++ b/contrib/samples/ogl/studio/studio.cpp
@@ -21,7 +21,8 @@
 #include "wx/mdi.h"
 #endif

-#include "wx/resource.h"
+#include <wx/deprecated/setup.h>
+#include <wx/deprecated/resource.h>
 #include "wx/config.h"
 #include "wx/laywin.h"

--- a/contrib/samples/ogl/studio/symbols.cpp
+++ b/contrib/samples/ogl/studio/symbols.cpp
@@ -24,7 +24,8 @@
 #include <wx/wx.h>
 #endif

-#include <wx/wxexpr.h>
+#include <wx/deprecated/setup.h>
+#include <wx/deprecated/wxexpr.h>

 #include "studio.h"
 #include "doc.h"