nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge: doc: fixed some typos and other misc. corrections
[nit.git]
/
tests
/
test_gtk.nit
diff --git
a/tests/test_gtk.nit
b/tests/test_gtk.nit
index
290d4ef
..
28ee606
100644
(file)
--- a/
tests/test_gtk.nit
+++ b/
tests/test_gtk.nit
@@
-19,13
+19,13
@@
import gtk
class MyApp
super GtkCallable
class MyApp
super GtkCallable
- var win : GtkWindow
+ var win : GtkWindow is noinit
- var container : GtkContainer
+ var container : GtkContainer is noinit
- var lbl : GtkLabel
- var but_ok : GtkButton
- var but_cancel : GtkButton
+ var lbl : GtkLabel is noinit
+ var but_ok : GtkButton is noinit
+ var but_cancel : GtkButton is noinit
redef fun signal( sender, user_data )
do
redef fun signal( sender, user_data )
do
@@
-33,23
+33,23
@@
class MyApp
if sender == but_ok then
print "ok!"
if sender == but_ok then
print "ok!"
- quit_gtk
+ gtk_main_quit
else if sender == but_cancel then
print "cancel!"
else if sender == but_cancel then
print "cancel!"
- quit_gtk
+ gtk_main_quit
else
print sender
end
else
print sender
end
-
end
init
do
end
init
do
- init_gtk
+ gtk_init
- 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" )
win.add( container )
lbl = new GtkLabel( "Hello world" )
@@
-69,5
+69,5
@@
end
if "NIT_TESTING".environ != "true" then
var app = new MyApp
if "NIT_TESTING".environ != "true" then
var app = new MyApp
- run_gtk
+ gtk_main
end
end