examples & tests: update users of the gtk module

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/examples/calculator/Makefile b/examples/calculator/Makefile
index 6f9a0a3..dd66960 100644 (file)
--- a/examples/calculator/Makefile
+++ b/examples/calculator/Makefile
@@ -1,8 +1,7 @@
 all:
        mkdir -p bin/
 
-       # Compile in global mode to silence warnings on unused GTK deprecated
-       ../../bin/nitc --global --dir bin/ src/calculator_gtk.nit src/calculator_test.nit
+       ../../bin/nitc --dir bin/ src/calculator_gtk.nit src/calculator_test.nit
 
 android:
        mkdir -p bin/ res/

diff --git a/examples/calculator/src/calculator_gtk.nit b/examples/calculator/src/calculator_gtk.nit
index bd01986..7586230 100644 (file)
--- a/examples/calculator/src/calculator_gtk.nit
+++ b/examples/calculator/src/calculator_gtk.nit
@@ -55,10 +55,11 @@ class CalculatorGui
        do
                init_gtk
 
-               win = new GtkWindow(0)
+               win = new GtkWindow(new GtkWindowType.toplevel)
+               win.connect_destroy_signal_to_quit
 
-               container = new GtkGrid(5, 5, true)
-               win.add(container)
+               container = new GtkGrid
+               win.add container
 
                lbl_disp = new GtkLabel("_")
                container.attach(lbl_disp, 0, 0, 5, 1)

diff --git a/tests/test_gtk.nit b/tests/test_gtk.nit
index 510b5fb..4916f4b 100644 (file)
--- a/tests/test_gtk.nit
+++ b/tests/test_gtk.nit
@@ -47,9 +47,10 @@ class MyApp
        do
                init_gtk
 
-               win = new GtkWindow( 0 )
+               win = new GtkWindow(new GtkWindowType.toplevel)
+               win.connect_destroy_signal_to_quit
 
-               container = new GtkGrid(2,1,true)
+               container = new GtkGrid
                win.add( container )
 
                lbl = new GtkLabel( "Hello world" )