[BACK]Return to dialog_screen.c CVS log [TXT] [DIR] Up to [RetroPC.NET] / np2 / x11 / gtk2

Diff for /np2/x11/gtk2/dialog_screen.c between versions 1.1 and 1.7

version 1.1, 2004/07/15 14:24:33 version 1.7, 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 12 Line 10
  * 2. Redistributions in binary form must reproduce the above copyright   * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the   *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.   *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products  
  *    derived from this software without specific prior written permission.  
  *   *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR   * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES   * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Line 89  ok_button_clicked(GtkButton *b, gpointer Line 85  ok_button_clicked(GtkButton *b, gpointer
         BOOL renewal;          BOOL renewal;
         int i;          int i;
   
         UNUSED(b);  
   
         /* Video tab */          /* Video tab */
         video_lcd = GTK_TOGGLE_BUTTON(video_lcd_checkbutton)->active;          video_lcd = GTK_TOGGLE_BUTTON(video_lcd_checkbutton)->active;
         video_lcdrev = GTK_TOGGLE_BUTTON(video_lcd_reverse_checkbutton)->active;          video_lcdrev = GTK_TOGGLE_BUTTON(video_lcd_reverse_checkbutton)->active;
Line 175  static void Line 169  static void
 dialog_destroy(GtkWidget *w, GtkWidget **wp)  dialog_destroy(GtkWidget *w, GtkWidget **wp)
 {  {
   
         UNUSED(wp);  
   
         install_idle_process();          install_idle_process();
         gtk_widget_destroy(w);          gtk_widget_destroy(w);
 }  }
Line 192  static void Line 184  static void
 uPD72020_radiobutton_clicked(GtkButton *b, gpointer d)  uPD72020_radiobutton_clicked(GtkButton *b, gpointer d)
 {  {
   
         UNUSED(b);  
   
         chip_uPD72020 = (gint)d;          chip_uPD72020 = (gint)d;
 }  }
   
Line 201  static void Line 191  static void
 gc_radiobutton_clicked(GtkButton *b, gpointer d)  gc_radiobutton_clicked(GtkButton *b, gpointer d)
 {  {
   
         UNUSED(b);  
   
         chip_gc_kind = (gint)d;          chip_gc_kind = (gint)d;
 }  }
   
Line 244  create_video_note(void) Line 232  create_video_note(void)
                 gtk_widget_set_sensitive(video_lcd_reverse_checkbutton, FALSE);                  gtk_widget_set_sensitive(video_lcd_reverse_checkbutton, FALSE);
         }          }
         g_signal_connect(GTK_OBJECT(video_lcd_checkbutton), "clicked",          g_signal_connect(GTK_OBJECT(video_lcd_checkbutton), "clicked",
             GTK_SIGNAL_FUNC(lcd_checkbutton_clicked),              G_CALLBACK(lcd_checkbutton_clicked),
             (gpointer)video_lcd_reverse_checkbutton);              (gpointer)video_lcd_reverse_checkbutton);
   
         video_skipline_checkbutton =          video_skipline_checkbutton =
Line 279  create_video_note(void) Line 267  create_video_note(void)
 static GtkWidget*  static GtkWidget*
 create_chip_note(void)  create_chip_note(void)
 {  {
         static char *gdc_str[] = { "uPD7220", "uPD72020" };          static const char *gdc_str[] = { "uPD7220", "uPD72020" };
         static char *gc_str[] = { "None", "GRCG", "GRCG+", "EGC" };          static const char *gc_str[] = { "None", "GRCG", "GRCG+", "EGC" };
         GtkWidget *main_widget;          GtkWidget *main_widget;
         GtkWidget *gdc_frame;          GtkWidget *gdc_frame;
         GtkWidget *gdc_hbox;          GtkWidget *gdc_hbox;
Line 311  create_chip_note(void) Line 299  create_chip_note(void)
                 gtk_widget_show(upd72020_radiobutton[i]);                  gtk_widget_show(upd72020_radiobutton[i]);
                 gtk_box_pack_start(GTK_BOX(gdc_hbox), upd72020_radiobutton[i], TRUE, FALSE, 0);                  gtk_box_pack_start(GTK_BOX(gdc_hbox), upd72020_radiobutton[i], TRUE, FALSE, 0);
                 g_signal_connect(GTK_OBJECT(upd72020_radiobutton[i]), "clicked",                  g_signal_connect(GTK_OBJECT(upd72020_radiobutton[i]), "clicked",
                     GTK_SIGNAL_FUNC(uPD72020_radiobutton_clicked), (gpointer)i);                      G_CALLBACK(uPD72020_radiobutton_clicked), (gpointer)i);
         }          }
         g_signal_emit_by_name(GTK_OBJECT(upd72020_radiobutton[np2cfg.uPD72020 ? 1 : 0]), "clicked");          g_signal_emit_by_name(GTK_OBJECT(upd72020_radiobutton[np2cfg.uPD72020 ? 1 : 0]), "clicked");
   
