diff --git a/src/gtk-draw-hl-tmpl.f90 b/src/gtk-draw-hl-tmpl.f90
index c69e8739..2872b7d7 100644
--- a/src/gtk-draw-hl-tmpl.f90
+++ b/src/gtk-draw-hl-tmpl.f90
@@ -307,6 +307,9 @@ function hl_gtk_drawing_area_new(scroll, size, ssize, expose_event, &
 !!$GTK< 3.0!              & data_expose)
 !!$GTK>=3.0!         call g_signal_connect(plota, "draw"//c_null_char, expose_event, &
 !!$GTK>=3.0!              & data_expose)
+       else
+!!$GTK< 3.0!         call g_signal_connect(plota, "expose-event"//c_null_char, expose_event)
+!!$GTK>=3.0!         call g_signal_connect(plota, "draw"//c_null_char, expose_event) 
        endif
     else
 !!$GTK< 3.0!       call g_signal_connect(plota, "expose-event"//c_null_char, &
@@ -345,10 +348,11 @@ function hl_gtk_drawing_area_new(scroll, size, ssize, expose_event, &
     ! Scroll event
     if (present(scroll_event)) then
        if (present(data_scroll)) then
-          call g_signal_connect(plota, "scroll-event"//c_null_char, scroll_event, &
-               & data_scroll)
+          call g_signal_connect(plota, "scroll-event"//c_null_char, &
+               &scroll_event, data_scroll)
        else
-          call g_signal_connect(plota, "scroll-event"//c_null_char, scroll_event)
+          call g_signal_connect(plota, "scroll-event"//c_null_char, &
+               & scroll_event)
        endif
        if (auto_add == TRUE) mask = ior(mask, &
             & iand(GDK_SCROLL_MASK, insert_mask))
diff --git a/src/gtk-draw-hl.f90 b/src/gtk-draw-hl.f90
index c603645d..0b4d8be3 100644
--- a/src/gtk-draw-hl.f90
+++ b/src/gtk-draw-hl.f90
@@ -27,7 +27,7 @@
 
 ! --------------------------------------------------------
 ! gtk-draw-hl.f90
-! Generated: Mon Jul 30 21:32:03 2012 GMT
+! Generated: Tue Jul 31 14:13:05 2012 GMT
 ! Please do not edit this file directly,
 ! Edit gtk-draw-hl-tmpl.f90, and use ./mk_gtk_hl.pl to regenerate.
 ! Generated for GTK+ version: 2.24.0.
@@ -306,6 +306,9 @@ function hl_gtk_drawing_area_new(scroll, size, ssize, expose_event, &
               & data_expose)
 !!$GTK>=3.0!         call g_signal_connect(plota, "draw"//c_null_char, expose_event, &
 !!$GTK>=3.0!              & data_expose)
+       else
+         call g_signal_connect(plota, "expose-event"//c_null_char, expose_event)
+!!$GTK>=3.0!         call g_signal_connect(plota, "draw"//c_null_char, expose_event) 
        endif
     else
        call g_signal_connect(plota, "expose-event"//c_null_char, &
@@ -344,10 +347,11 @@ function hl_gtk_drawing_area_new(scroll, size, ssize, expose_event, &
     ! Scroll event
     if (present(scroll_event)) then
        if (present(data_scroll)) then
-          call g_signal_connect(plota, "scroll-event"//c_null_char, scroll_event, &
-               & data_scroll)
+          call g_signal_connect(plota, "scroll-event"//c_null_char, &
+               &scroll_event, data_scroll)
        else
-          call g_signal_connect(plota, "scroll-event"//c_null_char, scroll_event)
+          call g_signal_connect(plota, "scroll-event"//c_null_char, &
+               & scroll_event)
        endif
        if (auto_add == TRUE) mask = ior(mask, &
             & iand(GDK_SCROLL_MASK, insert_mask))