Bug#391792: [PATCH] Fix GUIs to work with python-wxgtk2.6

[Jérémy Bobbio]

On Mon, Oct 09, 2006 at 12:34:36AM +0200, Jérémy Bobbio wrote:
> Attached is a patch that will make btcompletedirgui and btmaketorrentgui
> working with python-wxgtk2.6.  It can replace the current
> 12_make_guis_use_2.4 patch.

*ahem*

Here it is.

Regards,
-- 
Jérémy

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

@DPATCH@
diff -urNad bittornado-0.3.15~/btcompletedirgui.py 
bittornado-0.3.15/btcompletedirgui.py
--- bittornado-0.3.15~/btcompletedirgui.py      2004-05-09 14:07:20.000000000 
+0200
+++ bittornado-0.3.15/btcompletedirgui.py       2006-10-09 00:30:01.890241250 
+0200
@@ -58,7 +59,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 +81,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 +124,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)
diff -urNad bittornado-0.3.15~/btmaketorrentgui.py 
bittornado-0.3.15/btmaketorrentgui.py
--- bittornado-0.3.15~/btmaketorrentgui.py      2004-07-02 17:39:32.000000000 
+0200
+++ bittornado-0.3.15/btmaketorrentgui.py       2006-10-09 00:30:29.455964000 
+0200
@@ -60,7 +61,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 +125,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)

signature.asc
Description: Digital signature