Use gtk_separator_new() instead gtk_[v|h]separator_new()

[~andy/gtk] / examples / calendar / calendar.c

diff --git a/examples/calendar/calendar.c b/examples/calendar/calendar.c
index 2be27c336b577081103fd367097c516eda57e74c..06312063c53948c2880340263ff0280f3a0b66f7 100644 (file)
--- a/examples/calendar/calendar.c
+++ b/examples/calendar/calendar.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998 Cesar Miquel, Shawn T. Amundson, Mattias Grönlund
+ * Copyright (C) 1998 Cesar Miquel, Shawn T. Amundson, Mattias Grönlund
  * Copyright (C) 2000 Tony Gale
  *
  * This program is free software; you can redistribute it and/or modify
@@ -160,7 +160,7 @@ static void calendar_set_flags( CalendarData *calendar )
        options = options + (1 << i);
       }
   if (calendar->window)
-    gtk_calendar_display_options (GTK_CALENDAR (calendar->window), options);
+    gtk_calendar_set_display_options (GTK_CALENDAR (calendar->window), options);
 }
 
 static void calendar_toggle_flag( GtkWidget    *toggle,
@@ -286,7 +286,7 @@ static void create_calendar( void )
 
   hbox = gtk_hbox_new (FALSE, DEF_PAD);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, DEF_PAD);
-  hbbox = gtk_hbutton_box_new ();
+  hbbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_box_pack_start (GTK_BOX (hbox), hbbox, FALSE, FALSE, DEF_PAD);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (hbbox), GTK_BUTTONBOX_SPREAD);
   gtk_box_set_spacing (GTK_BOX (hbbox), 5);
@@ -322,7 +322,7 @@ static void create_calendar( void )
                    &calendar_data);
 
 
-  separator = gtk_vseparator_new ();
+  separator = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
   gtk_box_pack_start (GTK_BOX (hbox), separator, FALSE, TRUE, 0);
 
   vbox2 = gtk_vbox_new (FALSE, DEF_PAD);
@@ -384,7 +384,7 @@ static void create_calendar( void )
   calendar_data.prev2_sig = gtk_label_new ("");
   gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev2_sig, FALSE, TRUE, 0);
 
-  bbox = gtk_hbutton_box_new ();
+  bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
 
@@ -393,7 +393,7 @@ static void create_calendar( void )
                    G_CALLBACK (gtk_main_quit),
                    NULL);
   gtk_container_add (GTK_CONTAINER (bbox), button);
-  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default (button, TRUE);
   gtk_widget_grab_default (button);
 
   gtk_widget_show_all (window);