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
|
Description: Fixes for wxPython 3.0 compatibility
Author: Olly Betts <olly@survex.com>
Forwarded: no
Last-Update: 2014-08-07
--- a/tools/standaloneBuilder/standaloneBuilder.py
+++ b/tools/standaloneBuilder/standaloneBuilder.py
@@ -389,7 +389,7 @@
wildcard = "Script files (*.py)|*.py;*.PY|All files (*.*)|*.*"
basepath = os.path.join(self.cfg.get('ConfigData', 'projects'), self.components.baseDir.text)
current = self.components.scriptList.items
- result = dialog.openFileDialog(self, title, basepath, '', wildcard, wx.MULTIPLE)
+ result = dialog.openFileDialog(self, title, basepath, '', wildcard, wx.FD_MULTIPLE)
if result.accepted:
for p in result.paths:
path = os.path.basename(p)
@@ -1146,7 +1146,7 @@
def addItem(self, title, basepath, wildcard, current, refpath=None):
x = current[:]
- result = dialog.openFileDialog(self, title, basepath, '', wildcard, wx.MULTIPLE)
+ result = dialog.openFileDialog(self, title, basepath, '', wildcard, wx.FD_MULTIPLE)
if result.accepted:
for p in result.paths:
if not os.path.exists(p):
--- a/model.py
+++ b/model.py
@@ -390,7 +390,6 @@
# KEA 2004-01-02
# moved colourdb initialization to work with wxPython 2.5
# which requires a wxApp instance to exist before using colourdb
- wx.InitAllImageHandlers()
wx.App.__init__(self, 0)
colourdb.updateColourDB()
|
