Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More deprecated class mods

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-03-31 10:24:36 +00:00
parent f2638c97a5
commit 7c9955d147
103 changed files with 466 additions and 11735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/samples/ogl/ogledit/doc.cpp
View File

@@ -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"

3
contrib/samples/ogl/ogledit/doc.h
View File

@@ -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

4
contrib/samples/ogl/ogledit/makefile.vc
View File

@@ -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

4
contrib/samples/ogl/studio/csprint.cpp
View File

@@ -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__

15
contrib/samples/ogl/studio/dialogs.cpp
View File

@@ -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)");

2
contrib/samples/ogl/studio/doc.cpp
View File

@@ -24,8 +24,6 @@
#include <wx/wx.h>
#endif
#include <wx/wxexpr.h>
#include "studio.h"
#include "doc.h"
#include "view.h"

4
contrib/samples/ogl/studio/doc.h
View File

@@ -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"

4
contrib/samples/ogl/studio/makefile.vc
View File

@@ -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\

3
contrib/samples/ogl/studio/shapes.cpp
View File

@@ -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"

3
contrib/samples/ogl/studio/shapes.h
View File

@@ -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>

3
contrib/samples/ogl/studio/studio.cpp
View File

@@ -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"

3
contrib/samples/ogl/studio/symbols.cpp
View File

@@ -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"