Index: iagno/gnothello.h
===================================================================
--- iagno/gnothello.h	(リビジョン 7387)
+++ iagno/gnothello.h	(作業コピー)
@@ -67,9 +67,9 @@
 void free_str (GtkWidget * widget, void *data);
 void load_tiles_callback (GtkWidget * widget, void *data);
 void cancel (GtkWidget * widget, void *data);
-gint expose_event (GtkWidget * widget, GdkEventExpose * event);
-gint configure_event (GtkWidget * widget, GdkEventConfigure * event);
-gint button_press_event (GtkWidget * widget, GdkEventButton * event);
+gboolean expose_event (GtkWidget * widget, GdkEventExpose * event);
+gboolean configure_event (GtkWidget * widget, GdkEventConfigure * event);
+gboolean button_press_event (GtkWidget * widget, GdkEventButton * event);
 void gui_draw_pixmap (gint which, gint x, gint y);
 void gui_draw_pixmap_buffer (gint which, gint x, gint y);
 gint flip_pixmaps (gpointer data);
Index: iagno/gnothello.c
===================================================================
--- iagno/gnothello.c	(リビジョン 7387)
+++ iagno/gnothello.c	(作業コピー)
@@ -303,7 +303,7 @@
   show_properties_dialog ();
 }
 
-gint
+gboolean
 expose_event (GtkWidget * widget, GdkEventExpose * event)
 {
   gdk_draw_drawable (widget->window,
@@ -341,7 +341,7 @@
   return TRUE;
 }
 
-gint
+gboolean
 button_press_event (GtkWidget * widget, GdkEventButton * event)
 {
   guint x, y;
@@ -619,12 +619,7 @@
   GtkWidget *table;
 
   window = gnome_app_new ("iagno", _(APP_NAME_LONG));
-
   games_conf_add_window (GTK_WINDOW (window), NULL);
-
-  notebook = gtk_notebook_new ();
-  gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE);
-
   gtk_widget_realize (window);
   gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
   g_signal_connect (G_OBJECT (window), "delete_event",
@@ -632,61 +627,48 @@
 
   gnome_app_create_menus (GNOME_APP (window), mainmenu);
 
-  drawing_area = gtk_drawing_area_new ();
-
-  gtk_widget_pop_colormap ();
-
+  notebook = gtk_notebook_new ();
   gnome_app_set_contents (GNOME_APP (window), notebook);
+  gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE);
+
+  drawing_area = gtk_drawing_area_new ();
   gtk_notebook_append_page (GTK_NOTEBOOK (notebook), drawing_area, NULL);
   gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), MAIN_PAGE);
-
+// gtk_widget_pop_colormap ();
   gtk_widget_set_size_request (GTK_WIDGET (drawing_area),
 			       BOARDWIDTH, BOARDHEIGHT);
+  gtk_widget_set_events (drawing_area,
+			 GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK);
   g_signal_connect (G_OBJECT (drawing_area), "expose_event",
 		    G_CALLBACK (expose_event), NULL);
-  g_signal_connect (G_OBJECT (window), "configure_event",
+  g_signal_connect (G_OBJECT (drawing_area), "configure_event",
 		    G_CALLBACK (configure_event), NULL);
   g_signal_connect (G_OBJECT (drawing_area), "button_press_event",
 		    G_CALLBACK (button_press_event), NULL);
-  gtk_widget_set_events (drawing_area,
-			 GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK);
   /* We do our own double-buffering. */
   gtk_widget_set_double_buffered (drawing_area, FALSE);
 
-  gtk_widget_show (drawing_area);
-
   appbar = GNOME_APPBAR (gnome_appbar_new (FALSE, TRUE, FALSE));
   gnome_app_set_statusbar (GNOME_APP (window), GTK_WIDGET (appbar));
   gnome_app_install_menu_hints (GNOME_APP (window), mainmenu);
 
   table = gtk_table_new (1, 8, FALSE);
+  gtk_box_pack_start (GTK_BOX (appbar), table, FALSE, TRUE, 0);
 
   black_score = gtk_label_new (_("Dark:"));
-  gtk_widget_show (black_score);
-
   gtk_table_attach (GTK_TABLE (table), black_score, 1, 2, 0, 1, 0, 0, 3, 1);
-
   black_score = gtk_label_new ("00");
-  gtk_widget_show (black_score);
-
   gtk_table_attach (GTK_TABLE (table), black_score, 2, 3, 0, 1, 0, 0, 3, 1);
 
   white_score = gtk_label_new (_("Light:"));
-  gtk_widget_show (white_score);
-
   gtk_table_attach (GTK_TABLE (table), white_score, 4, 5, 0, 1, 0, 0, 3, 1);
-
   white_score = gtk_label_new ("00");
-  gtk_widget_show (white_score);
-
   gtk_table_attach (GTK_TABLE (table), white_score, 5, 6, 0, 1, 0, 0, 3, 1);
+
   undo_set_sensitive (FALSE);
 
-  gtk_widget_show (table);
-
-  gtk_box_pack_start (GTK_BOX (appbar), table, FALSE, TRUE, 0);
-
   gnome_appbar_set_status (GNOME_APPBAR (appbar), _("Welcome to Iagno!"));
+  gtk_widget_show_all (window);
 }
 
 void
