ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/Unix/prefs_editor_gtk.cpp

Comparing BasiliskII/src/Unix/prefs_editor_gtk.cpp (file contents):
Revision 1.10 by cebix, 2000-04-10T18:53:04Z vs.
Revision 1.11 by cebix, 2000-07-13T13:47:11Z

#	Line 525 | Line 525 | static GtkWidget *l_frameskip, *l_displa
525		static int display_type;
526		static int dis_width, dis_height;
527
528	<	#if ENABLE_FBDEV_DGA
528	>	#ifdef ENABLE_FBDEV_DGA
529		static GtkWidget *w_fbdev_name, *w_fbdevice_file;
530		static GtkWidget *l_fbdev_name, *l_fbdevice_file;
531		static char fbdev_name[256];
#	Line 537 | Line 537 | static void hide_show_graphics_widgets(v
537		switch (display_type) {
538		case DISPLAY_WINDOW:
539		gtk_widget_show(w_frameskip); gtk_widget_show(l_frameskip);
540	<	#if ENABLE_FBDEV_DGA
540	>	#ifdef ENABLE_FBDEV_DGA
541		gtk_widget_show(w_display_x); gtk_widget_show(l_display_x);
542		gtk_widget_show(w_display_y); gtk_widget_show(l_display_y);
543		gtk_widget_hide(w_fbdev_name); gtk_widget_hide(l_fbdev_name);
#	Line 545 | Line 545 | static void hide_show_graphics_widgets(v
545		break;
546		case DISPLAY_SCREEN:
547		gtk_widget_hide(w_frameskip); gtk_widget_hide(l_frameskip);
548	<	#if ENABLE_FBDEV_DGA
548	>	#ifdef ENABLE_FBDEV_DGA
549		gtk_widget_hide(w_display_x); gtk_widget_hide(l_display_x);
550		gtk_widget_hide(w_display_y); gtk_widget_hide(l_display_y);
551		gtk_widget_show(w_fbdev_name); gtk_widget_show(l_fbdev_name);
#	Line 588 | Line 588 | static void parse_graphics_prefs(void)
588		display_type = DISPLAY_WINDOW;
589		dis_width = 512;
590		dis_height = 384;
591	<	#if ENABLE_FBDEV_DGA
591	>	#ifdef ENABLE_FBDEV_DGA
592		fbdev_name[0] = 0;
593		#endif
594
#	Line 596 | Line 596 | static void parse_graphics_prefs(void)
596		if (str) {
597		if (sscanf(str, "win/%d/%d", &dis_width, &dis_height) == 2)
598		display_type = DISPLAY_WINDOW;
599	<	#if ENABLE_FBDEV_DGA
599	>	#ifdef ENABLE_FBDEV_DGA
600		else if (sscanf(str, "dga/%255s", fbdev_name) == 1)
601		#else
602		else if (sscanf(str, "dga/%d/%d", &dis_width, &dis_height) == 2)
#	Line 622 | Line 622 | static void read_graphics_settings(void)
622		sprintf(pref, "win/%d/%d", dis_width, dis_height);
623		break;
624		case DISPLAY_SCREEN:
625	<	#if ENABLE_FBDEV_DGA
625	>	#ifdef ENABLE_FBDEV_DGA
626		str = gtk_entry_get_text(GTK_ENTRY(w_fbdev_name));
627		sprintf(pref, "dga/%s", str);
628		#else
#	Line 746 | Line 746 | static void create_graphics_pane(GtkWidg
746		gtk_table_attach(GTK_TABLE(table), combo, 1, 2, 3, 4, (GtkAttachOptions)GTK_FILL, (GtkAttachOptions)0, 4, 4);
747		w_display_y = GTK_COMBO(combo)->entry;
748
749	<	#if ENABLE_FBDEV_DGA
749	>	#ifdef ENABLE_FBDEV_DGA
750		l_fbdev_name = gtk_label_new(GetString(STR_FBDEV_NAME_CTRL));
751		gtk_widget_show(l_fbdev_name);
752		gtk_table_attach(GTK_TABLE(table), l_fbdev_name, 0, 1, 4, 5, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4);
#	Line 1021 | Line 1021 | static void create_memory_pane(GtkWidget
1021		}
1022		make_option_menu(box, STR_MODELID_CTRL, model_options, active);
1023
1024	+	#if EMULATED_68K
1025		static const opt_desc cpu_options[] = {
1026		{STR_CPU_68020_LAB, GTK_SIGNAL_FUNC(mn_cpu_68020)},
1027		{STR_CPU_68020_FPU_LAB, GTK_SIGNAL_FUNC(mn_cpu_68020_fpu)},
#	Line 1038 | Line 1039 | static void create_memory_pane(GtkWidget
1039		case 4: active = 4;
1040		}
1041		make_option_menu(box, STR_CPU_CTRL, cpu_options, active);
1042	+	#endif
1043
1044		w_rom_file = make_entry(box, STR_ROM_FILE_CTRL, "rom");
1045

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines