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

Clean up the code after merges.

Browse Source
This commit is contained in:
Jay Nabonne
2019-02-07 10:13:05 +00:00
parent 0356b236c8
commit 5279d0bca5
1 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/qt/treectrl.cpp
View File

@@ -38,11 +38,11 @@ namespace
bool TreeItemDataQt::registered = false; bool TreeItemDataQt::registered = false;
Q_DECLARE_METATYPE(TreeItemDataQt) Q_DECLARE_METATYPE(TreeItemDataQt)
QDataStream &operator<<(QDataStream &out, const TreeItemDataQt &myObj) QDataStream &operator<<(QDataStream &out, const TreeItemDataQt &)
{ {
return out; return out;
} }
QDataStream &operator>>(QDataStream &in, TreeItemDataQt &myObj) QDataStream &operator>>(QDataStream &in, TreeItemDataQt &)
{ {
return in; return in;
} }
@@ -228,49 +228,49 @@ private:
EmitEvent(expandedEvent); EmitEvent(expandedEvent);
} }
virtual void dragEnterEvent(QDragEnterEvent* event) wxOVERRIDE virtual void dragEnterEvent(QDragEnterEvent* event) wxOVERRIDE
{
wxEventType command = (event->mouseButtons() & Qt::RightButton)
? wxEVT_TREE_BEGIN_RDRAG
: wxEVT_TREE_BEGIN_DRAG;
QTreeWidgetItem *hitItem = itemAt(event->pos());
wxTreeEvent tree_event(
command,
GetHandler(),
wxQtConvertTreeItem(hitItem)
);
tree_event.SetPoint(wxQtConvertPoint(event->pos()));
// Vetoed unless explicitly accepted.
tree_event.Veto();
EmitEvent(tree_event);
if ( tree_event.IsAllowed() )
{ {
wxEventType command = (event->mouseButtons() & Qt::RightButton) event->accept();
? wxEVT_TREE_BEGIN_RDRAG
: wxEVT_TREE_BEGIN_DRAG;
QTreeWidgetItem *hitItem = itemAt(event->pos());
wxTreeEvent tree_event(
command,
GetHandler(),
wxQtConvertTreeItem(hitItem)
);
tree_event.SetPoint(wxQtConvertPoint(event->pos()));
// Vetoed unless explicitly accepted.
tree_event.Veto();
EmitEvent(tree_event);
if ( tree_event.IsAllowed() )
{
event->accept();
}
} }
}
virtual void dropEvent(QDropEvent* event) wxOVERRIDE virtual void dropEvent(QDropEvent* event) wxOVERRIDE
{ {
const wxPoint pos = wxQtConvertPoint(event->pos()); const wxPoint pos = wxQtConvertPoint(event->pos());
QTreeWidgetItem *hitItem = itemAt(event->pos()); QTreeWidgetItem *hitItem = itemAt(event->pos());
wxTreeEvent tree_event( wxTreeEvent tree_event(
wxEVT_TREE_END_DRAG, wxEVT_TREE_END_DRAG,
GetHandler(), GetHandler(),
wxQtConvertTreeItem(hitItem) wxQtConvertTreeItem(hitItem)
); );
tree_event.SetPoint(wxQtConvertPoint(event->pos())); tree_event.SetPoint(wxQtConvertPoint(event->pos()));
EmitEvent(tree_event); EmitEvent(tree_event);
} }
int ChooseBestImage(QTreeWidgetItem *item) const int ChooseBestImage(QTreeWidgetItem *item) const
{ {