further enhancements for the GTK wrapper

6 files changed, 7 insertions, 8 deletions

diff --git a/examples/gtk/ex2.nim b/examples/gtk/ex2.nim
index 59178978b..fab64cef5 100755
--- a/examples/gtk/ex2.nim
+++ b/examples/gtk/ex2.nim
@@ -11,7 +11,7 @@ var
 
 nimrod_init()
 window = window_new(WINDOW_TOPLEVEL)
-button = button_new_with_label("Click me")
+button = button_new("Click me")
 set_border_width(PContainer(Window), 5)
 add(PContainer(window), button)
 discard signal_connect(window, "destroy", 
diff --git a/examples/gtk/ex3.nim b/examples/gtk/ex3.nim
index 257ec3eda..3b39c07ce 100755
--- a/examples/gtk/ex3.nim
+++ b/examples/gtk/ex3.nim
@@ -3,7 +3,7 @@ import
   glib2, gtk2
 
 proc newbutton(ALabel: cstring): PWidget = 
-  Result = button_new_with_label(ALabel)
+  Result = button_new(ALabel)
   show(result)
 
 proc destroy(widget: pWidget, data: pgpointer){.cdecl.} = 
diff --git a/examples/gtk/ex4.nim b/examples/gtk/ex4.nim
index 753590b65..2964042de 100755
--- a/examples/gtk/ex4.nim
+++ b/examples/gtk/ex4.nim
@@ -3,7 +3,7 @@ import
   glib2, gtk2
 
 proc newbutton(ALabel: cstring): PWidget = 
-  Result = button_new_with_label(ALabel)
+  Result = button_new(ALabel)
   show(result)
 
 proc destroy(widget: pWidget, data: pgpointer){.cdecl.} = 
diff --git a/examples/gtk/ex5.nim b/examples/gtk/ex5.nim
index 29d80626e..841ebc681 100755
--- a/examples/gtk/ex5.nim
+++ b/examples/gtk/ex5.nim
@@ -10,7 +10,7 @@ proc widgetDestroy(w: PWidget) {.cdecl.} =
 
 nimrod_init()
 var window = window_new(WINDOW_TOPLEVEL)
-var button = button_new_with_label("Click me")
+var button = button_new("Click me")
 set_border_width(Window, 5)
 add(window, button)
 discard signal_connect(window, "destroy", 
diff --git a/examples/gtk/ex6.nim b/examples/gtk/ex6.nim
index 6801f527b..4e4c3e864 100755
--- a/examples/gtk/ex6.nim
+++ b/examples/gtk/ex6.nim
@@ -24,13 +24,12 @@ proc disablesignal(widget: pWidget, data: pgpointer){.cdecl.} =
   s.disable = not s.disable
 
 var 
-  quitsignal: guint
   QuitState: TButtonSignalState
 
 nimrod_init()
 var window = window_new(WINDOW_TOPLEVEL)
-var quitbutton = button_new_with_label("Quit program")
-var disablebutton = button_new_with_label("Disable button")
+var quitbutton = button_new("Quit program")
+var disablebutton = button_new("Disable button")
 var windowbox = vbox_new(TRUE, 10)
 pack_start(windowbox, disablebutton, True, false, 0)
 pack_start(windowbox, quitbutton, True, false, 0)
diff --git a/examples/gtk/ex9.nim b/examples/gtk/ex9.nim
index 9dcb866f7..1481e6be1 100755
--- a/examples/gtk/ex9.nim
+++ b/examples/gtk/ex9.nim
@@ -15,7 +15,7 @@ var
 nimrod_init()
 var window = window_new(gtk2.WINDOW_TOPLEVEL)
 var stackbox = vbox_new(TRUE, 10)
-var button1 = button_new_with_label("Move mouse over button")
+var button1 = button_new("Move mouse over button")
 var buttonstyle = copy(get_style(Button1))
 ButtonStyle.bg[STATE_PRELIGHT].pixel = 0
 ButtonStyle.bg[STATE_PRELIGHT].red = -1'i16