[pygobject/wip/jfelder/gtk4-toolbutton: 2/2] gtk overrides: Drop Gtk.main for Gtk4
- From: Jean Felder <jfelder src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pygobject/wip/jfelder/gtk4-toolbutton: 2/2] gtk overrides: Drop Gtk.main for Gtk4
- Date: Mon, 16 Mar 2020 19:59:28 +0000 (UTC)
commit 8d94caf3798518f1e09312514b4ee8bbd7af0bd9
Author: Jean Felder <jean felder gmail com>
Date: Mon Mar 16 20:46:17 2020 +0100
gtk overrides: Drop Gtk.main for Gtk4
It has been removed (gtk commit
4dd780a96b1d37903ab88a4ae4536329cd9e164e)
The associated test is skipped for Gtk 4.
gi/overrides/Gtk.py | 24 +++++++++++-------------
tests/test_overrides_gtk.py | 1 +
2 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/gi/overrides/Gtk.py b/gi/overrides/Gtk.py
index 74555d16..b4213642 100644
--- a/gi/overrides/Gtk.py
+++ b/gi/overrides/Gtk.py
@@ -1614,22 +1614,20 @@ if Gtk._version == '3.0':
Menu = override(Menu)
__all__.append('Menu')
-_Gtk_main_quit = Gtk.main_quit
-
-
-@override(Gtk.main_quit)
-def main_quit(*args):
- _Gtk_main_quit()
-
+if Gtk._version in ("2.0", "3.0"):
+ _Gtk_main_quit = Gtk.main_quit
-_Gtk_main = Gtk.main
+ @override(Gtk.main_quit)
+ def main_quit(*args):
+ _Gtk_main_quit()
+ _Gtk_main = Gtk.main
-@override(Gtk.main)
-def main(*args, **kwargs):
- with register_sigint_fallback(Gtk.main_quit):
- with wakeup_on_signal():
- return _Gtk_main(*args, **kwargs)
+ @override(Gtk.main)
+ def main(*args, **kwargs):
+ with register_sigint_fallback(Gtk.main_quit):
+ with wakeup_on_signal():
+ return _Gtk_main(*args, **kwargs)
if Gtk._version in ("2.0", "3.0"):
diff --git a/tests/test_overrides_gtk.py b/tests/test_overrides_gtk.py
index 9c32e8ba..5c0fea97 100644
--- a/tests/test_overrides_gtk.py
+++ b/tests/test_overrides_gtk.py
@@ -812,6 +812,7 @@ class TestGtk(unittest.TestCase):
self.assertEqual(stock_item.stock_id, 'gtk-ok')
self.assertEqual(Gtk.stock_lookup('nosuchthing'), None)
+ @unittest.skipIf(Gtk_version == "4.0", "not in gtk4")
def test_gtk_main(self):
# with no arguments
GLib.idle_add(Gtk.main_quit)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]