Diff for /np2/x11/gtk2/dialog_about.c between versions 1.5 and 1.9

version 1.5, 2009/03/05 11:50:39 version 1.9, 2011/01/15 18:43:13
Line 1 Line 1
 /*      $Id$    */  
   
 /*  /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro   * Copyright (c) 2002-2003 NONAKA Kimihiro
  * All rights reserved.   * All rights reserved.
Line 40  static void Line 38  static void
 about_destroy(GtkWidget *w, GtkWidget **wp)  about_destroy(GtkWidget *w, GtkWidget **wp)
 {  {
   
         UNUSED(wp);  
   
         install_idle_process();          install_idle_process();
         gtk_widget_destroy(w);          gtk_widget_destroy(w);
 }  }
Line 56  create_about_dialog(void) Line 52  create_about_dialog(void)
         GtkWidget *ok_button;          GtkWidget *ok_button;
         GtkWidget *neko_image;          GtkWidget *neko_image;
         GdkColormap *colormap;          GdkColormap *colormap;
         GdkPixmap *neko_pixmap;          GdkPixbuf *neko_pixbuf;
         GdkBitmap *mask;  
   
         uninstall_idle_process();          uninstall_idle_process();
   
Line 75  create_about_dialog(void) Line 70  create_about_dialog(void)
         gtk_container_add(GTK_CONTAINER(about_dialog), main_widget);          gtk_container_add(GTK_CONTAINER(about_dialog), main_widget);
   
         colormap = gtk_widget_get_colormap(about_dialog);          colormap = gtk_widget_get_colormap(about_dialog);
         neko_pixmap = gdk_pixmap_colormap_create_from_xpm_d(NULL, colormap,          neko_pixbuf = gdk_pixbuf_new_from_xpm_data(np2_icon);
             &mask, NULL, (gchar **)np2_icon);          neko_image = gtk_image_new_from_pixbuf(neko_pixbuf);
         if (neko_pixmap == NULL)          g_object_unref(neko_pixbuf);
                 g_error("Couldn't create replacement pixmap.");  
         neko_image = gtk_image_new_from_pixmap(neko_pixmap, mask);  
         g_object_unref(neko_pixmap);  
         g_object_unref(mask);  
         gtk_widget_show(neko_image);          gtk_widget_show(neko_image);
         gtk_box_pack_start(GTK_BOX(main_widget), neko_image, FALSE, FALSE, 10);          gtk_box_pack_start(GTK_BOX(main_widget), neko_image, FALSE, FALSE, 10);
   
Line 99  create_about_dialog(void) Line 90  create_about_dialog(void)
         gtk_box_pack_end(GTK_BOX(main_widget), ok_button, FALSE, TRUE, 0);          gtk_box_pack_end(GTK_BOX(main_widget), ok_button, FALSE, TRUE, 0);
         g_signal_connect_swapped(GTK_OBJECT(ok_button), "clicked",          g_signal_connect_swapped(GTK_OBJECT(ok_button), "clicked",
             G_CALLBACK(gtk_widget_destroy), GTK_OBJECT(about_dialog));              G_CALLBACK(gtk_widget_destroy), GTK_OBJECT(about_dialog));
         GTK_WIDGET_SET_FLAGS(ok_button, GTK_CAN_DEFAULT);          gtk_widget_set_can_default(ok_button, TRUE);
         GTK_WIDGET_SET_FLAGS(ok_button, GTK_HAS_DEFAULT);          gtk_widget_has_default(ok_button);
         gtk_widget_grab_default(ok_button);          gtk_widget_grab_default(ok_button);
   
         gtk_widget_show_all(about_dialog);          gtk_widget_show_all(about_dialog);

Removed from v.1.5  
changed lines
  Added in v.1.9


RetroPC.NET-CVS <cvs@retropc.net>