Removing deprecated classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -23,6 +23,8 @@
|
||||
#include "wx/wx.h"
|
||||
#endif
|
||||
|
||||
#include "wx/deprecated/setup.h"
|
||||
|
||||
#include "dialoged.h"
|
||||
|
||||
#if !wxUSE_PROPSHEET
|
||||
|
@@ -16,7 +16,7 @@
|
||||
#ifndef dialogedh
|
||||
#define dialogedh
|
||||
|
||||
#include "wx/proplist.h"
|
||||
#include "wx/deprecated/proplist.h"
|
||||
#include "reseditr.h"
|
||||
|
||||
class MyChild;
|
||||
|
@@ -950,7 +950,7 @@ bool wxResourceManager::Edit(wxItemResource *res)
|
||||
wxResourceEditorDialogHandler *handler = new wxResourceEditorDialogHandler(panel, res, panel->GetEventHandler(),
|
||||
this);
|
||||
|
||||
panel->LoadFromResource(m_editorPanel, res->GetName(), &m_resourceTable);
|
||||
wxLoadFromResource(panel, m_editorPanel, res->GetName(), &m_resourceTable);
|
||||
|
||||
panel->PushEventHandler(handler);
|
||||
|
||||
@@ -1235,7 +1235,7 @@ bool wxResourceManager::TestCurrentDialog(wxWindow* parent)
|
||||
|
||||
ResourceEditorDialogTester* dialog = new ResourceEditorDialogTester;
|
||||
bool success = FALSE;
|
||||
if (dialog->LoadFromResource(parent, item->GetName(), & m_resourceTable))
|
||||
if (wxLoadFromResource(dialog, parent, item->GetName(), & m_resourceTable))
|
||||
{
|
||||
dialog->Centre();
|
||||
dialog->ShowModal();
|
||||
|
@@ -18,15 +18,19 @@
|
||||
#pragma interface "reseditr.h"
|
||||
#endif
|
||||
|
||||
#include "wx/deprecated/setup.h"
|
||||
|
||||
#include "wx/wx.h"
|
||||
#include "wx/string.h"
|
||||
#include "wx/layout.h"
|
||||
#include "wx/resource.h"
|
||||
#include "wx/toolbar.h"
|
||||
#include "wx/imaglist.h"
|
||||
#include "wx/treectrl.h"
|
||||
#include "wx/proplist.h"
|
||||
#include "wx/txtstrm.h"
|
||||
|
||||
#include "wx/deprecated/resource.h"
|
||||
#include "wx/deprecated/proplist.h"
|
||||
|
||||
#include "symbtabl.h"
|
||||
#include "winstyle.h"
|
||||
|
||||
|
Reference in New Issue
Block a user