[pygobject/wip/mschraal/gtk4-container-removal] gtk overrides: Remove Container usage for GTK4
- From: Marinus Schraal <mschraal src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pygobject/wip/mschraal/gtk4-container-removal] gtk overrides: Remove Container usage for GTK4
- Date: Mon, 8 Jun 2020 14:37:24 +0000 (UTC)
commit 3fe55fd36b5e719f90f9f3a064dceac2ac2d929b
Author: Marinus Schraal <mschraal gnome org>
Date: Mon Jun 8 16:27:55 2020 +0200
gtk overrides: Remove Container usage for GTK4
gi/overrides/Gtk.py | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/gi/overrides/Gtk.py b/gi/overrides/Gtk.py
index 64a5088e..5092bca2 100644
--- a/gi/overrides/Gtk.py
+++ b/gi/overrides/Gtk.py
@@ -165,24 +165,23 @@ Widget = override(Widget)
__all__.append('Widget')
-class Container(Gtk.Container, Widget):
+if Gtk._version in ("2.0", "3.0"):
+ class Container(Gtk.Container, Widget):
- def __len__(self):
- return len(self.get_children())
+ def __len__(self):
+ return len(self.get_children())
- def __contains__(self, child):
- return child in self.get_children()
+ def __contains__(self, child):
+ return child in self.get_children()
- def __iter__(self):
- return iter(self.get_children())
+ def __iter__(self):
+ return iter(self.get_children())
- def __bool__(self):
- return True
+ def __bool__(self):
+ return True
- # alias for Python 2.x object protocol
- __nonzero__ = __bool__
-
- if Gtk._version in ("2.0", "3.0"):
+ # alias for Python 2.x object protocol
+ __nonzero__ = __bool__
def child_get_property(self, child, property_name, value=None):
if value is None:
@@ -207,9 +206,11 @@ class Container(Gtk.Container, Widget):
get_focus_chain = strip_boolean_result(Gtk.Container.get_focus_chain)
-
-Container = override(Container)
-__all__.append('Container')
+ Container = override(Container)
+ __all__.append('Container')
+else:
+ class Container(object):
+ pass
class Editable(Gtk.Editable):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]