1 files changed, 113 insertions, 121 deletions
diff --git a/docs/guide/code/cairo-demo.py b/docs/guide/code/cairo-demo.py
index f5ac1122..17a01b84 100755
--- a/docs/guide/code/cairo-demo.py
+++ b/docs/guide/code/cairo-demo.py
@@ -1,133 +1,125 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 Based on cairo-demo/X11/cairo-demo.c
 """
 
 import cairo
 import gi
-gi.require_version("Gtk", "3.0")
+
+gi.require_version('Gtk', '4.0')
 from gi.repository import Gtk
 
 SIZE = 30
 
 
-def triangle(ctx):
-    ctx.move_to(SIZE, 0)
-    ctx.rel_line_to(SIZE, 2 * SIZE)
-    ctx.rel_line_to(-2 * SIZE, 0)
-    ctx.close_path()
-
-
-def square(ctx):
-    ctx.move_to(0, 0)
-    ctx.rel_line_to(2 * SIZE, 0)
-    ctx.rel_line_to(0, 2 * SIZE)
-    ctx.rel_line_to(-2 * SIZE, 0)
-    ctx.close_path()
-
-
-def bowtie(ctx):
-    ctx.move_to(0, 0)
-    ctx.rel_line_to(2 * SIZE, 2 * SIZE)
-    ctx.rel_line_to(-2 * SIZE, 0)
-    ctx.rel_line_to(2 * SIZE, -2 * SIZE)
-    ctx.close_path()
-
-
-def inf(ctx):
-    ctx.move_to(0, SIZE)
-    ctx.rel_curve_to(0, SIZE, SIZE, SIZE, 2 * SIZE, 0)
-    ctx.rel_curve_to(SIZE, -SIZE, 2 * SIZE, -SIZE, 2 * SIZE, 0)
-    ctx.rel_curve_to(0, SIZE, -SIZE, SIZE, - 2 * SIZE, 0)
-    ctx.rel_curve_to(-SIZE, -SIZE, - 2 * SIZE, -SIZE, - 2 * SIZE, 0)
-    ctx.close_path()
-
-
-def draw_shapes(ctx, x, y, fill):
-    ctx.save()
-
-    ctx.new_path()
-    ctx.translate(x + SIZE, y + SIZE)
-    bowtie(ctx)
-    if fill:
-        ctx.fill()
-    else:
-        ctx.stroke()
-
-    ctx.new_path()
-    ctx.translate(3 * SIZE, 0)
-    square(ctx)
-    if fill:
-        ctx.fill()
-    else:
-        ctx.stroke()
-
-    ctx.new_path()
-    ctx.translate(3 * SIZE, 0)
-    triangle(ctx)
-    if fill:
-        ctx.fill()
-    else:
-        ctx.stroke()
-
-    ctx.new_path()
-    ctx.translate(3 * SIZE, 0)
-    inf(ctx)
-    if fill:
-        ctx.fill()
-    else:
-        ctx.stroke()
-
-    ctx.restore()
-
-
-def fill_shapes(ctx, x, y):
-    draw_shapes(ctx, x, y, True)
-
-
-def stroke_shapes(ctx, x, y):
-    draw_shapes(ctx, x, y, False)
-
-
-def draw(da, ctx):
-    ctx.set_source_rgb(0, 0, 0)
-
-    ctx.set_line_width(SIZE / 4)
-    ctx.set_tolerance(0.1)
-
-    ctx.set_line_join(cairo.LINE_JOIN_ROUND)
-    ctx.set_dash([SIZE / 4.0, SIZE / 4.0], 0)
-    stroke_shapes(ctx, 0, 0)
-
-    ctx.set_dash([], 0)
-    stroke_shapes(ctx, 0, 3 * SIZE)
-
-    ctx.set_line_join(cairo.LINE_JOIN_BEVEL)
-    stroke_shapes(ctx, 0, 6 * SIZE)
-
-    ctx.set_line_join(cairo.LINE_JOIN_MITER)
-    stroke_shapes(ctx, 0, 9 * SIZE)
-
-    fill_shapes(ctx, 0, 12 * SIZE)
-
-    ctx.set_line_join(cairo.LINE_JOIN_BEVEL)
-    fill_shapes(ctx, 0, 15 * SIZE)
-    ctx.set_source_rgb(1, 0, 0)
-    stroke_shapes(ctx, 0, 15 * SIZE)
-
-
-def main():
-    win = Gtk.Window()
-    win.connect('destroy', lambda w: Gtk.main_quit())
-    win.set_default_size(450, 550)
-
-    drawingarea = Gtk.DrawingArea()
-    win.add(drawingarea)
-    drawingarea.connect('draw', draw)
-
-    win.show_all()
-    Gtk.main()
-
+class Application(Gtk.Application):
+
+    def do_activate(self):
+        window = Gtk.ApplicationWindow(application=self, default_width=450, default_height=600)
+
+        drawing_area = Gtk.DrawingArea()
+        drawing_area.set_draw_func(self.draw)
+        window.set_child(drawing_area)
 
-if __name__ == '__main__':
-    main()
+        window.present()
+
+    def triangle(self, ctx):
+        ctx.move_to(SIZE, 0)
+        ctx.rel_line_to(SIZE, 2 * SIZE)
+        ctx.rel_line_to(-2 * SIZE, 0)
+        ctx.close_path()
+
+    def square(self, ctx):
+        ctx.move_to(0, 0)
+        ctx.rel_line_to(2 * SIZE, 0)
+        ctx.rel_line_to(0, 2 * SIZE)
+        ctx.rel_line_to(-2 * SIZE, 0)
+        ctx.close_path()
+
+    def bowtie(self, ctx):
+        ctx.move_to(0, 0)
+        ctx.rel_line_to(2 * SIZE, 2 * SIZE)
+        ctx.rel_line_to(-2 * SIZE, 0)
+        ctx.rel_line_to(2 * SIZE, -2 * SIZE)
+        ctx.close_path()
+
+    def inf(self, ctx):
+        ctx.move_to(0, SIZE)
+        ctx.rel_curve_to(0, SIZE, SIZE, SIZE, 2 * SIZE, 0)
+        ctx.rel_curve_to(SIZE, -SIZE, 2 * SIZE, -SIZE, 2 * SIZE, 0)
+        ctx.rel_curve_to(0, SIZE, -SIZE, SIZE, - 2 * SIZE, 0)
+        ctx.rel_curve_to(-SIZE, -SIZE, - 2 * SIZE, -SIZE, - 2 * SIZE, 0)
+        ctx.close_path()
+
+    def draw_shapes(self, ctx, x, y, fill):
+        ctx.save()
+
+        ctx.new_path()
+        ctx.translate(x + SIZE, y + SIZE)
+        self.bowtie(ctx)
+        if fill:
+            ctx.fill()
+        else:
+            ctx.stroke()
+
+        ctx.new_path()
+        ctx.translate(3 * SIZE, 0)
+        self.square(ctx)
+        if fill:
+            ctx.fill()
+        else:
+            ctx.stroke()
+
+        ctx.new_path()
+        ctx.translate(3 * SIZE, 0)
+        self.triangle(ctx)
+        if fill:
+            ctx.fill()
+        else:
+            ctx.stroke()
+
+        ctx.new_path()
+        ctx.translate(3 * SIZE, 0)
+        self.inf(ctx)
+        if fill:
+            ctx.fill()
+        else:
+            ctx.stroke()
+
+        ctx.restore()
+
+    def fill_shapes(self, ctx, x, y):
+        self.draw_shapes(ctx, x, y, True)
+
+    def stroke_shapes(self, ctx, x, y):
+        self.draw_shapes(ctx, x, y, False)
+
+    def draw(self, da, ctx, width, height):
+        ctx.set_source_rgb(0, 0, 0)
+
+        ctx.set_line_width(SIZE / 4)
+        ctx.set_tolerance(0.1)
+
+        ctx.set_line_join(cairo.LINE_JOIN_ROUND)
+        ctx.set_dash([SIZE / 4.0, SIZE / 4.0], 0)
+        self.stroke_shapes(ctx, 0, 0)
+
+        ctx.set_dash([], 0)
+        self.stroke_shapes(ctx, 0, 3 * SIZE)
+
+        ctx.set_line_join(cairo.LINE_JOIN_BEVEL)
+        self.stroke_shapes(ctx, 0, 6 * SIZE)
+
+        ctx.set_line_join(cairo.LINE_JOIN_MITER)
+        self.stroke_shapes(ctx, 0, 9 * SIZE)
+
+        self.fill_shapes(ctx, 0, 12 * SIZE)
+
+        ctx.set_line_join(cairo.LINE_JOIN_BEVEL)
+        self.fill_shapes(ctx, 0, 15 * SIZE)
+        ctx.set_source_rgb(1, 0, 0)
+        self.stroke_shapes(ctx, 0, 15 * SIZE)
+
+
+app = Application()
+app.run()