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
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
|
Description: wxPython 3.0 support
Note: wxPython and wxWidgets are now separate source packages, so we only
want to check that the major and minor versions match.
Author: Olly Betts <olly@survex.com>
Last-Update: 2014-08-06
--- a/thuban.py
+++ b/thuban.py
@@ -11,7 +11,7 @@
import Thuban
import wxversion
-wxversion.select("2.8")
+wxversion.select("3.0")
# Put the Lib dir into the path. The Lib dir contains some extra non
# really Thuban specific Python modules
--- a/setup.py
+++ b/setup.py
@@ -71,7 +71,7 @@
# On POSIX-systems we run wxgtk-config to determine the C++-compiler
# flags
- wx_config_script = "wx-config --version=2.8"
+ wx_config_script = "wx-config --version=3.0"
# These lists will be filled automatically below
wx_cs_params = [[] for i in range(CS_NUM_PARAMS)]
--- a/Thuban/version.py
+++ b/Thuban/version.py
@@ -201,7 +201,7 @@
# Check whether the wxWindows version of wxPython and thuban's
# wxproj module match. If they don't match, segfaults are likely.
- if versions["wxproj-wx-tuple"] != versions["wxPython-tuple"][:3]:
+ if versions["wxproj-wx-tuple"][:2] != versions["wxPython-tuple"][:2]:
errors.append(_("Thuban was compiled with wx %(wxproj-wx)s"
" but wxPython is %(wxPython)s")
% versions)
--- a/Extensions/ogr/ogrdialog.py
+++ b/Extensions/ogr/ogrdialog.py
@@ -36,7 +36,7 @@
"""Initialize the dialog.
"""
wx.Dialog.__init__(self, parent, -1, _("Choose file format"),
- style = wx.DIALOG_MODAL|wx.CAPTION)
+ style = wx.CAPTION)
self.session = session
self.tables = []
@@ -116,7 +116,7 @@
"""Initialize the dialog.
"""
wx.Dialog.__init__(self, parent, -1, _("Choose layer"),
- style = wx.DIALOG_MODAL|wx.CAPTION)
+ style = wx.CAPTION)
self.tables = []
#
@@ -200,7 +200,7 @@
"""Initialize the dialog.
"""
wx.Dialog.__init__(self, parent, -1, _("Choose layer from database"),
- style = wx.DIALOG_MODAL|wx.CAPTION)
+ style = wx.CAPTION)
self.session = session
self.dbconns = self.session.DBConnections()
self.tables = []
@@ -348,7 +348,7 @@
"""Initialize the dialog.
"""
wx.Dialog.__init__(self, parent, -1, "Enter string for OGRConnection",
- style = wx.DIALOG_MODAL|wx.CAPTION)
+ style = wx.CAPTION)
self.session = session
# Sizer for the entire dialog
--- a/Thuban/UI/dbdialog.py
+++ b/Thuban/UI/dbdialog.py
@@ -40,7 +40,7 @@
def __init__(self, parent, session):
wx.Dialog.__init__(self, parent, -1, _("Choose layer from database"),
- style = wx.DIALOG_MODAL|wx.CAPTION)
+ style = wx.CAPTION)
self.session = session
self.dbconns = self.session.DBConnections()
self.tables = []
--- a/Thuban/UI/exceptiondialog.py
+++ b/Thuban/UI/exceptiondialog.py
@@ -23,7 +23,7 @@
def __init__(self, parent, message, title = _('Thuban: Internal Error')):
wx.Dialog.__init__(self, parent, -1, title,
wx.DefaultPosition,
- style = wx.RESIZE_BORDER|wx.CAPTION|wx.DIALOG_MODAL)
+ style = wx.RESIZE_BORDER|wx.CAPTION)
self.parent = parent
self.dialog_layout(message)
--- a/Thuban/UI/labeldialog.py
+++ b/Thuban/UI/labeldialog.py
@@ -25,7 +25,7 @@
def __init__(self, parent, table, shape_index):
wx.Dialog.__init__(self, parent, -1, _("Label Values"),
wx.DefaultPosition,
- style = wx.RESIZE_BORDER|wx.CAPTION|wx.DIALOG_MODAL)
+ style = wx.RESIZE_BORDER|wx.CAPTION)
self.parent = parent
self.dialog_layout(table, shape_index)
--- a/Extensions/mouseposition/mouseposition.py
+++ b/Extensions/mouseposition/mouseposition.py
@@ -101,7 +101,7 @@
# locator executed as an tool/extension to Thuban
iconfile = os.path.join(os.path.abspath(Thuban.__path__[0]),
"..", "Resources", "Bitmaps", "identify")
-iconfile = os.path.join(os.path.abspath(os.path.dirname(__file__)),
+iconfile = os.path.join('/usr/share/thuban/Extensions/mouseposition',
'position')
registry.Add(ToolCommand("mouse_position_tool", "Mouse Position Tool",
mouse_position_tool, icon = iconfile,
|
