1
0
mirror of https://github.com/gryf/wicd.git synced 2025-12-19 20:38:00 +01:00

Really fix urwid 1.1.0 compatibility

This commit is contained in:
David Paleino
2012-11-16 10:22:47 +01:00
parent 1c3c316b50
commit ca87c05ff2

View File

@@ -352,7 +352,7 @@ class ComboBox(urwid.WidgetWrap):
if urwid.VERSION < (1, 1, 0): if urwid.VERSION < (1, 1, 0):
self.focus = focus self.focus = focus
else: else:
self.focus_position = focus self._w.focus_position = focus
self.callback = callback self.callback = callback
self.user_args = user_args self.user_args = user_args
@@ -368,7 +368,10 @@ class ComboBox(urwid.WidgetWrap):
if urwid.VERSION < (1, 1, 0): if urwid.VERSION < (1, 1, 0):
self.focus = index self.focus = index
else: else:
self.focus_position = index try:
self._w.focus_position = index
except IndexError:
pass
# API changed between urwid 0.9.8.4 and 0.9.9 # API changed between urwid 0.9.8.4 and 0.9.9
try: try:
@@ -386,7 +389,7 @@ class ComboBox(urwid.WidgetWrap):
if urwid.VERSION < (1, 1, 0): if urwid.VERSION < (1, 1, 0):
index = self.focus index = self.focus
else: else:
index = self.focus_position index = self._w.focus_position
self.cbox = DynWrap(SelText([self.list[index]+self.DOWN_ARROW]), self.cbox = DynWrap(SelText([self.list[index]+self.DOWN_ARROW]),
attrs=self.attrs,focus_attr=self.focus_attr) attrs=self.attrs,focus_attr=self.focus_attr)
@@ -434,7 +437,7 @@ class ComboBox(urwid.WidgetWrap):
if urwid.VERSION < (1, 1, 0): if urwid.VERSION < (1, 1, 0):
return None, self.focus return None, self.focus
else: else:
return None, self.focus_position return None, self._w.focus_position
def get_sensitive(self): def get_sensitive(self):
return self.cbox.get_sensitive() return self.cbox.get_sensitive()