From bfaa26425fba104ce7a0e47d149f0ae57a38abf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 4 Nov 2016 12:10:00 +0100 Subject: [PATCH] Fallback to gtk.combo_box_new_text when gtk.ComboBoxText is not available issue6008 review29711002 --- tryton/gui/window/win_csv.py | 5 ++++- tryton/gui/window/win_export.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tryton/gui/window/win_csv.py b/tryton/gui/window/win_csv.py index d3cb79f49b..4beaa1a944 100644 --- a/tryton/gui/window/win_csv.py +++ b/tryton/gui/window/win_csv.py @@ -157,7 +157,10 @@ class WinCSV(NoModal): label_csv_enc = gtk.Label(_("Encoding:")) label_csv_enc.set_alignment(1, 0.5) table.attach(label_csv_enc, 0, 1, 1, 2) - self.csv_enc = gtk.ComboBoxText() + if hasattr(gtk, 'ComboBoxText'): + self.csv_enc = gtk.ComboBoxText() + else: + self.csv_enc = gtk.combo_box_new_text() for i, encoding in enumerate(encodings): self.csv_enc.append_text(encoding) if ((os.name == 'nt' and encoding == 'cp1252') diff --git a/tryton/gui/window/win_export.py b/tryton/gui/window/win_export.py index ff61277596..d9ffdd7ecf 100644 --- a/tryton/gui/window/win_export.py +++ b/tryton/gui/window/win_export.py @@ -77,7 +77,10 @@ class WinExport(WinCSV): def add_chooser(self, box): hbox_csv_export = gtk.HBox() box.pack_start(hbox_csv_export, False, True, 0) - self.saveas = gtk.ComboBoxText() + if hasattr(gtk, 'ComboBoxText'): + self.saveas = gtk.ComboBoxText() + else: + self.saveas = gtk.combo_box_new_text() hbox_csv_export.pack_start(self.saveas, True, True, 0) self.saveas.append_text(_("Open")) self.saveas.append_text(_("Save"))