Line 332  create_chip_note(void) Line 320  create_chip_note(void)
                 gtk_widget_show(gc_radiobutton[i]);                  gtk_widget_show(gc_radiobutton[i]);
                 gtk_box_pack_start(GTK_BOX(gc_hbox), gc_radiobutton[i], TRUE, FALSE, 0);                  gtk_box_pack_start(GTK_BOX(gc_hbox), gc_radiobutton[i], TRUE, FALSE, 0);
                 g_signal_connect(GTK_OBJECT(gc_radiobutton[i]), "clicked",                  g_signal_connect(GTK_OBJECT(gc_radiobutton[i]), "clicked",
                 GTK_SIGNAL_FUNC(gc_radiobutton_clicked), (gpointer)i);                  G_CALLBACK(gc_radiobutton_clicked), (gpointer)i);
         }          }
         g_signal_emit_by_name(GTK_OBJECT(gc_radiobutton[np2cfg.grcg & 3]), "clicked");          g_signal_emit_by_name(GTK_OBJECT(gc_radiobutton[np2cfg.grcg & 3]), "clicked");
   
Line 429  create_screen_dialog(void) Line 417  create_screen_dialog(void)
         gtk_container_set_border_width(GTK_CONTAINER(screen_dialog), 5);          gtk_container_set_border_width(GTK_CONTAINER(screen_dialog), 5);
   
         g_signal_connect(GTK_OBJECT(screen_dialog), "destroy",          g_signal_connect(GTK_OBJECT(screen_dialog), "destroy",
             GTK_SIGNAL_FUNC(dialog_destroy), NULL);              G_CALLBACK(dialog_destroy), NULL);
   
         main_widget = gtk_vbox_new(FALSE, 0);          main_widget = gtk_vbox_new(FALSE, 0);
         gtk_widget_show(main_widget);          gtk_widget_show(main_widget);
Line 462  create_screen_dialog(void) Line 450  create_screen_dialog(void)
         cancel_button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);          cancel_button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
         gtk_widget_show(cancel_button);          gtk_widget_show(cancel_button);
         gtk_box_pack_end(GTK_BOX(confirm_widget),cancel_button,FALSE, FALSE, 0);          gtk_box_pack_end(GTK_BOX(confirm_widget),cancel_button,FALSE, FALSE, 0);
         GTK_WIDGET_SET_FLAGS(cancel_button, GTK_CAN_DEFAULT);          gtk_widget_set_can_default(cancel_button, FALSE);
         g_signal_connect_swapped(GTK_OBJECT(cancel_button), "clicked",          g_signal_connect_swapped(GTK_OBJECT(cancel_button), "clicked",
             GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(screen_dialog));              G_CALLBACK(gtk_widget_destroy), GTK_OBJECT(screen_dialog));
   
         ok_button = gtk_button_new_from_stock(GTK_STOCK_OK);          ok_button = gtk_button_new_from_stock(GTK_STOCK_OK);
         gtk_widget_show(ok_button);          gtk_widget_show(ok_button);
         gtk_box_pack_end(GTK_BOX(confirm_widget), ok_button, FALSE, FALSE, 0);          gtk_box_pack_end(GTK_BOX(confirm_widget), ok_button, FALSE, FALSE, 0);
         g_signal_connect(GTK_OBJECT(ok_button), "clicked",          g_signal_connect(GTK_OBJECT(ok_button), "clicked",
             GTK_SIGNAL_FUNC(ok_button_clicked), (gpointer)screen_dialog);              G_CALLBACK(ok_button_clicked), (gpointer)screen_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(screen_dialog);          gtk_widget_show_all(screen_dialog);
Removed from v.1.1  
changed lines
  Added in v.1.7

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