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
37
38
39
40
41
42
|
Patch to make the query results window work with glib 2.42.
https://bugs.gentoo.org/show_bug.cgi?id=536024
http://bugs.mysql.com/bug.php?id=74147
=== modified file frontend/linux/linux_utilities/listmodel_wrapper.cpp
--- frontend/linux/linux_utilities/listmodel_wrapper.cpp 2014-03-17 16:42:25 +0000
+++ frontend/linux/linux_utilities/listmodel_wrapper.cpp 2014-10-16 10:33:12 +0000
@@ -528,7 +528,6 @@
ListModelWrapper::ListModelWrapper(bec::ListModel* tm, Gtk::TreeView *treeview, const std::string& name)
: Glib::ObjectBase(typeid(ListModelWrapper))
, Glib::Object()
- , Gtk::TreeModel()
, _treeview(treeview)
, _iconview(0)
, _context_menu(0)
=== modified file frontend/linux/linux_utilities/listmodel_wrapper.h
--- frontend/linux/linux_utilities/listmodel_wrapper.h 2013-12-05 13:10:03 +0000
+++ frontend/linux/linux_utilities/listmodel_wrapper.h 2014-10-16 10:33:12 +0000
@@ -232,9 +232,16 @@
//==============================================================================
-class ListModelWrapper : public Glib::Object, public Gtk::TreeModel,
- public Gtk::TreeDragDest, public Gtk::TreeDragSource,
- public base::trackable
+#if GLIB_CHECK_VERSION(2, 42, 0)
+class ListModelWrapper : public Gtk::TreeModel, public Glib::Object,
+ public Gtk::TreeDragDest, public Gtk::TreeDragSource,
+ public base::trackable
+#else
+class ListModelWrapper : public Glib::Object, public Gtk::TreeModel,
+ public Gtk::TreeDragDest, public Gtk::TreeDragSource,
+ public base::trackable
+
+#endif
{
friend class ColumnsModel;
protected:
|
GitWeb
