diff options
Diffstat (limited to 'examples/rulers/rulers.c')
| -rw-r--r-- | examples/rulers/rulers.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/examples/rulers/rulers.c b/examples/rulers/rulers.c index fa933f172..f001e9f82 100644 --- a/examples/rulers/rulers.c +++ b/examples/rulers/rulers.c @@ -1,8 +1,7 @@ -/* example-start rulers rulers.c */ #include <gtk/gtk.h> -#define EVENT_METHOD(i, x) GTK_WIDGET_CLASS(GTK_OBJECT(i)->klass)->x +#define EVENT_METHOD(i, x) GTK_WIDGET_GET_CLASS(i)->x #define XSIZE 600 #define YSIZE 400 @@ -13,7 +12,7 @@ gint close_application( GtkWidget *widget, gpointer data ) { gtk_main_quit(); - return(FALSE); + return FALSE; } /* The main routine */ @@ -25,7 +24,7 @@ int main( int argc, gtk_init( &argc, &argv ); window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_signal_connect (GTK_OBJECT (window), "delete_event", + g_signal_connect (GTK_OBJECT (window), "delete_event", GTK_SIGNAL_FUNC( close_application ), NULL); gtk_container_set_border_width (GTK_CONTAINER (window), 10); @@ -34,7 +33,7 @@ int main( int argc, gtk_container_add( GTK_CONTAINER(window), table ); area = gtk_drawing_area_new(); - gtk_drawing_area_size( (GtkDrawingArea *)area, XSIZE, YSIZE ); + gtk_widget_set_size_request (GTK_WIDGET (area), XSIZE, YSIZE); gtk_table_attach( GTK_TABLE(table), area, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, GTK_FILL, 0, 0 ); gtk_widget_set_events( area, GDK_POINTER_MOTION_MASK | @@ -46,11 +45,10 @@ int main( int argc, hrule = gtk_hruler_new(); gtk_ruler_set_metric( GTK_RULER(hrule), GTK_PIXELS ); gtk_ruler_set_range( GTK_RULER(hrule), 7, 13, 0, 20 ); - gtk_signal_connect_object( GTK_OBJECT(area), "motion_notify_event", + g_signal_connect_swapped( GTK_OBJECT(area), "motion_notify_event", (GtkSignalFunc)EVENT_METHOD(hrule, motion_notify_event), GTK_OBJECT(hrule) ); - /* GTK_WIDGET_CLASS(GTK_OBJECT(hrule)->klass)->motion_notify_event, */ gtk_table_attach( GTK_TABLE(table), hrule, 1, 2, 0, 1, GTK_EXPAND|GTK_SHRINK|GTK_FILL, GTK_FILL, 0, 0 ); @@ -60,10 +58,9 @@ int main( int argc, vrule = gtk_vruler_new(); gtk_ruler_set_metric( GTK_RULER(vrule), GTK_PIXELS ); gtk_ruler_set_range( GTK_RULER(vrule), 0, YSIZE, 10, YSIZE ); - gtk_signal_connect_object( GTK_OBJECT(area), "motion_notify_event", - (GtkSignalFunc) - GTK_WIDGET_CLASS(GTK_OBJECT(vrule)->klass)-> - motion_notify_event, + g_signal_connect_swapped( GTK_OBJECT(area), "motion_notify_event", + (GtkSignalFunc)EVENT_METHOD(vrule, + motion_notify_event), GTK_OBJECT(vrule) ); gtk_table_attach( GTK_TABLE(table), vrule, 0, 1, 1, 2, GTK_FILL, GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0 ); @@ -76,6 +73,5 @@ int main( int argc, gtk_widget_show( window ); gtk_main(); - return(0); + return 0; } -/* example-end */ |