From: Bastian Germann <bage@debian.org>
Description: Port to GTK 3
---
diff --git a/help.c b/help.c
index 0bcb7bc..1f76910 100644
--- a/help.c
+++ b/help.c
@@ -60,55 +60,55 @@ create_window_about (void)
   GtkWidget *button1;
 
   window1 = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_object_set_data (GTK_OBJECT (window1), "window_about", window1);
+  g_object_set_data (G_OBJECT (window1), "window_about", window1);
   gtk_window_set_title (GTK_WINDOW (window1), "About LMemory");
 
-  vbox2 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_ref (vbox2);
-  gtk_object_set_data_full (GTK_OBJECT (window1), "vbox2", vbox2,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  g_object_ref (vbox2);
+  g_object_set_data_full (G_OBJECT (window1), "vbox2", vbox2,
+                            (GDestroyNotify) g_object_unref);
   gtk_widget_show (vbox2);
   gtk_container_add (GTK_CONTAINER (window1), vbox2);
 
   label_about = gtk_label_new ("LMemory\nMemory Card Game\nby Xiaoguang Zhang");
-  gtk_widget_ref (label_about);
-  gtk_object_set_data_full (GTK_OBJECT (window1), "label_about", label_about,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  g_object_ref (label_about);
+  g_object_set_data_full (G_OBJECT (window1), "label_about", label_about,
+                            (GDestroyNotify) g_object_unref);
   gtk_widget_show (label_about);
   gtk_box_pack_start (GTK_BOX (vbox2), label_about, FALSE, FALSE, 5);
-  gtk_misc_set_padding (GTK_MISC (label_about), 11, 0);
+  gtk_widget_set_margin_start (label_about, 11);
 
   label_about_version = gtk_label_new ("version");
-  gtk_widget_ref (label_about_version);
-  gtk_object_set_data_full (GTK_OBJECT (window1), "label_about_version", label_about_version,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  g_object_ref (label_about_version);
+  g_object_set_data_full (G_OBJECT (window1), "label_about_version", label_about_version,
+                            (GDestroyNotify) g_object_unref);
   gtk_widget_show (label_about_version);
   gtk_box_pack_start (GTK_BOX (vbox2), label_about_version, FALSE, FALSE, 0);
 
   label_about_date = gtk_label_new ("date");
-  gtk_widget_ref (label_about_date);
-  gtk_object_set_data_full (GTK_OBJECT (window1), "label_about_date", label_about_date,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  g_object_ref (label_about_date);
+  g_object_set_data_full (G_OBJECT (window1), "label_about_date", label_about_date,
+                            (GDestroyNotify) g_object_unref);
   gtk_widget_show (label_about_date);
   gtk_box_pack_start (GTK_BOX (vbox2), label_about_date, FALSE, FALSE, 0);
 
-  hbuttonbox1 = gtk_hbutton_box_new ();
-  gtk_widget_ref (hbuttonbox1);
-  gtk_object_set_data_full (GTK_OBJECT (window1), "hbuttonbox1", hbuttonbox1,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  hbuttonbox1 = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
+  g_object_ref (hbuttonbox1);
+  g_object_set_data_full (G_OBJECT (window1), "hbuttonbox1", hbuttonbox1,
+                            (GDestroyNotify) g_object_unref);
   gtk_widget_show (hbuttonbox1);
   gtk_box_pack_start (GTK_BOX (vbox2), hbuttonbox1, TRUE, TRUE, 0);
 
   button1 = gtk_button_new_with_label ("OK");
-  gtk_widget_ref (button1);
-  gtk_object_set_data_full (GTK_OBJECT (window1), "button1", button1,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  g_object_ref (button1);
+  g_object_set_data_full (G_OBJECT (window1), "button1", button1,
+                            (GDestroyNotify) g_object_unref);
   gtk_widget_show (button1);
   gtk_container_add (GTK_CONTAINER (hbuttonbox1), button1);
-  GTK_WIDGET_SET_FLAGS (button1, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default (button1, TRUE);
 
-  gtk_signal_connect (GTK_OBJECT (button1), "clicked",
-                      GTK_SIGNAL_FUNC (on_about_ok_clicked),
+  g_signal_connect (G_OBJECT (button1), "clicked",
+                      G_CALLBACK (on_about_ok_clicked),
                       NULL);
 
   return window1;
@@ -149,41 +149,41 @@ create_window_rules (void)
   GtkWidget *scrolled_window;
 
   window1 = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_object_set_data (GTK_OBJECT (window1), "window_rules", window1);
+  g_object_set_data (G_OBJECT (window1), "window_rules", window1);
   gtk_window_set_title (GTK_WINDOW (window1), "LMemory Rules");
 
-  vbox2 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_ref (vbox2);
-  gtk_object_set_data_full (GTK_OBJECT (window1), "vbox2", vbox2,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  g_object_ref (vbox2);
+  g_object_set_data_full (G_OBJECT (window1), "vbox2", vbox2,
+                            (GDestroyNotify) g_object_unref);
   gtk_widget_show (vbox2);
   gtk_container_add (GTK_CONTAINER (window1), vbox2);
 
   label_rules = gtk_label_new (rule_buf);
-  gtk_widget_ref (label_rules);
-  gtk_object_set_data_full (GTK_OBJECT (window1), "label_rules", label_rules,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  g_object_ref (label_rules);
+  g_object_set_data_full (G_OBJECT (window1), "label_rules", label_rules,
+                            (GDestroyNotify) g_object_unref);
   gtk_widget_show (label_rules);
   gtk_box_pack_start (GTK_BOX (vbox2), label_rules, FALSE, FALSE, 5);
-  gtk_misc_set_padding (GTK_MISC (label_rules), 11, 0);
+  gtk_widget_set_margin_start (label_rules, 11);
 
-  hbuttonbox1 = gtk_hbutton_box_new ();
-  gtk_widget_ref (hbuttonbox1);
-  gtk_object_set_data_full (GTK_OBJECT (window1), "hbuttonbox1", hbuttonbox1,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  hbuttonbox1 = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
+  g_object_ref (hbuttonbox1);
+  g_object_set_data_full (G_OBJECT (window1), "hbuttonbox1", hbuttonbox1,
+                            (GDestroyNotify) g_object_unref);
   gtk_widget_show (hbuttonbox1);
   gtk_box_pack_start (GTK_BOX (vbox2), hbuttonbox1, TRUE, TRUE, 0);
 
   button1 = gtk_button_new_with_label ("OK");
-  gtk_widget_ref (button1);
-  gtk_object_set_data_full (GTK_OBJECT (window1), "button1", button1,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  g_object_ref (button1);
+  g_object_set_data_full (G_OBJECT (window1), "button1", button1,
+                            (GDestroyNotify) g_object_unref);
   gtk_widget_show (button1);
   gtk_container_add (GTK_CONTAINER (hbuttonbox1), button1);
-  GTK_WIDGET_SET_FLAGS (button1, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default (button1, TRUE);
 
-  gtk_signal_connect (GTK_OBJECT (button1), "clicked",
-                      GTK_SIGNAL_FUNC (on_rules_ok_clicked),
+  g_signal_connect (G_OBJECT (button1), "clicked",
+                      G_CALLBACK (on_rules_ok_clicked),
                       NULL);
 
   return window1;
@@ -224,41 +224,41 @@ create_window_option (void)
   GtkWidget *scrolled_window;
 
   window1 = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_object_set_data (GTK_OBJECT (window1), "window_option", window1);
+  g_object_set_data (G_OBJECT (window1), "window_option", window1);
   gtk_window_set_title (GTK_WINDOW (window1), "LMemory option");
 
-  vbox2 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_ref (vbox2);
-  gtk_object_set_data_full (GTK_OBJECT (window1), "vbox2", vbox2,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  g_object_ref (vbox2);
+  g_object_set_data_full (G_OBJECT (window1), "vbox2", vbox2,
+                            (GDestroyNotify) g_object_unref);
   gtk_widget_show (vbox2);
   gtk_container_add (GTK_CONTAINER (window1), vbox2);
 
   label_option = gtk_label_new (option_buf);
-  gtk_widget_ref (label_option);
-  gtk_object_set_data_full (GTK_OBJECT (window1), "label_option", label_option,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  g_object_ref (label_option);
+  g_object_set_data_full (G_OBJECT (window1), "label_option", label_option,
+                            (GDestroyNotify) g_object_unref);
   gtk_widget_show (label_option);
   gtk_box_pack_start (GTK_BOX (vbox2), label_option, FALSE, FALSE, 5);
-  gtk_misc_set_padding (GTK_MISC (label_option), 11, 0);
+  gtk_widget_set_margin_start (label_option, 11);
 
-  hbuttonbox1 = gtk_hbutton_box_new ();
-  gtk_widget_ref (hbuttonbox1);
-  gtk_object_set_data_full (GTK_OBJECT (window1), "hbuttonbox1", hbuttonbox1,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  hbuttonbox1 = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
+  g_object_ref (hbuttonbox1);
+  g_object_set_data_full (G_OBJECT (window1), "hbuttonbox1", hbuttonbox1,
+                            (GDestroyNotify) g_object_unref);
   gtk_widget_show (hbuttonbox1);
   gtk_box_pack_start (GTK_BOX (vbox2), hbuttonbox1, TRUE, TRUE, 0);
 
   button1 = gtk_button_new_with_label ("OK");
-  gtk_widget_ref (button1);
-  gtk_object_set_data_full (GTK_OBJECT (window1), "button1", button1,
-                            (GtkDestroyNotify) gtk_widget_unref);
+  g_object_ref (button1);
+  g_object_set_data_full (G_OBJECT (window1), "button1", button1,
+                            (GDestroyNotify) g_object_unref);
   gtk_widget_show (button1);
   gtk_container_add (GTK_CONTAINER (hbuttonbox1), button1);
-  GTK_WIDGET_SET_FLAGS (button1, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default (button1, TRUE);
 
-  gtk_signal_connect (GTK_OBJECT (button1), "clicked",
-                      GTK_SIGNAL_FUNC (on_option_ok_clicked),
+  g_signal_connect (G_OBJECT (button1), "clicked",
+                      G_CALLBACK (on_option_ok_clicked),
                       NULL);
 
   return window1;
diff --git a/lmem_menu.c b/lmem_menu.c
index b10e2d2..ec30b2b 100644
--- a/lmem_menu.c
+++ b/lmem_menu.c
@@ -1,78 +1,136 @@
 #include<gtk/gtk.h>
 #include<strings.h>
 #include "lmem_menu.h"
-/* This is the GtkItemFactoryEntry structure used to generate new menus.
-   Item 1: The menu path. The letter after the underscore indicates an
-           accelerator key once the menu is open.
-   Item 2: The accelerator key for the entry
-   Item 3: The callback function.
-   Item 4: The callback action.  This changes the parameters with
-           which the function is called.  The default is 0.
-   Item 5: The item type, used to define what kind of an item it is.
-           Here are the possible values:
-           NULL               -> "<Item>"
-           ""                 -> "<Item>"
-           "<Title>"          -> create a title item
-           "<Item>"           -> create a simple item
-           "<CheckItem>"      -> create a check item
-           "<ToggleItem>"     -> create a toggle item
-           "<RadioItem>"      -> create a radio item
-           <path>             -> path of a radio item to link against
-           "<Separator>"      -> create a separator
-           "<Branch>"         -> create an item to hold sub items (optional)
-           "<LastBranch>"     -> create a right justified branch
-*/
-
-static GtkItemFactoryEntry menu_items[] = {
-  { "/_Game",         NULL,         NULL, 0, "<Branch>" },
-  { "/Game/_New",     "<control>N", lmem_Newgame, 1, NULL },
-  { "/Game/sep1",     NULL,         NULL, 0, "<Separator>" },
-  { "/Game/Quit",     "<control>Q", gtk_main_quit, 0, NULL },
-  { "/_Level",      NULL,         NULL, 0, "<Branch>" },
-  { "/Level/Little One",  NULL,  lmem_Level, 2, NULL },
-  { "/Level/Beginner",  NULL,  lmem_Level, 3, NULL },
-  { "/Level/Skilled",  NULL,  lmem_Level, 4, NULL },
-  { "/Level/Master",  NULL,  lmem_Level, 5, NULL },
-  { "/Level/Daemon",  NULL,  lmem_Level, 6, NULL },
-  { "/_Options",      NULL,         NULL, 0, "<Branch>" },
-  { "/Options/Match 3 Cards",  NULL,  lmem_Set_Option, 7, "<ToggleItem>" },
-  { "/Options/Different Cards",  NULL,  lmem_Set_Option, 8, "<ToggleItem>" },
-  { "/_Help",         NULL,         NULL, 0, "<LastBranch>" },
-  { "/Help/How to play",  NULL,  lmem_rules, 0, NULL },
-  { "/Help/Options",  NULL,  lmem_option, 0, NULL },
-  { "/Help/sep1",     NULL,         NULL, 0, "<Separator>" },
-  { "/Help/About",   NULL,         lmem_about, 0, NULL },
-};
+
+/* Wrapper functions to extract callback_action from menu items */
+static void lmem_Level_wrapper(GtkWidget *menu_item, GtkWidget *window)
+{
+  guint callback_action = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menu_item), "callback_action"));
+  lmem_Level(window, callback_action, menu_item);
+}
+
+static void lmem_Set_Option_wrapper(GtkWidget *menu_item, GtkWidget *window)
+{
+  guint callback_action = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menu_item), "callback_action"));
+  lmem_Set_Option(window, callback_action, menu_item);
+}
+
+static void lmem_Newgame_wrapper(GtkWidget *menu_item, GtkWidget *window)
+{
+  lmem_Newgame(window, 1, menu_item);
+}
 
 void get_main_menu( GtkWidget  *window,
                     GtkWidget **menubar )
 {
-  GtkItemFactory *item_factory;
+  GtkWidget *game_menu, *level_menu, *options_menu, *help_menu;
+  GtkWidget *game_item, *level_item, *options_item, *help_item;
+  GtkWidget *menu_item;
   GtkAccelGroup *accel_group;
-  gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
 
   accel_group = gtk_accel_group_new ();
+  gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
 
-  /* This function initializes the item factory.
-     Param 1: The type of menu - can be GTK_TYPE_MENU_BAR, GTK_TYPE_MENU,
-              or GTK_TYPE_OPTION_MENU.
-     Param 2: The path of the menu.
-     Param 3: A pointer to a gtk_accel_group.  The item factory sets up
-              the accelerator table while generating menus.
-  */
+  *menubar = gtk_menu_bar_new ();
 
-  item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>",
-                                       accel_group);
+  /* Game menu */
+  game_menu = gtk_menu_new ();
+  game_item = gtk_menu_item_new_with_mnemonic ("_Game");
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (game_item), game_menu);
+  gtk_menu_shell_append (GTK_MENU_SHELL (*menubar), game_item);
 
-  /* This function generates the menu items. Pass the item factory,
-     the number of items in the array, the array itself, and any
-     callback data for the the menu items. */
-  gtk_item_factory_create_items (item_factory, nmenu_items, menu_items, window);
+  menu_item = gtk_menu_item_new_with_mnemonic ("_New");
+  g_signal_connect (menu_item, "activate",
+                    G_CALLBACK (lmem_Newgame_wrapper), window);
+  gtk_widget_add_accelerator (menu_item, "activate", accel_group,
+                              GDK_KEY_n, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+  gtk_menu_shell_append (GTK_MENU_SHELL (game_menu), menu_item);
 
-  /* Attach the new accelerator group to the window. */
-  gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
+  menu_item = gtk_separator_menu_item_new ();
+  gtk_menu_shell_append (GTK_MENU_SHELL (game_menu), menu_item);
+
+  menu_item = gtk_menu_item_new_with_label ("Quit");
+  g_signal_connect (menu_item, "activate",
+                    G_CALLBACK (gtk_main_quit), NULL);
+  gtk_widget_add_accelerator (menu_item, "activate", accel_group,
+                              GDK_KEY_q, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+  gtk_menu_shell_append (GTK_MENU_SHELL (game_menu), menu_item);
+
+  /* Level menu */
+  level_menu = gtk_menu_new ();
+  level_item = gtk_menu_item_new_with_mnemonic ("_Level");
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (level_item), level_menu);
+  gtk_menu_shell_append (GTK_MENU_SHELL (*menubar), level_item);
+
+  menu_item = gtk_menu_item_new_with_label ("Little One");
+  g_object_set_data (G_OBJECT (menu_item), "callback_action", GINT_TO_POINTER(2));
+  g_signal_connect (menu_item, "activate",
+                    G_CALLBACK (lmem_Level_wrapper), window);
+  gtk_menu_shell_append (GTK_MENU_SHELL (level_menu), menu_item);
+
+  menu_item = gtk_menu_item_new_with_label ("Beginner");
+  g_object_set_data (G_OBJECT (menu_item), "callback_action", GINT_TO_POINTER(3));
+  g_signal_connect (menu_item, "activate",
+                    G_CALLBACK (lmem_Level_wrapper), window);
+  gtk_menu_shell_append (GTK_MENU_SHELL (level_menu), menu_item);
+
+  menu_item = gtk_menu_item_new_with_label ("Skilled");
+  g_object_set_data (G_OBJECT (menu_item), "callback_action", GINT_TO_POINTER(4));
+  g_signal_connect (menu_item, "activate",
+                    G_CALLBACK (lmem_Level_wrapper), window);
+  gtk_menu_shell_append (GTK_MENU_SHELL (level_menu), menu_item);
+
+  menu_item = gtk_menu_item_new_with_label ("Master");
+  g_object_set_data (G_OBJECT (menu_item), "callback_action", GINT_TO_POINTER(5));
+  g_signal_connect (menu_item, "activate",
+                    G_CALLBACK (lmem_Level_wrapper), window);
+  gtk_menu_shell_append (GTK_MENU_SHELL (level_menu), menu_item);
+
+  menu_item = gtk_menu_item_new_with_label ("Daemon");
+  g_object_set_data (G_OBJECT (menu_item), "callback_action", GINT_TO_POINTER(6));
+  g_signal_connect (menu_item, "activate",
+                    G_CALLBACK (lmem_Level_wrapper), window);
+  gtk_menu_shell_append (GTK_MENU_SHELL (level_menu), menu_item);
+
+  /* Options menu */
+  options_menu = gtk_menu_new ();
+  options_item = gtk_menu_item_new_with_mnemonic ("_Options");
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (options_item), options_menu);
+  gtk_menu_shell_append (GTK_MENU_SHELL (*menubar), options_item);
+
+  menu_item = gtk_check_menu_item_new_with_label ("Match 3 Cards");
+  g_object_set_data (G_OBJECT (menu_item), "callback_action", GINT_TO_POINTER(7));
+  g_signal_connect (menu_item, "activate",
+                    G_CALLBACK (lmem_Set_Option_wrapper), window);
+  gtk_menu_shell_append (GTK_MENU_SHELL (options_menu), menu_item);
+
+  menu_item = gtk_check_menu_item_new_with_label ("Different Cards");
+  g_object_set_data (G_OBJECT (menu_item), "callback_action", GINT_TO_POINTER(8));
+  g_signal_connect (menu_item, "activate",
+                    G_CALLBACK (lmem_Set_Option_wrapper), window);
+  gtk_menu_shell_append (GTK_MENU_SHELL (options_menu), menu_item);
+
+  /* Help menu */
+  help_menu = gtk_menu_new ();
+  help_item = gtk_menu_item_new_with_mnemonic ("_Help");
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (help_item), help_menu);
+  gtk_menu_shell_append (GTK_MENU_SHELL (*menubar), help_item);
+
+  menu_item = gtk_menu_item_new_with_label ("How to play");
+  g_signal_connect (menu_item, "activate",
+                    G_CALLBACK (lmem_rules), NULL);
+  gtk_menu_shell_append (GTK_MENU_SHELL (help_menu), menu_item);
+
+  menu_item = gtk_menu_item_new_with_label ("Options");
+  g_signal_connect (menu_item, "activate",
+                    G_CALLBACK (lmem_option), NULL);
+  gtk_menu_shell_append (GTK_MENU_SHELL (help_menu), menu_item);
+
+  menu_item = gtk_separator_menu_item_new ();
+  gtk_menu_shell_append (GTK_MENU_SHELL (help_menu), menu_item);
 
-  if (menubar)
-    /* Finally, return the actual menu bar created by the item factory. */
-    *menubar = gtk_item_factory_get_widget (item_factory, "<main>");
+  menu_item = gtk_menu_item_new_with_label ("About");
+  g_signal_connect (menu_item, "activate",
+                    G_CALLBACK (lmem_about), NULL);
+  gtk_menu_shell_append (GTK_MENU_SHELL (help_menu), menu_item);
 }
diff --git a/lmem_window.c b/lmem_window.c
index 649548d..a4760c9 100644
--- a/lmem_window.c
+++ b/lmem_window.c
@@ -26,7 +26,7 @@ void
 lmem_remove_card(GtkWidget * widget,GtkWidget * pixmap)
 {
 	gtk_widget_hide(pixmap);
-	gtk_object_ref(GTK_OBJECT(pixmap));
+	g_object_ref(G_OBJECT(pixmap));
   	gtk_container_remove(GTK_CONTAINER(widget),pixmap);
 }
 
@@ -41,7 +41,7 @@ flip_pixmap (GtkWidget * widget, GtkWidget * pixmap1, GtkWidget * pixmap2)
 
 	gtk_widget_show(pixmap2);
   	gtk_container_add(GTK_CONTAINER(widget),pixmap2);
-	gtk_object_unref(GTK_OBJECT(pixmap2));
+	g_object_unref(G_OBJECT(pixmap2));
 }
 
 /*
@@ -207,7 +207,7 @@ lmem_pixmaps(GtkWidget *window, GSList *image_files)
   while( k < NUM)
   {
       second_pixmap[k] = (gpointer) xpm_widget(window, image_files->data);
-      gtk_object_ref(GTK_OBJECT(second_pixmap[k]));
+      g_object_ref(G_OBJECT(second_pixmap[k]));
       
       if( (((k+1)%match_card)==0 || same_card==1 ) )
         image_files = image_files->next;
@@ -276,7 +276,7 @@ cards turned up
         flip_pixmap (button[k], default_pixmap[k], second_pixmap[l]);
 	default_pixmap[k] = second_pixmap[l];
         second_pixmap[l] = (gpointer) xpm_widget_default(window);
-        gtk_object_ref(GTK_OBJECT(second_pixmap[l]));
+        g_object_ref(G_OBJECT(second_pixmap[l]));
         k++;
       }
     }
@@ -287,7 +287,6 @@ cards turned up
 
 }
 
-const char *indicator[5] = {"Little One","Beginner","Skilled","Master","Daemon"};
 void
 lmem_setup()
 {
@@ -308,16 +307,16 @@ lmem_setup()
   /* create a new window */
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), "The memory game");
-  gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
+  gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
 
-  gtk_signal_connect (GTK_OBJECT (window), "delete_event",
-		      GTK_SIGNAL_FUNC (delete_event), NULL);
+  g_signal_connect (G_OBJECT (window), "delete_event",
+		      G_CALLBACK (delete_event), NULL);
 
   /* sets the border width of the window. */
-  gtk_container_border_width (GTK_CONTAINER (window), 10);
+  gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
   /* we create boxes to pack widgets into */
-  bigbox = gtk_vbox_new (FALSE, 0);
+  bigbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
   /* put the box into the main window. */
   gtk_container_add (GTK_CONTAINER (window), bigbox);
@@ -327,13 +326,13 @@ lmem_setup()
 /*  gtk_widget_show (menubar); */
   frame = gtk_frame_new(NULL);
   gtk_box_pack_start (GTK_BOX (bigbox), frame, FALSE, TRUE, 0);
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
 
   k = 0;
   j = 0;
   while (j < SIZE)
-    {box[j] = gtk_hbox_new (TRUE, 0);
+    {box[j] = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   /* put the horizontal boxes into the vertical one */
   gtk_box_pack_start (GTK_BOX (vbox), box[j], TRUE, TRUE, 1);
 
@@ -342,14 +341,14 @@ lmem_setup()
   while (i < SIZEP)
     {
       button[k] = gtk_button_new ();
-      gtk_widget_set_usize ( button[k], pixmap_size, pixmap_size);
+      gtk_widget_set_size_request ( button[k], pixmap_size, pixmap_size);
 
       gtk_box_pack_start (GTK_BOX (box[j]), button[k], TRUE, TRUE, 1);
 
       /* Now when the button is clicked, we call the "show_number" function
        *        * with a pointer to the button as it's argument */
-      gtk_signal_connect (GTK_OBJECT (button[k]), "clicked",
-			  GTK_SIGNAL_FUNC (lmem_flip_card), (gpointer) k);
+      g_signal_connect (G_OBJECT (button[k]), "clicked",
+			  G_CALLBACK (lmem_flip_card), (gpointer) k);
       k++;
       i++;
     }
diff --git a/lmemory.h b/lmemory.h
index 5e8cae1..53267ff 100644
--- a/lmemory.h
+++ b/lmemory.h
@@ -10,11 +10,11 @@
 #define MASTER       3
 #define DAEMON       4
 
-const char *indicator[5];
-int lmem_level;
-int match_card;
-int same_card;
-int click_count;
+extern const char *indicator[5];
+extern int lmem_level;
+extern int match_card;
+extern int same_card;
+extern int click_count;
 
 /* Window manipulation */
 
@@ -32,9 +32,9 @@ void lln_set_random();
 int lln_get_random(double max);
 
 /* pixmaps */
-GtkWidget * default_pixmap[NUM];
-GtkWidget * second_pixmap[NUM];
-GtkWidget * button[NUM];
-GtkWidget *frame;
-gint lmem_state[NUM];
-char *lmem_image_dir;
+extern GtkWidget * default_pixmap[NUM];
+extern GtkWidget * second_pixmap[NUM];
+extern GtkWidget * button[NUM];
+extern GtkWidget *frame;
+extern gint lmem_state[NUM];
+extern char *lmem_image_dir;
diff --git a/mmain.c b/mmain.c
index 988eb17..42bb0e4 100644
--- a/mmain.c
+++ b/mmain.c
@@ -13,6 +13,19 @@
 #include <sys/stat.h>
 #include "lmemory.h"
 
+/* Global variable definitions */
+const char *indicator[5] = {"Little One","Beginner","Skilled","Master","Daemon"};
+int lmem_level;
+int match_card;
+int same_card;
+int click_count;
+GtkWidget * default_pixmap[NUM];
+GtkWidget * second_pixmap[NUM];
+GtkWidget * button[NUM];
+GtkWidget *frame;
+gint lmem_state[NUM];
+char *lmem_image_dir;
+
 int
 main (int argc, char *argv[])
 {
diff --git a/support.c b/support.c
index dd14a90..c3521fa 100644
--- a/support.c
+++ b/support.c
@@ -33,13 +33,13 @@ lookup_widget                          (GtkWidget       *widget,
       if (GTK_IS_MENU (widget))
         parent = gtk_menu_get_attach_widget (GTK_MENU (widget));
       else
-        parent = widget->parent;
+        parent = gtk_widget_get_parent (widget);
       if (parent == NULL)
         break;
       widget = parent;
     }
 
-  found_widget = (GtkWidget*) gtk_object_get_data (GTK_OBJECT (widget),
+  found_widget = (GtkWidget*) g_object_get_data (G_OBJECT (widget),
                                                    widget_name);
   if (!found_widget)
     g_warning ("Widget not found: %s", widget_name);
@@ -59,20 +59,15 @@ static char *dummy_pixmap_xpm[] = {
 static GtkWidget*
 create_dummy_pixmap                    (GtkWidget       *widget)
 {
-  GdkColormap *colormap;
-  GdkPixmap *gdkpixmap;
-  GdkBitmap *mask;
-  GtkWidget *pixmap;
-
-  colormap = gtk_widget_get_colormap (widget);
-  gdkpixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &mask,
-                                                     NULL, dummy_pixmap_xpm);
-  if (gdkpixmap == NULL)
+  GdkPixbuf *pixbuf;
+  GtkWidget *image;
+
+  pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **)dummy_pixmap_xpm);
+  if (pixbuf == NULL)
     g_error ("Couldn't create replacement pixmap.");
-  pixmap = gtk_pixmap_new (gdkpixmap, mask);
-  gdk_pixmap_unref (gdkpixmap);
-  gdk_bitmap_unref (mask);
-  return pixmap;
+  image = gtk_image_new_from_pixbuf (pixbuf);
+  g_object_unref (pixbuf);
+  return image;
 }
 
 static GList *pixmaps_directories = NULL;
@@ -91,11 +86,10 @@ create_pixmap                          (GtkWidget       *widget,
                                         const gchar     *filename)
 {
   gchar *found_filename = NULL;
-  GdkColormap *colormap;
-  GdkPixmap *gdkpixmap;
-  GdkBitmap *mask;
-  GtkWidget *pixmap;
+  GdkPixbuf *pixbuf;
+  GtkWidget *image;
   GList *elem;
+  GError *error = NULL;
 
   if (!filename || !filename[0])
       return create_dummy_pixmap (widget);
@@ -122,20 +116,19 @@ create_pixmap                          (GtkWidget       *widget,
       return create_dummy_pixmap (widget);
     }
 
-  colormap = gtk_widget_get_colormap (widget);
-  gdkpixmap = gdk_pixmap_colormap_create_from_xpm (NULL, colormap, &mask,
-                                                   NULL, found_filename);
-  if (gdkpixmap == NULL)
+  pixbuf = gdk_pixbuf_new_from_file (found_filename, &error);
+  if (pixbuf == NULL)
     {
-      g_warning ("Error loading pixmap file: %s", found_filename);
+      g_warning ("Error loading pixmap file: %s: %s", found_filename, 
+                 error ? error->message : "Unknown error");
+      if (error) g_error_free (error);
       g_free (found_filename);
       return create_dummy_pixmap (widget);
     }
   g_free (found_filename);
-  pixmap = gtk_pixmap_new (gdkpixmap, mask);
-  gdk_pixmap_unref (gdkpixmap);
-  gdk_bitmap_unref (mask);
-  return pixmap;
+  image = gtk_image_new_from_pixbuf (pixbuf);
+  g_object_unref (pixbuf);
+  return image;
 }
 
 /* This is an internally used function to check if a pixmap file exists. */
diff --git a/xpm_widget.c b/xpm_widget.c
index 37d2117..e577563 100644
--- a/xpm_widget.c
+++ b/xpm_widget.c
@@ -7,22 +7,24 @@
      GtkWidget *xpm_widget( GtkWidget *parent,
                                gchar     *xpm_filename)
      {
-         GtkWidget *pixmapwid;
-         GdkPixmap *pixmap;
-         GdkBitmap *mask;
-         GtkStyle *style;
-
-         /* Get the style of the button to get the
-          * background color. */
-         style = gtk_widget_get_style(parent);
-
-         /* Now on to the xpm stuff */
-         pixmap = gdk_pixmap_create_from_xpm (parent->window, &mask,
-                                              &style->bg[GTK_STATE_NORMAL],
-                                              xpm_filename);
-         pixmapwid = gtk_pixmap_new (pixmap, mask);
-
-         return(pixmapwid);
+         GtkWidget *image;
+         GdkPixbuf *pixbuf;
+         GError *error = NULL;
+
+         /* Load the pixbuf from file */
+         pixbuf = gdk_pixbuf_new_from_file(xpm_filename, &error);
+         
+         if (!pixbuf) {
+             g_warning("Failed to load image %s: %s", xpm_filename, error->message);
+             g_error_free(error);
+             return NULL;
+         }
+         
+         /* Create image widget from pixbuf */
+         image = gtk_image_new_from_pixbuf(pixbuf);
+         g_object_unref(pixbuf);
+
+         return(image);
      }
 
 
@@ -33,19 +35,15 @@
      GtkWidget *xpm_widget_default( GtkWidget *parent)
      {
          /* GtkWidget is the storage type for widgets */
-         GtkWidget *pixmapwid;
-         GdkPixmap *pixmap;
-         GdkBitmap *mask;
-         GtkStyle *style;
+         GtkWidget *image;
+         GdkPixbuf *pixbuf;
 
-         /* now for the pixmap from gdk */
-         style = gtk_widget_get_style( parent );
-         pixmap = gdk_pixmap_create_from_xpm_d( parent->window,  &mask,
-                                                &style->bg[GTK_STATE_NORMAL],
-                                                (gchar **)default_xpm );
+         /* Create pixbuf from xpm data */
+         pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)default_xpm);
 
-         /* a pixmap widget to contain the pixmap */
-         pixmapwid = gtk_pixmap_new( pixmap, mask );
+         /* a image widget to contain the pixbuf */
+         image = gtk_image_new_from_pixbuf(pixbuf);
+         g_object_unref(pixbuf);
 
-         return(pixmapwid);
+         return(image);
      }
diff --git a/configure.in b/configure.in
index fe0aa2c..306f0c6 100644
--- a/configure.in
+++ b/configure.in
@@ -25,8 +25,9 @@ AC_PROG_MAKE_SET
 AC_STDC_HEADERS
 AC_ARG_PROGRAM
 
-AM_PATH_GTK(1.2.0,,
-   AC_MSG_ERROR(Cannot find correct version of GTK - is gtk-config in path?))
+PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.0.0])
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_LIBS)
 
 dnl Checks for header files.
 AC_HEADER_STDC