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

Fix build errors when building with gcc

Browse Source
This commit is contained in:
Graham Dawes
2019-02-08 14:43:04 +00:00
parent 6014eb37ea
commit 6482664955
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/qt/private/converter.h
View File

@@ -15,6 +15,7 @@
#include "wx/kbdstate.h" #include "wx/kbdstate.h"
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include "wx/colour.h"
#include <QtCore/QRect> #include <QtCore/QRect>
#include <QtCore/QSize> #include <QtCore/QSize>

8
src/qt/treectrl.cpp
View File

@@ -14,6 +14,7 @@
#include "wx/treectrl.h" #include "wx/treectrl.h"
#include "wx/imaglist.h" #include "wx/imaglist.h"
#include "wx/settings.h"
#include "wx/qt/private/winevent.h" #include "wx/qt/private/winevent.h"
#include "wx/qt/private/treeitemfactory.h" #include "wx/qt/private/treeitemfactory.h"
@@ -46,7 +47,6 @@ struct TreeItemDataQt
}; };
bool TreeItemDataQt::registered = false; bool TreeItemDataQt::registered = false;
Q_DECLARE_METATYPE(TreeItemDataQt)
QDataStream &operator<<(QDataStream &out, const TreeItemDataQt &WXUNUSED(obj)) QDataStream &operator<<(QDataStream &out, const TreeItemDataQt &WXUNUSED(obj))
{ {
@@ -119,11 +119,13 @@ private:
} }
Q_DECLARE_METATYPE(TreeItemDataQt)
class wxQTreeWidget : public wxQtEventSignalHandler<QTreeWidget, wxTreeCtrl> class wxQTreeWidget : public wxQtEventSignalHandler<QTreeWidget, wxTreeCtrl>
{ {
public: public:
wxQTreeWidget(wxWindow *parent, wxTreeCtrl *handler) : wxQTreeWidget(wxWindow *parent, wxTreeCtrl *handler) :
wxQtEventSignalHandler(parent, handler), wxQtEventSignalHandler<QTreeWidget, wxTreeCtrl>(parent, handler),
m_editorFactory(handler) m_editorFactory(handler)
{ {
connect(this, &QTreeWidget::currentItemChanged, connect(this, &QTreeWidget::currentItemChanged,
@@ -796,7 +798,7 @@ wxTreeItemId wxTreeCtrl::GetNextChild(
{ {
wxCHECK_MSG(item.IsOk(), wxTreeItemId(), "invalid tree item"); wxCHECK_MSG(item.IsOk(), wxTreeItemId(), "invalid tree item");
int currentIndex = reinterpret_cast<int>(cookie); wxIntPtr currentIndex = reinterpret_cast<wxIntPtr>(cookie);
++currentIndex; ++currentIndex;
const QTreeWidgetItem *qTreeItem = wxQtConvertTreeItem(item); const QTreeWidgetItem *qTreeItem = wxQtConvertTreeItem(item);