add more tests, fix links in docs (#616)

jwahlstrand · web-flow · commit 530da45c952c · 2022-01-18T07:48:38.000+01:00
* add misc. tests, fix links in docs

fix GtkBuilder iteration, a GtkStatusbar method, and gtk_init_with_args argument type

* test that GError throws
diff --git a/docs/src/doc/more_signals.md b/docs/src/doc/more_signals.md
@@ -16,7 +16,7 @@ where:
   (i.e., one defined as `function foo(x,y,z) ... end`), and the
   arguments and return type should match the GTK+ documentation for
   the widget and signal ([see
-  examples](https://developer.gnome.org/gtk3/stable/GtkWidget.html#GtkWidget-accel-closures-changed)).
+  examples](https://docs.gtk.org/gtk3/signal.Widget.accel-closures-changed.html)).
   **In contrast with the simpler
   interface, when writing these
   callbacks you must include the `user_data` argument**.  See examples below.
@@ -27,9 +27,9 @@ where:
   callback. Usually `Nothing` (for `void`) or `Cint` (for `gboolean`)
 - `parameter_type_tuple` specifies the types of the *middle* arguments
   to the callback function, omitting the first (the widget) and last
-  (`user_data`).  For example, for [`"clicked"`](https://developer.gnome.org/gtk3/stable/GtkButton.html#GtkButton-clicked) we have
+  (`user_data`).  For example, for [`"clicked"`](https://docs.gtk.org/gtk3/method.Button.clicked.html) we have
   `parameter_type_tuple = ()` (because there are no middle arguments)
-  and for [`"button-press-event"`](https://developer.gnome.org/gtk3/stable/GtkWidget.html#GtkWidget-button-press-event) we have `parameter_type_tuple =
+  and for [`"button-press-event"`](https://docs.gtk.org/gtk3/signal.Widget.button-press-event.html) we have `parameter_type_tuple =
   (Ptr{GdkEventButton},)`.
 - `after` is a boolean, `true` if you want your callback to run after
   the default handler for your signal. When in doubt, specify `false`.
diff --git a/docs/src/manual/signals.md b/docs/src/manual/signals.md
@@ -51,10 +51,10 @@ julia> GtkButton(action-name=NULL, action-target, related-action, use-action-app
 "Press me" was clicked!
 ```
 Notice that _both_ of the callback functions executed!
-Gtk+ allows you to define multiple signal handlers for a given object; even the execution order can be [specified](https://developer.gnome.org/gobject/stable/gobject-Signals.html#gobject-Signals.description).
-Callbacks for some [signals](https://developer.gnome.org/gtk3/stable/GtkWidget.html#GtkWidget-accel-closures-changed) require that you return an `Int32`, with value 0 if you want the next handler to run or 1 if you want to prevent any other handlers from running on this event.
+Gtk+ allows you to define multiple signal handlers for a given object; even the execution order can be [specified](https://docs.gtk.org/gobject/concepts.html#signals).
+Callbacks for some [signals](https://docs.gtk.org/gtk3/signal.Widget.accel-closures-changed.html) require that you return an `Int32`, with value 0 if you want the next handler to run or 1 if you want to prevent any other handlers from running on this event.
 
-The [`"clicked"` signal callback](https://developer.gnome.org/gtk3/stable/GtkButton.html#GtkButton-clicked) should return `nothing` (`void` in C parlance), so you can't prevent other callbacks from running.
+The [`"clicked"` signal callback](https://docs.gtk.org/gtk3/method.Button.clicked.html) should return `nothing` (`void` in C parlance), so you can't prevent other callbacks from running.
 However, we can disconnect the first signal handler:
 ```julia
 signal_handler_disconnect(b, id)
@@ -75,7 +75,7 @@ id = signal_connect(b, "button-press-event") do widget, event
 end
 ```
 Note that this signal requires two arguments, here `widget` and `event`, and that `event` contained useful information.
-Arguments and their meaning are described along with their corresponding [signals](https://developer.gnome.org/gtk3/stable/GtkWidget.html#GtkWidget-accel-closures-changed).
+Arguments and their meaning are described along with their corresponding [signals](https://docs.gtk.org/gtk3/signal.Widget.accel-closures-changed.html).
 **You should omit the final `user_data` argument described in the Gtk documentation**;
 keep in mind that you can always address other variables from inside your function block, or define the callback in terms of an anonymous function:
 ```julia
diff --git a/docs/src/manual/textwidgets.md b/docs/src/manual/textwidgets.md
@@ -22,7 +22,7 @@ GAccessor.markup(label,"""<b>My bold text</b>\n
                           <a href=\"https://www.gtk.org\"
                           title=\"Our website\">GTK+ website</a>""")
 ```
-The syntax for this markup text is borrowed from html and explained [here](https://developer.gnome.org/pango/stable/PangoMarkupFormat.html).
+The syntax for this markup text is borrowed from html and explained [here](https://docs.gtk.org/Pango/pango_markup.html).
 
 A label can be made selectable using
 ```julia
diff --git a/src/Gtk.jl b/src/Gtk.jl
@@ -155,7 +155,7 @@ function __init__()
 
     GError() do error_check
         ccall((:gtk_init_with_args, libgtk), Bool,
-            (Ptr{Nothing}, Ptr{Nothing}, Ptr{UInt8}, Ptr{Nothing}, Ptr{UInt8}, Ptr{GError}),
+            (Ptr{Nothing}, Ptr{Nothing}, Ptr{UInt8}, Ptr{Nothing}, Ptr{UInt8}, Ptr{Ptr{GError}}),
             C_NULL, C_NULL, "Julia Gtk Bindings", C_NULL, C_NULL, error_check)
     end
 
diff --git a/src/builder.jl b/src/builder.jl
@@ -35,7 +35,7 @@ function push!(builder::GtkBuilder; buffer = nothing, filename = nothing, resour
 end
 
 start_(builder::GtkBuilder) = glist_iter(ccall((:gtk_builder_get_objects, libgtk), Ptr{_GSList{GObject}}, (Ptr{GObject},), builder))
-iterate(w::GtkBuilder, list=start_(builder)) =
+iterate(builder::GtkBuilder, list=start_(builder)) =
    iterate(list[1], list)
 
 
diff --git a/src/displays.jl b/src/displays.jl
@@ -306,8 +306,8 @@ slice!(status::GtkStatusbar, context, message_id) =
     ccall((:gtk_statusbar_remove, libgtk), Ptr{GObject}, (Ptr{GObject}, Cuint, Cuint),
         status, context_id(status, context), message_id)
 empty!(status::GtkStatusbar, context) =
-    ccall((:gtk_statusbar_remove_all, libgtk), Ptr{GObject}, (Ptr{GObject}, Cuint, Cuint),
-        status, context_id(status, context), context_id(context))
+    ccall((:gtk_statusbar_remove_all, libgtk), Ptr{GObject}, (Ptr{GObject}, Cuint),
+        status, context_id(status, context))
 
 #GtkInfoBarLeaf() = GtkInfoBarLeaf(ccall((:gtk_info_bar_new, libgtk), Ptr{GObject}, ())
 
diff --git a/test/gui.jl b/test/gui.jl
@@ -48,6 +48,9 @@ mutable struct MyWindow <: Window
     end
 end
 
+# For testing callbacks
+click(b::Button) = ccall((:gtk_button_clicked,Gtk.libgtk),Nothing,(Ptr{Gtk.GObject},),b)
+
 @testset "gui" begin
 
 wdth, hght = screen_size()
@@ -85,6 +88,9 @@ visible(w,false)
 visible(w,true)
 @test visible(w) == true
 
+gw = Gtk.gdk_window(w)
+ox, oy = Gtk.get_origin(gw)
+
 hide(w)
 show(w)
 grab_focus(w)
@@ -292,8 +298,6 @@ id = signal_connect(b, "clicked") do widget
     counter::Int += 1
 end
 @test signal_handler_is_connected(b, id)
-# For testing callbacks
-click(b::Button) = ccall((:gtk_button_clicked,Gtk.libgtk),Nothing,(Ptr{Gtk.GObject},),b)
 
 @test counter == 0
 click(b)
@@ -320,12 +324,31 @@ pb=Pixbuf(data=icon, has_alpha=false)
 @test size(pb) == (40, 20)
 @test pb[1,1].g==0xff
 pb[10,10]=Gtk.RGB(0,0,0)
-b = Button(Image(pb))
-w = Window(b, "Icon button", 60, 40)
+pb[20:30,1:5]=Gtk.RGB(0xff,0,0)
+w = Window(Button(Image(pb)), "Icon button", 60, 40)
 showall(w)
+pb2=copy(pb)
+@test size(pb2,2) == size(pb)[2]
+pb3=Gtk.slice(pb2,11:20,11:20)
+@test size(pb3) == (10,10)
 destroy(w)
 end
 
+@testset "Transparent pixbuf" begin
+icon = Matrix{Gtk.RGBA}(undef, 40, 20)
+fill!(icon, Gtk.RGBA(0,0xff,0, 0xff))
+icon[5:end-5, 3:end-3] .= Ref(Gtk.RGBA(0,0,0xff,0x80))
+pb=Pixbuf(data=icon, has_alpha=true)
+@test eltype(pb) == Gtk.RGBA
+end
+
+@testset "Icon theme" begin
+img = Image(; icon_name = "document-open", size=:BUTTON)
+icon_theme = Gtk.icon_theme_get_default()
+pb=Gtk.icon_theme_load_icon_for_scale(icon_theme, "document-open", 60, 60, Gtk.GConstants.GtkIconLookupFlags.GTK_ICON_LOOKUP_NO_SVG)
+@test isa(pb,GdkPixbuf)
+end
+
 @testset "checkbox" begin
 w = Window("Checkbutton")
 check = CheckButton("check me"); push!(w,check)
@@ -475,6 +498,9 @@ combo = ComboBoxText(true)
 for c in choices
     push!(combo, c)
 end
+pushfirst!(combo, "Rocky road")
+insert!(combo, 3, "Pistachio")
+delete!(combo, 3)
 w = Window(combo, "ComboBoxText with entry")|>showall
 destroy(w)
 end
@@ -503,16 +529,18 @@ pb = ProgressBar()
 w = Window(pb, "Progress bar")|>showall
 set_gtk_property!(pb,:fraction,0.7)
 @test get_gtk_property(pb,:fraction,Float64) == 0.7
+pulse(pb)
 destroy(w)
 end
 
 @testset "spinner" begin
 s = Spinner()
 w = Window(s, "Spinner")|>showall
-set_gtk_property!(s,:active,true)
+start(s)
 @test get_gtk_property(s,:active,Bool) == true
-set_gtk_property!(s,:active,false)
+stop(s)
 @test get_gtk_property(s,:active,Bool) == false
+
 destroy(w)
 end
 
@@ -555,6 +583,10 @@ function cb_sbpop(ptr,evt,id)
 end
 on_signal_button_press(cb_sbpush, bpush, false, ctxid)
 on_signal_button_press(cb_sbpop, bpop, false, ctxid)
+
+click(bpush)
+click(bpop)
+empty!(sb,ctxid)
 destroy(w)
 end
 
@@ -698,6 +730,7 @@ select!(selmodel, it)
 iter = selected(selmodel)
 @test TreeModel(tmSorted)[iter, 1] == 35
 
+empty!(ls)
 
 destroy(w)
 end
@@ -835,6 +868,17 @@ end
     destroy(w)
 end
 
+@testset "Builder" begin
+b=Builder(;filename="test.glade")
+widgets = [w for w in b]
+@test length(widgets)==length(b)
+button = b["a_button"]
+@test isa(button,Button)
+@test isa(b[1],Gtk.GtkWidget)
+
+@test_throws ErrorException b2 = Builder(;filename="test2.glade")
+end
+
 @testset "Subtyping from GObject" begin
 
 w = MyWindow()
diff --git a/test/test.glade b/test/test.glade
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.38.2 -->
+<interface>
+  <requires lib="gtk+" version="3.24"/>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
+  </object>
+  <object class="GtkWindow">
+    <property name="can-focus">False</property>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkButton" id="a_button">
+            <property name="label" translatable="yes">Text</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="an_entry">
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScale" id="a_scale">
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="adjustment">adjustment1</property>
+            <property name="round-digits">1</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
