[med-svn] [dicompyler] 05/15: Added removal of wxDIALOG_MODAL to the patch fixing wx

[Vojtech Kulvait]

This is an automated email from the git hooks/post-receive script.

kulvait-guest pushed a commit to branch master
in repository dicompyler.

commit 7dacc17d2dfff328e1f6a5371cce216fa65324b8
Author: Vojtěch Kulvait <kulvait at gmail.com>
Date:   Tue Sep 19 00:29:56 2017 +0200

    Added removal of wxDIALOG_MODAL to the patch fixing wx
---
 debian/patches/092017C_fixwx30.patch | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/patches/092017C_fixwx30.patch b/debian/patches/092017C_fixwx30.patch
index 8964f07..899b5de 100644
--- a/debian/patches/092017C_fixwx30.patch
+++ b/debian/patches/092017C_fixwx30.patch
@@ -1,7 +1,7 @@
 Author: Vojtěch Kulvait <kulvait at gmail.com>
 Last-Update: Mon Sep 18 23:00:00 CEST 2017
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=854837
-Description: PrevControlId is no longer method of wx.Window, SetSpacer become AssignSpacer
+Description: PrevControlId is no longer method of wx.Window, SetSpacer become AssignSpacer, wxDIALOG_MODAL is no longer valid identifier
 
 diff --git a/dicompyler/preferences.py b/dicompyler/preferences.py
 index 82ce7a3..7086af2 100755
@@ -20,3 +20,15 @@ index 82ce7a3..7086af2 100755
                      # Add control to the callback dict
                      self.callbackdict[c] = setting['callback']
                      self.Bind(wx.EVT_CHECKBOX, self.OnUpdateCheckbox, c)
+--- a/dicompyler/resources/guiutil.xrc
++++ b/dicompyler/resources/guiutil.xrc
+@@ -70,6 +70,6 @@
+     </object>
+     <title>Loading...</title>
+     <centered>1</centered>
+-    <style>wxCAPTION|wxSTAY_ON_TOP|wxDIALOG_MODAL</style>
++    <style>wxCAPTION|wxSTAY_ON_TOP</style>
+   </object>
+ </resource>
+\ No newline at end of file
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dicompyler.git