diff options
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile.gtk4 | 2 | ||||
| -rw-r--r-- | gi/overrides/Gdk.py | 258 | ||||
| -rw-r--r-- | gi/overrides/Gtk.py | 41 | ||||
| -rw-r--r-- | tests/__init__.py | 6 | ||||
| -rw-r--r-- | tests/test_atoms.py | 1 | ||||
| -rw-r--r-- | tests/test_cairo.py | 11 | ||||
| -rw-r--r-- | tests/test_gtk_template.py | 3 | ||||
| -rw-r--r-- | tests/test_overrides_gdk.py | 4 | ||||
| -rw-r--r-- | tests/test_overrides_gtk.py | 93 |
10 files changed, 221 insertions, 199 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b63296fd..a1a569b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -118,7 +118,6 @@ xenial-i386-py2: - bash -x ./.gitlab-ci/test-docker-old.sh gtk4: - allow_failure: true stage: build_and_test image: registry.gitlab.gnome.org/gnome/pygobject/gtk4:v1 script: diff --git a/.gitlab-ci/Dockerfile.gtk4 b/.gitlab-ci/Dockerfile.gtk4 index 7b650d1b..297a70d6 100644 --- a/.gitlab-ci/Dockerfile.gtk4 +++ b/.gitlab-ci/Dockerfile.gtk4 @@ -25,7 +25,7 @@ RUN git clone https://gitlab.freedesktop.org/wayland/wayland.git \ RUN git clone https://gitlab.gnome.org/GNOME/gtk.git \ && cd gtk \ - && git checkout 273189fc \ + && git checkout 833442e1e29e5 \ && meson -Dprefix=/usr -Dbuild-tests=false -Ddemos=false -Dbuild-examples=false -Dprint-backends=none _build \ && ninja -C _build \ && ninja -C _build install \ diff --git a/gi/overrides/Gdk.py b/gi/overrides/Gdk.py index a1ef5f97..44914db9 100644 --- a/gi/overrides/Gdk.py +++ b/gi/overrides/Gdk.py @@ -161,7 +161,7 @@ if Gdk._version == '2.0': Drawable = override(Drawable) __all__.append('Drawable') -else: +elif Gdk._version == '3.0': class Window(Gdk.Window): def __new__(cls, parent, attributes, attributes_mask): # Gdk.Window had to be made abstract, @@ -181,33 +181,25 @@ if Gdk._version in ("2.0", "3.0"): Gdk.EventType._2BUTTON_PRESS = getattr(Gdk.EventType, "2BUTTON_PRESS") Gdk.EventType._3BUTTON_PRESS = getattr(Gdk.EventType, "3BUTTON_PRESS") - -class Event(Gdk.Event): - _UNION_MEMBERS = { - Gdk.EventType.DELETE: 'any', - Gdk.EventType.DESTROY: 'any', - Gdk.EventType.EXPOSE: 'expose', - Gdk.EventType.MOTION_NOTIFY: 'motion', - Gdk.EventType.BUTTON_PRESS: 'button', - Gdk.EventType.BUTTON_RELEASE: 'button', - Gdk.EventType.KEY_PRESS: 'key', - Gdk.EventType.KEY_RELEASE: 'key', - Gdk.EventType.ENTER_NOTIFY: 'crossing', - Gdk.EventType.LEAVE_NOTIFY: 'crossing', - Gdk.EventType.FOCUS_CHANGE: 'focus_change', - Gdk.EventType.CONFIGURE: 'configure', - Gdk.EventType.MAP: 'any', - Gdk.EventType.UNMAP: 'any', - Gdk.EventType.PROXIMITY_IN: 'proximity', - Gdk.EventType.PROXIMITY_OUT: 'proximity', - Gdk.EventType.DRAG_ENTER: 'dnd', - Gdk.EventType.DRAG_LEAVE: 'dnd', - Gdk.EventType.DRAG_MOTION: 'dnd', - Gdk.EventType.DROP_START: 'dnd', - } - - if Gdk._version in ("2.0", "3.0"): - _UNION_MEMBERS.update({ + class Event(Gdk.Event): + _UNION_MEMBERS = { + Gdk.EventType.DELETE: 'any', + Gdk.EventType.DESTROY: 'any', + Gdk.EventType.MOTION_NOTIFY: 'motion', + Gdk.EventType.BUTTON_PRESS: 'button', + Gdk.EventType.BUTTON_RELEASE: 'button', + Gdk.EventType.KEY_PRESS: 'key', + Gdk.EventType.KEY_RELEASE: 'key', + Gdk.EventType.ENTER_NOTIFY: 'crossing', + Gdk.EventType.LEAVE_NOTIFY: 'crossing', + Gdk.EventType.FOCUS_CHANGE: 'focus_change', + Gdk.EventType.CONFIGURE: 'configure', + Gdk.EventType.PROXIMITY_IN: 'proximity', + Gdk.EventType.PROXIMITY_OUT: 'proximity', + Gdk.EventType.DRAG_ENTER: 'dnd', + Gdk.EventType.DRAG_LEAVE: 'dnd', + Gdk.EventType.DRAG_MOTION: 'dnd', + Gdk.EventType.DROP_START: 'dnd', Gdk.EventType._2BUTTON_PRESS: 'button', Gdk.EventType._3BUTTON_PRESS: 'button', Gdk.EventType.PROPERTY_NOTIFY: 'property', @@ -218,116 +210,110 @@ class Event(Gdk.Event): Gdk.EventType.DROP_FINISHED: 'dnd', Gdk.EventType.CLIENT_EVENT: 'client', Gdk.EventType.VISIBILITY_NOTIFY: 'visibility', - }) - - if Gdk._version == '2.0': - _UNION_MEMBERS[Gdk.EventType.NO_EXPOSE] = 'no_expose' - - if hasattr(Gdk.EventType, 'TOUCH_BEGIN'): - _UNION_MEMBERS.update( - { - Gdk.EventType.TOUCH_BEGIN: 'touch', - Gdk.EventType.TOUCH_UPDATE: 'touch', - Gdk.EventType.TOUCH_END: 'touch', - Gdk.EventType.TOUCH_CANCEL: 'touch', - }) - - def __getattr__(self, name): - real_event = getattr(self, '_UNION_MEMBERS').get(self.type) - if real_event: - return getattr(getattr(self, real_event), name) - else: - raise AttributeError("'%s' object has no attribute '%s'" % (self.__class__.__name__, name)) - - def __setattr__(self, name, value): - real_event = getattr(self, '_UNION_MEMBERS').get(self.type) - if real_event: - setattr(getattr(self, real_event), name, value) - else: - Gdk.Event.__setattr__(self, name, value) - - def __repr__(self): - base_repr = Gdk.Event.__repr__(self).strip("><") - return "<%s type=%r>" % (base_repr, self.type) - - -Event = override(Event) -__all__.append('Event') - -# manually bind GdkEvent members to GdkEvent - -modname = globals()['__name__'] -module = sys.modules[modname] - -# right now we can't get the type_info from the -# field info so manually list the class names -event_member_classes = ['EventAny', - 'EventExpose', - 'EventMotion', - 'EventButton', - 'EventScroll', - 'EventKey', - 'EventCrossing', - 'EventFocus', - 'EventConfigure', - 'EventProximity', - 'EventDND', - 'EventSetting', - 'EventGrabBroken'] - -if Gdk._version in ("2.0", "3.0"): - event_member_classes.extend([ - 'EventVisibility', - 'EventProperty', - 'EventSelection', - 'EventOwnerChange', - 'EventWindowState', - 'EventVisibility', - ]) - -if Gdk._version == '2.0': - event_member_classes.append('EventNoExpose') - -if hasattr(Gdk, 'EventTouch'): - event_member_classes.append('EventTouch') - - -# whitelist all methods that have a success return we want to mask -gsuccess_mask_funcs = ['get_state', - 'get_axis', - 'get_coords', - 'get_root_coords'] - - -for event_class in event_member_classes: - override_class = type(event_class, (getattr(Gdk, event_class),), {}) - # add the event methods - for method_info in Gdk.Event.__info__.get_methods(): - name = method_info.get_name() - event_method = getattr(Gdk.Event, name) - # python2 we need to use the __func__ attr to avoid internal - # instance checks - event_method = getattr(event_method, '__func__', event_method) - - # use the _gsuccess_mask decorator if this method is whitelisted - if name in gsuccess_mask_funcs: - event_method = strip_boolean_result(event_method) - setattr(override_class, name, event_method) - - setattr(module, event_class, override_class) - __all__.append(event_class) - -# end GdkEvent overrides - - -class DragContext(Gdk.DragContext): - def finish(self, success, del_, time): - Gtk = get_introspection_module('Gtk') - Gtk.drag_finish(self, success, del_, time) + Gdk.EventType.EXPOSE: 'expose', + Gdk.EventType.MAP: 'any', + Gdk.EventType.UNMAP: 'any', + } + + if Gdk._version == '2.0': + _UNION_MEMBERS[Gdk.EventType.NO_EXPOSE] = 'no_expose' + + if hasattr(Gdk.EventType, 'TOUCH_BEGIN'): + _UNION_MEMBERS.update( + { + Gdk.EventType.TOUCH_BEGIN: 'touch', + Gdk.EventType.TOUCH_UPDATE: 'touch', + Gdk.EventType.TOUCH_END: 'touch', + Gdk.EventType.TOUCH_CANCEL: 'touch', + }) + + def __getattr__(self, name): + real_event = getattr(self, '_UNION_MEMBERS').get(self.type) + if real_event: + return getattr(getattr(self, real_event), name) + else: + raise AttributeError("'%s' object has no attribute '%s'" % (self.__class__.__name__, name)) + + def __setattr__(self, name, value): + real_event = getattr(self, '_UNION_MEMBERS').get(self.type) + if real_event: + setattr(getattr(self, real_event), name, value) + else: + Gdk.Event.__setattr__(self, name, value) + def __repr__(self): + base_repr = Gdk.Event.__repr__(self).strip("><") + return "<%s type=%r>" % (base_repr, self.type) + + Event = override(Event) + __all__.append('Event') + + # manually bind GdkEvent members to GdkEvent + + modname = globals()['__name__'] + module = sys.modules[modname] + + # right now we can't get the type_info from the + # field info so manually list the class names + event_member_classes = ['EventAny', + 'EventExpose', + 'EventMotion', + 'EventButton', + 'EventScroll', + 'EventKey', + 'EventCrossing', + 'EventFocus', + 'EventConfigure', + 'EventProximity', + 'EventDND', + 'EventSetting', + 'EventGrabBroken', + 'EventVisibility', + 'EventProperty', + 'EventSelection', + 'EventOwnerChange', + 'EventWindowState', + 'EventVisibility'] -DragContext = override(DragContext) -__all__.append('DragContext') + if Gdk._version == '2.0': + event_member_classes.append('EventNoExpose') + + if hasattr(Gdk, 'EventTouch'): + event_member_classes.append('EventTouch') + + # whitelist all methods that have a success return we want to mask + gsuccess_mask_funcs = ['get_state', + 'get_axis', + 'get_coords', + 'get_root_coords'] + + for event_class in event_member_classes: + override_class = type(event_class, (getattr(Gdk, event_class),), {}) + # add the event methods + for method_info in Gdk.Event.__info__.get_methods(): + name = method_info.get_name() + event_method = getattr(Gdk.Event, name) + # python2 we need to use the __func__ attr to avoid internal + # instance checks + event_method = getattr(event_method, '__func__', event_method) + + # use the _gsuccess_mask decorator if this method is whitelisted + if name in gsuccess_mask_funcs: + event_method = strip_boolean_result(event_method) + setattr(override_class, name, event_method) + + setattr(module, event_class, override_class) + __all__.append(event_class) + + # end GdkEvent overrides + + class DragContext(Gdk.DragContext): + def finish(self, success, del_, time): + Gtk = get_introspection_module('Gtk') + Gtk.drag_finish(self, success, del_, time) + + DragContext = override(DragContext) + __all__.append('DragContext') class Cursor(Gdk.Cursor): diff --git a/gi/overrides/Gtk.py b/gi/overrides/Gtk.py index 05da18aa..736c8d88 100644 --- a/gi/overrides/Gtk.py +++ b/gi/overrides/Gtk.py @@ -141,15 +141,17 @@ class Widget(Gtk.Widget): super(Widget, self).freeze_child_notify() return _FreezeNotifyManager(self) - def drag_dest_set_target_list(self, target_list): - if (target_list is not None) and (not isinstance(target_list, Gtk.TargetList)): - target_list = Gtk.TargetList.new(_construct_target_list(target_list)) - super(Widget, self).drag_dest_set_target_list(target_list) - - def drag_source_set_target_list(self, target_list): - if (target_list is not None) and (not isinstance(target_list, Gtk.TargetList)): - target_list = Gtk.TargetList.new(_construct_target_list(target_list)) - super(Widget, self).drag_source_set_target_list(target_list) + if Gtk._version != "4.0": + def drag_dest_set_target_list(self, target_list): + if (target_list is not None) and (not isinstance(target_list, Gtk.TargetList)): + target_list = Gtk.TargetList.new(_construct_target_list(target_list)) + super(Widget, self).drag_dest_set_target_list(target_list) + + if Gtk._version != "4.0": + def drag_source_set_target_list(self, target_list): + if (target_list is not None) and (not isinstance(target_list, Gtk.TargetList)): + target_list = Gtk.TargetList.new(_construct_target_list(target_list)) + super(Widget, self).drag_source_set_target_list(target_list) def style_get_property(self, property_name, value=None): if value is None: @@ -184,8 +186,6 @@ class Container(Gtk.Container, Widget): # alias for Python 2.x object protocol __nonzero__ = __bool__ - get_focus_chain = strip_boolean_result(Gtk.Container.get_focus_chain) - def child_get_property(self, child, property_name, value=None): if value is None: prop = self.find_child_property(property_name) @@ -197,15 +197,18 @@ class Container(Gtk.Container, Widget): Gtk.Container.child_get_property(self, child, property_name, value) return value.get_value() - def child_get(self, child, *prop_names): - """Returns a list of child property values for the given names.""" - return [self.child_get_property(child, name) for name in prop_names] + if Gtk._version in ("2.0", "3.0"): + def child_get(self, child, *prop_names): + """Returns a list of child property values for the given names.""" + return [self.child_get_property(child, name) for name in prop_names] + + def child_set(self, child, **kwargs): + """Set a child properties on the given child to key/value pairs.""" + for name, value in kwargs.items(): + name = name.replace('_', '-') + self.child_set_property(child, name, value) - def child_set(self, child, **kwargs): - """Set a child properties on the given child to key/value pairs.""" - for name, value in kwargs.items(): - name = name.replace('_', '-') - self.child_set_property(child, name, value) + get_focus_chain = strip_boolean_result(Gtk.Container.get_focus_chain) Container = override(Container) diff --git a/tests/__init__.py b/tests/__init__.py index 79b8c808..3723b073 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -134,7 +134,11 @@ def init_test_environ(): except ImportError: pass else: - if not Gtk.init_check([])[0]: + if Gtk._version == "4.0": + res = Gtk.init_check() + else: + res = Gtk.init_check([])[0] + if not res: raise RuntimeError("Gtk available, but Gtk.init_check() failed") diff --git a/tests/test_atoms.py b/tests/test_atoms.py index 0081a029..0068723b 100644 --- a/tests/test_atoms.py +++ b/tests/test_atoms.py @@ -24,6 +24,7 @@ def is_X11(): @unittest.skipUnless(Gdk, 'Gdk not available') +@unittest.skipIf(Gdk._version == "4.0", 'Gdk4 doesn\'t have GdkAtom') class TestGdkAtom(unittest.TestCase): def test_create(self): atom = Gdk.Atom.intern('my_string', False) diff --git a/tests/test_cairo.py b/tests/test_cairo.py index 18e5d62a..8ccbe15a 100644 --- a/tests/test_cairo.py +++ b/tests/test_cairo.py @@ -180,9 +180,16 @@ class TestRegion(unittest.TestCase): @unittest.skipUnless(has_cairo, 'built without cairo support') @unittest.skipUnless(Gtk, 'Gtk not available') class TestPango(unittest.TestCase): + def test_cairo_font_options(self): - screen = Gtk.Window().get_screen() - font_opts = screen.get_font_options() + window = Gtk.Window() + if Gtk._version == "4.0": + window.set_font_options(cairo.FontOptions()) + font_opts = window.get_font_options() + else: + screen = window.get_screen() + font_opts = screen.get_font_options() + assert font_opts is not None self.assertTrue(isinstance(font_opts.get_subpixel_order(), int)) diff --git a/tests/test_gtk_template.py b/tests/test_gtk_template.py index f0cc963d..ee197d0f 100644 --- a/tests/test_gtk_template.py +++ b/tests/test_gtk_template.py @@ -390,6 +390,9 @@ def test_check_decorated_class(): with pytest.raises(TypeError, match=".*on Widgets.*"): Gtk.Template.from_string("")(object()) + +@pytest.mark.skipif(Gtk._version == "4.0", reason="errors out first with gtk4") +def test_subclass_fail(): @Gtk.Template.from_string("") class Base(Gtk.Widget): __gtype_name__ = new_gtype_name() diff --git a/tests/test_overrides_gdk.py b/tests/test_overrides_gdk.py index 1dfe8e31..9c366744 100644 --- a/tests/test_overrides_gdk.py +++ b/tests/test_overrides_gdk.py @@ -73,6 +73,7 @@ class TestGdk(unittest.TestCase): self.assertEqual(tuple(Gdk.RGBA(0.1, 0.2, 0.3, 0.4)), (0.1, 0.2, 0.3, 0.4)) + @unittest.skipIf(Gdk_version == "4.0", "not in gdk4") def test_event(self): event = Gdk.Event.new(Gdk.EventType.CONFIGURE) self.assertEqual(event.type, Gdk.EventType.CONFIGURE) @@ -82,6 +83,7 @@ class TestGdk(unittest.TestCase): event.type = Gdk.EventType.SCROLL self.assertRaises(AttributeError, lambda: getattr(event, 'foo_bar')) + @unittest.skipIf(Gdk_version == "4.0", "not in gdk4") def test_event_touch(self): event = Gdk.Event.new(Gdk.EventType.TOUCH_BEGIN) self.assertEqual(event.type, Gdk.EventType.TOUCH_BEGIN) @@ -94,6 +96,7 @@ class TestGdk(unittest.TestCase): self.assertTrue(event.emulating_pointer) self.assertTrue(event.touch.emulating_pointer) + @unittest.skipIf(Gdk_version == "4.0", "not in gdk4") def test_event_setattr(self): event = Gdk.Event.new(Gdk.EventType.DRAG_MOTION) event.x_root, event.y_root = 0, 5 @@ -106,6 +109,7 @@ class TestGdk(unittest.TestCase): self.assertFalse(hasattr(event, "foo_bar")) event.foo_bar = 42 + @unittest.skipIf(Gdk_version == "4.0", "not in gdk4") def test_event_repr(self): event = Gdk.Event.new(Gdk.EventType.CONFIGURE) self.assertTrue("CONFIGURE" in repr(event)) diff --git a/tests/test_overrides_gtk.py b/tests/test_overrides_gtk.py index 1e365525..ced6e2be 100644 --- a/tests/test_overrides_gtk.py +++ b/tests/test_overrides_gtk.py @@ -37,6 +37,9 @@ def gtkver(): Gtk.get_micro_version()) +GTK4 = (Gtk._version == "4.0") + + @contextlib.contextmanager def realized(widget): """Makes sure the widget is realized. @@ -49,7 +52,10 @@ def realized(widget): if isinstance(widget, Gtk.Window): toplevel = widget else: - toplevel = widget.get_parent_window() + if Gtk._version == "4.0": + toplevel = widget.get_parent_surface() + else: + toplevel = widget.get_parent_window() if toplevel is None: window = Gtk.Window() @@ -81,18 +87,21 @@ def test_freeze_child_notif(): c = Gtk.Button() c.connect("child-notify", on_notify) c.freeze_child_notify() - b.pack_start(c, True, True, 0) - b.child_set_property(c, "expand", False) - b.child_set_property(c, "expand", True) + if GTK4: + b.pack_start(c) + else: + b.pack_start(c, True, True, 0) + b.child_set_property(c, "pack-type", Gtk.PackType.END) + b.child_set_property(c, "pack-type", Gtk.PackType.START) c.thaw_child_notify() - assert events.count("expand") == 1 + assert events.count("pack-type") == 1 del events[:] with c.freeze_child_notify(): - b.child_set_property(c, "expand", True) - b.child_set_property(c, "expand", False) + b.child_set_property(c, "pack-type", Gtk.PackType.END) + b.child_set_property(c, "pack-type", Gtk.PackType.START) - assert events.count("expand") == 1 + assert events.count("pack-type") == 1 @unittest.skipUnless(Gtk, 'Gtk not available') @@ -102,6 +111,12 @@ def test_wrapper_toggle_refs(): Gtk.Button.__init__(self) self._height = height + def do_measure(self, orientation, for_size): + if orientation == Gtk.Orientation.VERTICAL: + return (self._height, self._height, -1, -1) + else: + return (0, 0, -1, -1) + def do_get_preferred_height(self): return (self._height, self._height) @@ -109,11 +124,16 @@ def test_wrapper_toggle_refs(): w = Gtk.Window() b = MyButton(height) w.add(b) - b.show_all() + if not GTK4: + b.show_all() del b gc.collect() gc.collect() - assert w.get_preferred_size().minimum_size.height == height + if GTK4: + # XXX: Why? + assert w.get_preferred_size().minimum_size.height == height + 10 + else: + assert w.get_preferred_size().minimum_size.height == height @unittest.skipUnless(Gtk, 'Gtk not available') @@ -257,8 +277,8 @@ class TestGtk(unittest.TestCase): def test_dialog_classes(self): self.assertEqual(Gtk.Dialog, gi.overrides.Gtk.Dialog) self.assertEqual(Gtk.FileChooserDialog, gi.overrides.Gtk.FileChooserDialog) - self.assertEqual(Gtk.RecentChooserDialog, gi.overrides.Gtk.RecentChooserDialog) - if Gtk_version != "4.0": + if not GTK4: + self.assertEqual(Gtk.RecentChooserDialog, gi.overrides.Gtk.RecentChooserDialog) self.assertEqual(Gtk.ColorSelectionDialog, gi.overrides.Gtk.ColorSelectionDialog) self.assertEqual(Gtk.FontSelectionDialog, gi.overrides.Gtk.FontSelectionDialog) @@ -401,6 +421,7 @@ class TestGtk(unittest.TestCase): self.assertTrue(isinstance(dialog, Gtk.Window)) self.assertEqual('font selection dialog test', dialog.get_title()) + @unittest.skipIf(GTK4, "not in gtk4") def test_recent_chooser_dialog(self): test_manager = Gtk.RecentManager() dialog = Gtk.RecentChooserDialog(title='recent chooser dialog test', @@ -578,7 +599,10 @@ class TestGtk(unittest.TestCase): widget.drag_dest_set_track_motion(True) widget.drag_dest_get_target_list() widget.drag_dest_set_target_list(None) - widget.drag_dest_set_target_list(Gtk.TargetList.new([Gtk.TargetEntry.new('test', 0, 0)])) + if GTK4: + widget.drag_dest_set_target_list(Gdk.ContentFormats.new([])) + else: + widget.drag_dest_set_target_list(Gtk.TargetList.new([Gtk.TargetEntry.new('test', 0, 0)])) widget.drag_dest_unset() widget.drag_highlight() @@ -590,22 +614,26 @@ class TestGtk(unittest.TestCase): widget.drag_source_add_text_targets() widget.drag_source_add_uri_targets() widget.drag_source_set_icon_name("_About") - widget.drag_source_set_icon_pixbuf(GdkPixbuf.Pixbuf()) - if Gtk_version != "4.0": + if not GTK4: + widget.drag_source_set_icon_pixbuf(GdkPixbuf.Pixbuf()) widget.drag_source_set_icon_stock(Gtk.STOCK_ABOUT) widget.drag_source_get_target_list() widget.drag_source_set_target_list(None) - widget.drag_source_set_target_list(Gtk.TargetList.new([Gtk.TargetEntry.new('test', 0, 0)])) + if GTK4: + widget.drag_source_set_target_list(Gdk.ContentFormats.new([])) + else: + widget.drag_source_set_target_list(Gtk.TargetList.new([Gtk.TargetEntry.new('test', 0, 0)])) widget.drag_source_unset() # these methods cannot be called because they require a valid drag on # a real GdkWindow. So we only check that they exist and are callable. - if Gtk_version != "4.0": + if not GTK4: self.assertTrue(hasattr(widget, 'drag_dest_set_proxy')) self.assertTrue(hasattr(widget, 'drag_get_data')) @unittest.skipIf(sys.platform == "darwin", "crashes") - def test_drag_target_list(self): + @unittest.skipIf(GTK4, "uses lots of gtk3 only api") + def test_drag_target_list_gtk3(self): mixed_target_list = [Gtk.TargetEntry.new('test0', 0, 0), ('test1', 1, 1), Gtk.TargetEntry.new('test2', 2, 2), @@ -765,12 +793,12 @@ class TestSignals(unittest.TestCase): self._alloc_value = None self._alloc_error = None - def do_size_allocate(self, alloc): + def do_size_allocate(self, *args): self._alloc_called = True - self._alloc_value = alloc + self._alloc_value = args[0] try: - Gtk.ScrolledWindow.do_size_allocate(self, alloc) + Gtk.ScrolledWindow.do_size_allocate(self, *args) except Exception as e: self._alloc_error = e @@ -782,7 +810,10 @@ class TestSignals(unittest.TestCase): with realized(win): win.show() win.get_preferred_size() - win.size_allocate(rect) + if GTK4: + win.size_allocate(rect, 0) + else: + win.size_allocate(rect) self.assertTrue(win._alloc_called) self.assertIsInstance(win._alloc_value, Gdk.Rectangle) self.assertTrue(win._alloc_error is None, win._alloc_error) @@ -2329,7 +2360,7 @@ class TestContainer(unittest.TestCase): box = Gtk.Box() child = Gtk.Button() if Gtk_version == "4.0": - box.pack_start(child, expand=False, fill=True) + box.pack_start(child) else: box.pack_start(child, expand=False, fill=True, padding=42) with self.assertRaises(ValueError): @@ -2351,19 +2382,3 @@ class TestContainer(unittest.TestCase): self.assertEqual(expand, False) self.assertEqual(fill, False) self.assertEqual(padding, 21) - - @unittest.skipIf(Gtk_version != "4.0", "only in gtk4") - def test_child_get_and_set_gtk4(self): - # padding got removed in gtk4 - box = Gtk.Box() - child = Gtk.Button() - box.pack_start(child, expand=True, fill=True) - - expand, fill = box.child_get(child, 'expand', 'fill') - self.assertEqual(expand, True) - self.assertEqual(fill, True) - - box.child_set(child, expand=False, fill=False, pack_type=1) - expand, fill, pack_type = box.child_get(child, 'expand', 'fill', 'pack-type') - self.assertEqual(expand, False) - self.assertEqual(fill, False) |