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

Diff for /np2/x11/gtk2/dialog_config.c between versions 1.6 and 1.8

version 1.6, 2008/03/13 16:27:39 version 1.8, 2010/12/23 06:32:35
Line 267  create_configure_dialog(void) Line 267  create_configure_dialog(void)
         gtk_container_set_border_width(GTK_CONTAINER(config_dialog), 5);          gtk_container_set_border_width(GTK_CONTAINER(config_dialog), 5);
   
         g_signal_connect(GTK_OBJECT(config_dialog), "destroy",          g_signal_connect(GTK_OBJECT(config_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 355  create_configure_dialog(void) Line 355  create_configure_dialog(void)
         gtk_misc_set_alignment(GTK_MISC(realclock_label), 1.0, 0.5);          gtk_misc_set_alignment(GTK_MISC(realclock_label), 1.0, 0.5);
   
         g_signal_connect(GTK_OBJECT(baseclock_entry), "changed",          g_signal_connect(GTK_OBJECT(baseclock_entry), "changed",
           GTK_SIGNAL_FUNC(clock_changed), (gpointer)realclock_label);            G_CALLBACK(clock_changed), (gpointer)realclock_label);
         g_signal_connect(GTK_OBJECT(clockmult_entry), "changed",          g_signal_connect(GTK_OBJECT(clockmult_entry), "changed",
           GTK_SIGNAL_FUNC(clock_changed), (gpointer)realclock_label);            G_CALLBACK(clock_changed), (gpointer)realclock_label);
         clock_changed(NULL, realclock_label);          clock_changed(NULL, realclock_label);
   
         /* OK, Cancel button base widget */          /* OK, Cancel button base widget */
Line 383  create_configure_dialog(void) Line 383  create_configure_dialog(void)
                 arch_radiobutton[i] = gtk_radio_button_new_with_label_from_widget(i > 0 ? GTK_RADIO_BUTTON(arch_radiobutton[i-1]) : NULL, architecture[i].label);                  arch_radiobutton[i] = gtk_radio_button_new_with_label_from_widget(i > 0 ? GTK_RADIO_BUTTON(arch_radiobutton[i-1]) : NULL, architecture[i].label);
                 gtk_widget_show(arch_radiobutton[i]);                  gtk_widget_show(arch_radiobutton[i]);
                 gtk_box_pack_start(GTK_BOX(arch_hbox), arch_radiobutton[i], FALSE, FALSE, 0);                  gtk_box_pack_start(GTK_BOX(arch_hbox), arch_radiobutton[i], FALSE, FALSE, 0);
                 GTK_WIDGET_UNSET_FLAGS(arch_radiobutton[i], GTK_CAN_FOCUS);                  gtk_widget_set_can_focus(arch_radiobutton[i], FALSE);
                 g_signal_connect(GTK_OBJECT(arch_radiobutton[i]), "clicked",                  g_signal_connect(GTK_OBJECT(arch_radiobutton[i]), "clicked",
                     GTK_SIGNAL_FUNC(arch_radiobutton_clicked), (gpointer)architecture[i].arch);                      G_CALLBACK(arch_radiobutton_clicked), (gpointer)architecture[i].arch);
         }          }
         for (i = 0; i < NELEMENTS(architecture); i++) {          for (i = 0; i < NELEMENTS(architecture); i++) {
                 if (strcmp(np2cfg.model, architecture[i].arch) == 0) {                  if (strcmp(np2cfg.model, architecture[i].arch) == 0) {
Line 425  create_configure_dialog(void) Line 425  create_configure_dialog(void)
                 rate_radiobutton[i] = gtk_radio_button_new_with_label_from_widget((i > 0) ? GTK_RADIO_BUTTON(rate_radiobutton[i-1]) : NULL, samplingrate[i].label);                  rate_radiobutton[i] = gtk_radio_button_new_with_label_from_widget((i > 0) ? GTK_RADIO_BUTTON(rate_radiobutton[i-1]) : NULL, samplingrate[i].label);
                 gtk_widget_show(rate_radiobutton[i]);                  gtk_widget_show(rate_radiobutton[i]);
                 gtk_box_pack_start(GTK_BOX(soundrate_hbox), rate_radiobutton[i], FALSE, FALSE, 0);                  gtk_box_pack_start(GTK_BOX(soundrate_hbox), rate_radiobutton[i], FALSE, FALSE, 0);
                 GTK_WIDGET_UNSET_FLAGS(rate_radiobutton[i], GTK_CAN_FOCUS);                  gtk_widget_set_can_focus(rate_radiobutton[i], FALSE);
                 g_signal_connect(GTK_OBJECT(rate_radiobutton[i]), "clicked",                  g_signal_connect(GTK_OBJECT(rate_radiobutton[i]), "clicked",
                     GTK_SIGNAL_FUNC(rate_radiobutton_clicked), GINT_TO_POINTER(samplingrate[i].rate));                      G_CALLBACK(rate_radiobutton_clicked), GINT_TO_POINTER(samplingrate[i].rate));
         }          }
         if (np2cfg.samplingrate == 11025) {          if (np2cfg.samplingrate == 11025) {
                 i = 0;                  i = 0;
Line 499  create_configure_dialog(void) Line 499  create_configure_dialog(void)
         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_container_add(GTK_CONTAINER(confirm_widget), ok_button);          gtk_container_add(GTK_CONTAINER(confirm_widget), ok_button);
         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);
         g_signal_connect(GTK_OBJECT(ok_button), "clicked",          g_signal_connect(GTK_OBJECT(ok_button), "clicked",
             GTK_SIGNAL_FUNC(ok_button_clicked), (gpointer)config_dialog);              G_CALLBACK(ok_button_clicked), (gpointer)config_dialog);
         gtk_widget_grab_default(ok_button);          gtk_widget_grab_default(ok_button);
   
         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_container_add(GTK_CONTAINER(confirm_widget), cancel_button);          gtk_container_add(GTK_CONTAINER(confirm_widget), cancel_button);
         GTK_WIDGET_SET_FLAGS(cancel_button, GTK_CAN_DEFAULT);          gtk_widget_set_can_default(cancel_button, TRUE);
         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(config_dialog));              G_CALLBACK(gtk_widget_destroy), GTK_OBJECT(config_dialog));
   
         gtk_widget_show_all(config_dialog);          gtk_widget_show_all(config_dialog);
 }  }
Removed from v.1.6  
changed lines
  Added in v.1.8

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