Improve build and widget storage
There are no longer any qt headers included in wx/qt headers. Applications do not need to link with qt librarys anymore, only wxqt libraries. wxWindow and derived widgets only contain one pointer to their qtwidget, no longer carrying both base and derived pointers in parallel as was before.
This commit is contained in:
committed by
Vadim Zeitlin
parent
88e134ef81
commit
35bc8f449b
@@ -8,12 +8,13 @@
|
||||
#ifndef _WX_QT_DATAOBJ_H_
|
||||
#define _WX_QT_DATAOBJ_H_
|
||||
|
||||
#include <QMimeData>
|
||||
class QMimeData;
|
||||
|
||||
class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase
|
||||
{
|
||||
public:
|
||||
wxDataObject() {}
|
||||
wxDataObject();
|
||||
~wxDataObject();
|
||||
|
||||
virtual bool IsSupportedFormat(const wxDataFormat& format, Direction dir) const;
|
||||
virtual wxDataFormat GetPreferredFormat(Direction dir = Get) const;
|
||||
@@ -24,7 +25,7 @@ public:
|
||||
virtual bool SetData(const wxDataFormat& format, size_t len, const void * buf);
|
||||
|
||||
private:
|
||||
QMimeData m_qtMimeData; // to handle formats that have no helper classes
|
||||
QMimeData *m_qtMimeData; // to handle formats that have no helper classes
|
||||
};
|
||||
|
||||
#endif // _WX_QT_DATAOBJ_H_
|
||||
|
Reference in New Issue
Block a user