Change Qt smart pointers with wx ones to fix compilation
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
#ifndef _WX_QT_APP_H_
|
||||
#define _WX_QT_APP_H_
|
||||
|
||||
#include <QtCore/QScopedPointer>
|
||||
#include <wx/scopedarray.h>
|
||||
|
||||
class QApplication;
|
||||
class WXDLLIMPEXP_CORE wxApp : public wxAppBase
|
||||
@@ -21,9 +21,9 @@ public:
|
||||
virtual bool Initialize(int& argc, wxChar **argv);
|
||||
|
||||
private:
|
||||
QScopedPointer<QApplication> m_qtApplication;
|
||||
wxScopedPtr<QApplication> m_qtApplication;
|
||||
int m_qtArgc;
|
||||
QScopedArrayPointer<char*> m_qtArgv;
|
||||
wxScopedArray<char*> m_qtArgv;
|
||||
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_COPY( wxApp );
|
||||
};
|
||||
|
@@ -9,8 +9,6 @@
|
||||
#ifndef _WX_QT_WINDOW_H_
|
||||
#define _WX_QT_WINDOW_H_
|
||||
|
||||
#include <QtCore/QScopedPointer>
|
||||
|
||||
class QShortcut;
|
||||
template < class T > class QList;
|
||||
|
||||
@@ -229,13 +227,13 @@ private:
|
||||
bool QtSetBackgroundStyle();
|
||||
|
||||
QPicture *m_qtPicture; // not owned
|
||||
QScopedPointer<QPainter> m_qtPainter; // always allocated
|
||||
wxScopedPtr<QPainter> m_qtPainter; // always allocated
|
||||
|
||||
bool m_mouseInside;
|
||||
|
||||
#if wxUSE_ACCEL
|
||||
wxVector<QShortcut*> m_qtShortcuts; // owned by whatever GetHandle() returns
|
||||
QScopedPointer<wxQtShortcutHandler> m_qtShortcutHandler; // always allocated
|
||||
wxScopedPtr<wxQtShortcutHandler> m_qtShortcutHandler; // always allocated
|
||||
bool m_processingShortcut;
|
||||
#endif // wxUSE_ACCEL
|
||||
|
||||
|
Reference in New Issue
Block a user