Commit f8fb0133 authored by Nicolas Boulenguez's avatar Nicolas Boulenguez

Apply patch from Olly Betts for wxPython 3.0. Closes: #759083.

Update changelog.
parent ba26babf
taskcoach (1.4.1-1) unstable; urgency=medium
* New upstream release. Repackage with xz.
* Replace embedded aui, agw and most pubsub with python-wxgtk3.0 versions.
[ Olly Betts <olly@survex.com> ]
* Update to use wxPython 3.0. Closes: #759083.
New patch: wxpy3.0-compat.patch.
-- Nicolas Boulenguez <nicolas@debian.org> Sun, 14 Sep 2014 20:57:04 +0200
taskcoach (1.4.0-2) unstable; urgency=medium
* Revert to Priority: optional. Possible because (Build-)Depends:
......
wxpy3.0-compat.patch
# Modify setup.py from tail to head to limit interferences.
appdata_xml.diff
do_not_install_buildlib.diff
......
Description: Update for wxPython 3.0
Should still be compatible with wxPython 2.8.
Author: Olly Betts <olly@survex.com>
Forwarded: private mail on 2014/09/14
Last-Update: 2014-08-18
--- a/taskcoachlib/gui/dialog/backupmanager.py
+++ b/taskcoachlib/gui/dialog/backupmanager.py
@@ -111,7 +111,7 @@
dlg = wx.FileDialog(self, _('Choose the restoration destination'),
defaultDir=os.path.dirname(filename),
defaultFile=os.path.split(filename)[-1],
- wildcard='*.tsk', style=wx.FD_SAVE|wx.OVERWRITE_PROMPT)
+ wildcard='*.tsk', style=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
try:
if dlg.ShowModal() == wx.ID_OK:
self.__filename = dlg.GetPath()
--- a/taskcoachlib/thirdparty/timeline/timeline.py
+++ b/taskcoachlib/thirdparty/timeline/timeline.py
@@ -385,7 +385,6 @@
def OnInit(self):
''' Initialise the application. '''
- wx.InitAllImageHandlers()
self.frame = wx.Frame(None)
self.frame.CreateStatusBar()
model = self.get_model(self.size)
--- a/taskcoachlib/widgets/dialog.py
+++ b/taskcoachlib/widgets/dialog.py
@@ -164,6 +164,6 @@
kwargs = {'message': _('Add attachment'),
'default_path': os.getcwd(),
'wildcard': _('All files (*.*)|*'),
- 'flags': wx.OPEN}
+ 'flags': wx.FD_OPEN}
kwargs.update(callerKeywordArguments)
return wx.FileSelector(**kwargs) # pylint: disable=W0142
--- a/taskcoachlib/widgets/hcalendar.py
+++ b/taskcoachlib/widgets/hcalendar.py
@@ -163,7 +163,7 @@
return self.__drawNow
def SetTodayColor(self, (r, g, b)):
- super(HierarchicalCalendar, self).SetTodayColor(wx.Color(r, g, b))
+ super(HierarchicalCalendar, self).SetTodayColor(wx.Colour(r, g, b))
def TodayColor(self):
color = super(HierarchicalCalendar, self).TodayColor()
--- a/taskcoachlib/workarounds/display.py
+++ b/taskcoachlib/workarounds/display.py
@@ -43,7 +43,7 @@
@staticmethod
def GetFromWindow(window):
- if window.GetWindowStyle() & wx.THICK_FRAME:
+ if window.GetWindowStyle() & wx.RESIZE_BORDER:
margin = wx.SystemSettings.GetMetric(wx.SYS_FRAMESIZE_X)
else:
margin = 0
--- a/tests/test.py
+++ b/tests/test.py
@@ -19,7 +19,7 @@
'''
import wxversion
-wxversion.select(["2.8-unicode", "3.0"], optionsRequired=True)
+wxversion.select("3.0")
import sys, unittest, os, time, wx, logging
projectRoot = os.path.abspath('..')
--- a/taskcoach.py
+++ b/taskcoach.py
@@ -36,7 +36,7 @@
# These checks are only necessary in a non-frozen environment, i.e. we
# skip these checks when run from a py2exe-fied application
import wxversion
- wxversion.select(["2.8-unicode", "3.0"], optionsRequired=True)
+ wxversion.select(["3.0"])
try:
import taskcoachlib # pylint: disable=W0611
except ImportError:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment