ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/Unix/prefs_editor_gtk.cpp
(Generate patch)

Comparing BasiliskII/src/Unix/prefs_editor_gtk.cpp (file contents):
Revision 1.7 by cebix, 1999-10-21T16:07:32Z vs.
Revision 1.9 by cebix, 1999-10-28T15:33:15Z

# Line 291 | Line 291 | bool PrefsEditor(void)
291          GtkWidget *notebook = gtk_notebook_new();
292          gtk_widget_show(notebook);
293          gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_TOP);
294 <        gtk_notebook_set_scrollable(GTK_NOTEBOOK(notebook), TRUE);
294 >        gtk_notebook_set_scrollable(GTK_NOTEBOOK(notebook), FALSE);
295          gtk_box_pack_start(GTK_BOX(box), notebook, TRUE, TRUE, 0);
296  
297          create_volumes_pane(notebook);
# Line 933 | Line 933 | static GtkWidget *w_keycode_file;
933   static void mn_modelid_5(...) {PrefsReplaceInt32("modelid", 5);}
934   static void mn_modelid_14(...) {PrefsReplaceInt32("modelid", 14);}
935  
936 + // CPU/FPU type
937 + static void mn_cpu_68020(...) {PrefsReplaceInt32("cpu", 2); PrefsReplaceBool("fpu", false);}
938 + static void mn_cpu_68020_fpu(...) {PrefsReplaceInt32("cpu", 2); PrefsReplaceBool("fpu", true);}
939 + static void mn_cpu_68030(...) {PrefsReplaceInt32("cpu", 3); PrefsReplaceBool("fpu", false);}
940 + static void mn_cpu_68030_fpu(...) {PrefsReplaceInt32("cpu", 3); PrefsReplaceBool("fpu", true);}
941 + static void mn_cpu_68040(...) {PrefsReplaceInt32("cpu", 4); PrefsReplaceBool("fpu", true);}
942 +
943   // "Use Raw Keycodes" button toggled
944   static void tb_keycodes(GtkWidget *widget)
945   {
# Line 1002 | Line 1009 | static void create_memory_pane(GtkWidget
1009          gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
1010          gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0);
1011  
1012 <        static const opt_desc options[] = {
1012 >        static const opt_desc model_options[] = {
1013                  {STR_MODELID_5_LAB, GTK_SIGNAL_FUNC(mn_modelid_5)},
1014                  {STR_MODELID_14_LAB, GTK_SIGNAL_FUNC(mn_modelid_14)},
1015                  {0, NULL}
# Line 1012 | Line 1019 | static void create_memory_pane(GtkWidget
1019                  case 5: active = 0; break;
1020                  case 14: active = 1; break;
1021          }
1022 <        menu = make_option_menu(box, STR_MODELID_CTRL, options, active);
1022 >        make_option_menu(box, STR_MODELID_CTRL, model_options, active);
1023 >
1024 >        static const opt_desc cpu_options[] = {
1025 >                {STR_CPU_68020_LAB, GTK_SIGNAL_FUNC(mn_cpu_68020)},
1026 >                {STR_CPU_68020_FPU_LAB, GTK_SIGNAL_FUNC(mn_cpu_68020_fpu)},
1027 >                {STR_CPU_68030_LAB, GTK_SIGNAL_FUNC(mn_cpu_68030)},
1028 >                {STR_CPU_68030_FPU_LAB, GTK_SIGNAL_FUNC(mn_cpu_68030_fpu)},
1029 >                {STR_CPU_68040_LAB, GTK_SIGNAL_FUNC(mn_cpu_68040)},
1030 >                {0, NULL}
1031 >        };
1032 >        int cpu = PrefsFindInt32("cpu");
1033 >        bool fpu = PrefsFindBool("fpu");
1034 >        active = 0;
1035 >        switch (cpu) {
1036 >                case 2: active = fpu ? 1 : 0; break;
1037 >                case 3: active = fpu ? 3 : 2; break;
1038 >                case 4: active = 4;
1039 >        }
1040 >        make_option_menu(box, STR_CPU_CTRL, cpu_options, active);
1041  
1042          w_rom_file = make_entry(box, STR_ROM_FILE_CTRL, "rom");
1043  

Diff Legend

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