#! /bin/sh /usr/share/dpatch/dpatch-run
## 12_make_guis_use_2.4.dpatch by Jérémy Bobbio <jeremy.bobbio@etu.upmc.fr>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix GUIs to work on python-wxgtk2.6.

@DPATCH@
--- bittornado.orig/btcompletedirgui.py
+++ bittornado/btcompletedirgui.py
@@ -58,7 +58,7 @@
 
         b = wxBoxSizer(wxHORIZONTAL)
         b.Add(self.dirCtl, 1, wxEXPAND)
-#        b.Add(10, 10, 0, wxEXPAND)
+        b.Add((10, 10), 0, wxEXPAND)
         button = wxButton(panel, -1, 'select')
         b.Add(button, 0, wxEXPAND)
         EVT_BUTTON(frame, button.GetId(), self.select)
@@ -80,7 +80,7 @@
         border = wxBoxSizer(wxVERTICAL)
         border.Add(gridSizer, 0, wxEXPAND | wxNORTH | wxEAST | wxWEST, 25)
         b2 = wxButton(panel, -1, 'make')
-#        border.Add(10, 10, 1, wxEXPAND)
+        border.Add((10, 10), 1, wxEXPAND)
         border.Add(b2, 0, wxALIGN_CENTER | wxSOUTH, 20)
         EVT_BUTTON(frame, b2.GetId(), self.complete)
         panel.SetSizer(border)
@@ -123,7 +123,7 @@
         gridSizer.Add(self.currentLabel, 0, wxEXPAND)
         self.gauge = wxGauge(panel, -1, range = 1000, style = wxGA_SMOOTH)
         gridSizer.Add(self.gauge, 0, wxEXPAND)
-        gridSizer.Add(10, 10, 1, wxEXPAND)
+        gridSizer.Add((10, 10), 1, wxEXPAND)
         self.button = wxButton(panel, -1, 'cancel')
         gridSizer.Add(self.button, 0, wxALIGN_CENTER)
         gridSizer.AddGrowableRow(2)
--- bittornado.orig/btmaketorrentgui.py
+++ bittornado/btmaketorrentgui.py
@@ -60,7 +60,7 @@
         b = wxBoxSizer(wxHORIZONTAL)
         self.dirCtl = wxTextCtrl(panel, -1, '')
         b.Add(self.dirCtl, 1, wxEXPAND)
-#        b.Add(10, 10, 0, wxEXPAND)
+        b.Add((10, 10), 0, wxEXPAND)
         
         button = wxButton(panel, -1, 'dir', size = (30,20))
         EVT_BUTTON(frame, button.GetId(), self.selectdir)
@@ -124,14 +124,14 @@
         border = wxBoxSizer(wxVERTICAL)
         border.Add(gridSizer, 0, wxEXPAND | wxNORTH | wxEAST | wxWEST, 25)
         b2 = wxButton(panel, -1, 'make')
-#        border.Add(10, 10, 1, wxEXPAND)
+        border.Add((10, 10), 1, wxEXPAND)
         border.Add(b2, 0, wxALIGN_CENTER | wxSOUTH, 20)
         EVT_BUTTON(frame, b2.GetId(), self.complete)
         panel.SetSizer(border)
         panel.SetAutoLayout(True)
 
-#        panel.DragAcceptFiles(True)
-#        EVT_DROP_FILES(panel, self.selectdrop)
+        panel.DragAcceptFiles(True)
+        EVT_DROP_FILES(panel, self.selectdrop)
 
     def selectdir(self, x):
         dl = wxDirDialog(self.frame, style = wxDD_DEFAULT_STYLE | wxDD_NEW_DIR_BUTTON)
@@ -139,7 +139,7 @@
             self.dirCtl.SetValue(dl.GetPath())
 
     def selectfile(self, x):
-        dl = wxFileDialog (self.frame, 'Choose file or directory to use', '', '', '', wxOPEN)
+        dl = wxFileDialog (self.frame, 'Choose file or directory to use', style = wxOPEN)
         if dl.ShowModal() == wxID_OK:
             self.dirCtl.SetValue(dl.GetPath())