blob: b4ac73095a868910422687e1078bbaf7293d99c7 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
Index: src/ui/trackview.cpp
===================================================================
--- src/ui/trackview.cpp (revision 409)
+++ src/ui/trackview.cpp (revision 410)
@@ -148,17 +148,17 @@
}
Gtk::TreeViewColumn* pCol = m_TreeView.get_column(i);
- ss << reinterpret_cast<int>(pCol->property_user_data().get_value());
+ ss << reinterpret_cast<int64_t>(pCol->property_user_data().get_value());
}
m_Settings.set("TrackViewColumns", ss.str());
- int sortId;
+ int32_t sortId;
Gtk::SortType sortOrder;
m_TrackModel.getSortColumn(sortId, sortOrder);
m_Settings.set("TrackViewSortColumnId", sortId);
- m_Settings.set("TrackViewSortColumnOrder", static_cast<int>(sortOrder));
+ m_Settings.set("TrackViewSortColumnOrder", static_cast<int32_t>(sortOrder));
}
bool TrackView::onButtonPress(GdkEventButton* pEvent)
@@ -280,8 +280,8 @@
std::vector<Gtk::TreeViewColumn*> columns = m_TreeView.get_columns();
for (size_t i = 0; i < columns.size(); ++i)
{
- int32_t id = reinterpret_cast<int32_t>(m_TreeView.get_column(i)->property_user_data().get_value());
- if (id == headerId)
+ int64_t id = reinterpret_cast<int64_t>(m_TreeView.get_column(i)->property_user_data().get_value());
+ if (static_cast<int32_t>(id) == headerId)
{
pColToRemove = m_TreeView.get_column(i);
break;
|