Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-10-31 09:05:19 +00:00
Code Issues Projects Releases Wiki Activity

GTK2: Updated combo boxes with entries

Browse Source 
The old GtkCombo widget was deprecated.
This commit is contained in:
robxnano 2022-10-01 20:07:52 +01:00
parent a9d1f35cdf
commit 3f00759e54
2 changed files with 132 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
BasiliskII/src/Unix/prefs_editor_gtk.cpp
View File

@ -218,7 +218,7 @@ static GtkWidget *table_make_option_menu(GtkWidget *table, int row, int label_id
return menu; return menu;
} }
static GtkWidget *table_make_combobox(GtkWidget *table, int row, int label_id, const char *default_value, GList *glist) static GtkWidget *table_make_combobox(GtkWidget *table, int row, int label_id, const char *pref, GList *list)
{ {
GtkWidget *label, *combo; GtkWidget *label, *combo;
@ -226,11 +226,15 @@ static GtkWidget *table_make_combobox(GtkWidget *table, int row, int label_id, c
gtk_widget_show(label); gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, row, row + 1, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4); gtk_table_attach(GTK_TABLE(table), label, 0, 1, row, row + 1, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4);
combo = gtk_combo_new(); combo = gtk_combo_box_entry_new_text();
gtk_widget_show(combo); gtk_widget_show(combo);
gtk_combo_set_popdown_strings(GTK_COMBO(combo), glist); while(list)
{
gtk_combo_box_append_text(GTK_COMBO_BOX(combo), ((gchar *) list->data));
list = list->next;
}
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), default_value); gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN (combo))), pref);
gtk_table_attach(GTK_TABLE(table), combo, 1, 2, row, row + 1, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)0, 4, 4); gtk_table_attach(GTK_TABLE(table), combo, 1, 2, row, row + 1, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)0, 4, 4);
return combo; return combo;
@ -358,18 +362,17 @@ static GtkWidget *make_combobox(GtkWidget *top, int label_id, const char *prefs_
gtk_widget_show(label); gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 0);
GList *glist = NULL; combo = gtk_combo_box_entry_new_text();
gtk_widget_show(combo);
gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
while (options->label_id) { while (options->label_id) {
glist = g_list_append(glist, (void *)GetString(options->label_id)); gtk_combo_box_append_text(GTK_COMBO_BOX(combo), (gchar *) GetString(options->label_id));
options++; options++;
} }
combo = gtk_combo_new();
gtk_widget_show(combo);
gtk_combo_set_popdown_strings(GTK_COMBO(combo), glist);
sprintf(str, "%d", PrefsFindInt32(prefs_item)); sprintf(str, "%d", PrefsFindInt32(prefs_item));
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), str); gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN (combo))), str);
gtk_box_pack_start(GTK_BOX(box), combo, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(box), combo, TRUE, TRUE, 0);
return combo; return combo;
@ -957,10 +960,10 @@ static void read_graphics_settings(void)
{ {
const char *str; const char *str;
str = gtk_entry_get_text(GTK_ENTRY(w_display_x)); str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(w_display_x));
dis_width = atoi(str); dis_width = atoi(str);
str = gtk_entry_get_text(GTK_ENTRY(w_display_y)); str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(w_display_y));
dis_height = atoi(str); dis_height = atoi(str);
char pref[256]; char pref[256];
@ -996,7 +999,7 @@ static void read_graphics_settings(void)
// Create "Graphics/Sound" pane // Create "Graphics/Sound" pane
static void create_graphics_pane(GtkWidget *top) static void create_graphics_pane(GtkWidget *top)
{ {
GtkWidget *box, *table, *label, *opt, *menu, *combo; GtkWidget *box, *table, *label, *opt, *menu;
char str[32]; char str[32];
parse_graphics_prefs(); parse_graphics_prefs();
@ -1058,43 +1061,37 @@ static void create_graphics_pane(GtkWidget *top)
gtk_widget_show(l_display_x); gtk_widget_show(l_display_x);
gtk_table_attach(GTK_TABLE(table), l_display_x, 0, 1, 2, 3, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4); gtk_table_attach(GTK_TABLE(table), l_display_x, 0, 1, 2, 3, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4);
combo = gtk_combo_new(); w_display_x = gtk_combo_box_entry_new_text();
gtk_widget_show(combo); gtk_widget_show(w_display_x);
GList *glist1 = NULL; gtk_combo_box_append_text(GTK_COMBO_BOX(w_display_x), GetString(STR_SIZE_512_LAB));
glist1 = g_list_append(glist1, (void *)GetString(STR_SIZE_512_LAB)); gtk_combo_box_append_text(GTK_COMBO_BOX(w_display_x), GetString(STR_SIZE_640_LAB));
glist1 = g_list_append(glist1, (void *)GetString(STR_SIZE_640_LAB)); gtk_combo_box_append_text(GTK_COMBO_BOX(w_display_x), GetString(STR_SIZE_800_LAB));
glist1 = g_list_append(glist1, (void *)GetString(STR_SIZE_800_LAB)); gtk_combo_box_append_text(GTK_COMBO_BOX(w_display_x), GetString(STR_SIZE_1024_LAB));
glist1 = g_list_append(glist1, (void *)GetString(STR_SIZE_1024_LAB)); gtk_combo_box_append_text(GTK_COMBO_BOX(w_display_x), GetString(STR_SIZE_MAX_LAB));
glist1 = g_list_append(glist1, (void *)GetString(STR_SIZE_MAX_LAB));
gtk_combo_set_popdown_strings(GTK_COMBO(combo), glist1);
if (dis_width) if (dis_width)
sprintf(str, "%d", dis_width); sprintf(str, "%d", dis_width);
else else
strcpy(str, GetString(STR_SIZE_MAX_LAB)); strcpy(str, GetString(STR_SIZE_MAX_LAB));
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), str); gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(w_display_x))), str);
gtk_table_attach(GTK_TABLE(table), combo, 1, 2, 2, 3, (GtkAttachOptions)GTK_FILL, (GtkAttachOptions)0, 4, 4); gtk_table_attach(GTK_TABLE(table), w_display_x, 1, 2, 2, 3, (GtkAttachOptions)GTK_FILL, (GtkAttachOptions)0, 4, 4);
w_display_x = GTK_COMBO(combo)->entry;
l_display_y = gtk_label_new(GetString(STR_DISPLAY_Y_CTRL)); l_display_y = gtk_label_new(GetString(STR_DISPLAY_Y_CTRL));
gtk_widget_show(l_display_y); gtk_widget_show(l_display_y);
gtk_table_attach(GTK_TABLE(table), l_display_y, 0, 1, 3, 4, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4); gtk_table_attach(GTK_TABLE(table), l_display_y, 0, 1, 3, 4, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4);
combo = gtk_combo_new(); w_display_y = gtk_combo_box_entry_new_text();
gtk_widget_show(combo); gtk_widget_show(w_display_y);
GList *glist2 = NULL; gtk_combo_box_append_text(GTK_COMBO_BOX(w_display_y), GetString(STR_SIZE_384_LAB));
glist2 = g_list_append(glist2, (void *)GetString(STR_SIZE_384_LAB)); gtk_combo_box_append_text(GTK_COMBO_BOX(w_display_y), GetString(STR_SIZE_480_LAB));
glist2 = g_list_append(glist2, (void *)GetString(STR_SIZE_480_LAB)); gtk_combo_box_append_text(GTK_COMBO_BOX(w_display_y), GetString(STR_SIZE_600_LAB));
glist2 = g_list_append(glist2, (void *)GetString(STR_SIZE_600_LAB)); gtk_combo_box_append_text(GTK_COMBO_BOX(w_display_y), GetString(STR_SIZE_768_LAB));
glist2 = g_list_append(glist2, (void *)GetString(STR_SIZE_768_LAB)); gtk_combo_box_append_text(GTK_COMBO_BOX(w_display_y), GetString(STR_SIZE_MAX_LAB));
glist2 = g_list_append(glist2, (void *)GetString(STR_SIZE_MAX_LAB));
gtk_combo_set_popdown_strings(GTK_COMBO(combo), glist2);
if (dis_height) if (dis_height)
sprintf(str, "%d", dis_height); sprintf(str, "%d", dis_height);
else else
strcpy(str, GetString(STR_SIZE_MAX_LAB)); strcpy(str, GetString(STR_SIZE_MAX_LAB));
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), str); gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(w_display_y))), str);
gtk_table_attach(GTK_TABLE(table), combo, 1, 2, 3, 4, (GtkAttachOptions)GTK_FILL, (GtkAttachOptions)0, 4, 4); gtk_table_attach(GTK_TABLE(table), w_display_y, 1, 2, 3, 4, (GtkAttachOptions)GTK_FILL, (GtkAttachOptions)0, 4, 4);
w_display_y = GTK_COMBO(combo)->entry;
#ifdef ENABLE_FBDEV_DGA #ifdef ENABLE_FBDEV_DGA
l_fbdev_name = gtk_label_new(GetString(STR_FBDEV_NAME_CTRL)); l_fbdev_name = gtk_label_new(GetString(STR_FBDEV_NAME_CTRL));
@ -1248,13 +1245,13 @@ static void read_serial_settings(void)
{ {
const char *str; const char *str;
str = gtk_entry_get_text(GTK_ENTRY(w_seriala)); str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(w_seriala));
PrefsReplaceString("seriala", str); PrefsReplaceString("seriala", str);
str = gtk_entry_get_text(GTK_ENTRY(w_serialb)); str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(w_serialb));
PrefsReplaceString("serialb", str); PrefsReplaceString("serialb", str);
str = gtk_entry_get_text(GTK_ENTRY(w_ether)); str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(w_ether));
if (str && strlen(str)) if (str && strlen(str))
PrefsReplaceString("ether", str); PrefsReplaceString("ether", str);
else else
@ -1352,57 +1349,58 @@ static void create_serial_pane(GtkWidget *top)
{ {
GtkWidget *box, *hbox, *table, *label, *combo, *sep; GtkWidget *box, *hbox, *table, *label, *combo, *sep;
GtkObject *adj; GtkObject *adj;
GList *glist = add_serial_names();
box = make_pane(top, STR_SERIAL_NETWORK_PANE_TITLE); box = make_pane(top, STR_SERIAL_NETWORK_PANE_TITLE);
table = make_table(box, 2, 4); table = make_table(box, 2, 3);
label = gtk_label_new(GetString(STR_SERIALA_CTRL)); label = gtk_label_new(GetString(STR_SERIALA_CTRL));
gtk_widget_show(label); gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4);
GList *glist = add_serial_names();
combo = gtk_combo_new();
gtk_widget_show(combo);
gtk_combo_set_popdown_strings(GTK_COMBO(combo), glist);
const char *str = PrefsFindString("seriala");
if (str == NULL)
str = "";
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), str);
gtk_table_attach(GTK_TABLE(table), combo, 1, 2, 0, 1, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)0, 4, 4);
w_seriala = GTK_COMBO(combo)->entry;
label = gtk_label_new(GetString(STR_SERIALB_CTRL)); label = gtk_label_new(GetString(STR_SERIALB_CTRL));
gtk_widget_show(label); gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4);
combo = gtk_combo_new(); w_seriala = gtk_combo_box_entry_new_text();
gtk_widget_show(combo); gtk_widget_show(w_seriala);
gtk_combo_set_popdown_strings(GTK_COMBO(combo), glist); w_serialb = gtk_combo_box_entry_new_text();
gtk_widget_show(w_serialb);
while (glist)
{
gtk_combo_box_append_text(GTK_COMBO_BOX(w_seriala), (gchar *)glist->data);
gtk_combo_box_append_text(GTK_COMBO_BOX(w_serialb), (gchar *)glist->data);
glist = glist->next;
}
const char *str = PrefsFindString("seriala");
if (str == NULL)
str = "";
gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(w_seriala))), str);
str = PrefsFindString("serialb"); str = PrefsFindString("serialb");
if (str == NULL) if (str == NULL)
str = ""; str = "";
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), str); gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(w_serialb))), str);
gtk_table_attach(GTK_TABLE(table), combo, 1, 2, 1, 2, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)0, 4, 4);
w_serialb = GTK_COMBO(combo)->entry;
sep = gtk_hseparator_new(); gtk_table_attach(GTK_TABLE(table), w_seriala, 1, 2, 0, 1, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)0, 4, 4);
gtk_widget_show(sep); gtk_table_attach(GTK_TABLE(table), w_serialb, 1, 2, 1, 2, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)0, 4, 4);
gtk_table_attach(GTK_TABLE(table), sep, 0, 2, 2, 3, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4);
label = gtk_label_new(GetString(STR_ETHERNET_IF_CTRL)); label = gtk_label_new(GetString(STR_ETHERNET_IF_CTRL));
gtk_widget_show(label); gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4);
glist = add_ether_names(); glist = add_ether_names();
combo = gtk_combo_new(); w_ether = gtk_combo_box_entry_new_text();
gtk_widget_show(combo); gtk_widget_show(w_ether);
gtk_combo_set_popdown_strings(GTK_COMBO(combo), glist); while (glist)
{
gtk_combo_box_append_text(GTK_COMBO_BOX(w_ether), (gchar *)glist->data);
glist = glist->next;
}
str = PrefsFindString("ether"); str = PrefsFindString("ether");
if (str == NULL) if (str == NULL)
str = ""; str = "";
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), str); gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(w_ether))), str);
gtk_table_attach(GTK_TABLE(table), combo, 1, 2, 3, 4, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)0, 4, 4); gtk_table_attach(GTK_TABLE(table), w_ether, 1, 2, 2, 3, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)0, 4, 4);
w_ether = GTK_COMBO(combo)->entry;
#if SUPPORTS_UDP_TUNNEL #if SUPPORTS_UDP_TUNNEL
make_checkbox(box, STR_UDPTUNNEL_CTRL, "udptunnel", G_CALLBACK(tb_udptunnel)); make_checkbox(box, STR_UDPTUNNEL_CTRL, "udptunnel", G_CALLBACK(tb_udptunnel));
@ -1460,7 +1458,7 @@ static void mn_cpu_68040(...) {PrefsReplaceInt32("cpu", 4); PrefsReplaceBool("fp
// Read settings from widgets and set preferences // Read settings from widgets and set preferences
static void read_memory_settings(void) static void read_memory_settings(void)
{ {
const char *str = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(w_ramsize)->entry)); const char *str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(w_ramsize));
PrefsReplaceInt32("ramsize", atoi(str) << 20); PrefsReplaceInt32("ramsize", atoi(str) << 20);
str = get_file_entry_path(w_rom_file); str = get_file_entry_path(w_rom_file);

122
SheepShaver/src/Unix/prefs_editor_gtk.cpp
View File

@ -218,20 +218,25 @@ static GtkWidget *table_make_option_menu(GtkWidget *table, int row, int label_id
return menu; return menu;
} }
static GtkWidget *table_make_combobox(GtkWidget *table, int row, int label_id, const char *default_value, GList *glist) static GtkWidget *table_make_combobox(GtkWidget *table, int row, int label_id, const char *pref, GList *list)
{ {
GtkWidget *label, *combo; GtkWidget *label, *combo;
char str[32]; char str[32];
label = gtk_label_new(GetString(label_id)); label = gtk_label_new(GetString(label_id));
gtk_widget_show(label); gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, row, row + 1, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4); gtk_table_attach(GTK_TABLE(table), label, 0, 1, row, row + 1, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4);
combo = gtk_combo_new(); combo = gtk_combo_box_entry_new_text();
gtk_widget_show(combo); gtk_widget_show(combo);
gtk_combo_set_popdown_strings(GTK_COMBO(combo), glist); gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
while(list)
{
gtk_combo_box_append_text(GTK_COMBO_BOX(combo), ((gchar *) list->data));
list = list->next;
}
if (pref != NULL)
gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN (combo))), pref);
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), default_value);
gtk_table_attach(GTK_TABLE(table), combo, 1, 2, row, row + 1, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)0, 4, 4); gtk_table_attach(GTK_TABLE(table), combo, 1, 2, row, row + 1, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)0, 4, 4);
return combo; return combo;
@ -885,10 +890,10 @@ static void read_graphics_settings(void)
{ {
const char *str; const char *str;
str = gtk_entry_get_text(GTK_ENTRY(w_display_x)); str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(w_display_x));
dis_width = atoi(str); dis_width = atoi(str);
str = gtk_entry_get_text(GTK_ENTRY(w_display_y)); str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(w_display_y));
dis_height = atoi(str); dis_height = atoi(str);
char pref[256]; char pref[256];
@ -980,43 +985,37 @@ static void create_graphics_pane(GtkWidget *top)
gtk_widget_show(l_display_x); gtk_widget_show(l_display_x);
gtk_table_attach(GTK_TABLE(table), l_display_x, 0, 1, 2, 3, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4); gtk_table_attach(GTK_TABLE(table), l_display_x, 0, 1, 2, 3, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4);
combo = gtk_combo_new(); w_display_x = gtk_combo_box_entry_new_text();
gtk_widget_show(combo); gtk_widget_show(w_display_x);
GList *glist1 = NULL; gtk_combo_box_append_text(GTK_COMBO_BOX(w_display_x), GetString(STR_SIZE_512_LAB));
glist1 = g_list_append(glist1, (void *)GetString(STR_SIZE_512_LAB)); gtk_combo_box_append_text(GTK_COMBO_BOX(w_display_x), GetString(STR_SIZE_640_LAB));
glist1 = g_list_append(glist1, (void *)GetString(STR_SIZE_640_LAB)); gtk_combo_box_append_text(GTK_COMBO_BOX(w_display_x), GetString(STR_SIZE_800_LAB));
glist1 = g_list_append(glist1, (void *)GetString(STR_SIZE_800_LAB)); gtk_combo_box_append_text(GTK_COMBO_BOX(w_display_x), GetString(STR_SIZE_1024_LAB));
glist1 = g_list_append(glist1, (void *)GetString(STR_SIZE_1024_LAB)); gtk_combo_box_append_text(GTK_COMBO_BOX(w_display_x), GetString(STR_SIZE_MAX_LAB));
glist1 = g_list_append(glist1, (void *)GetString(STR_SIZE_MAX_LAB));
gtk_combo_set_popdown_strings(GTK_COMBO(combo), glist1);
if (dis_width) if (dis_width)
sprintf(str, "%d", dis_width); sprintf(str, "%d", dis_width);
else else
strcpy(str, GetString(STR_SIZE_MAX_LAB)); strcpy(str, GetString(STR_SIZE_MAX_LAB));
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), str); gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(w_display_x))), str);
gtk_table_attach(GTK_TABLE(table), combo, 1, 2, 2, 3, (GtkAttachOptions)GTK_FILL, (GtkAttachOptions)0, 4, 4); gtk_table_attach(GTK_TABLE(table), w_display_x, 1, 2, 2, 3, (GtkAttachOptions)GTK_FILL, (GtkAttachOptions)0, 4, 4);
w_display_x = GTK_COMBO(combo)->entry;
l_display_y = gtk_label_new(GetString(STR_DISPLAY_Y_CTRL)); l_display_y = gtk_label_new(GetString(STR_DISPLAY_Y_CTRL));
gtk_widget_show(l_display_y); gtk_widget_show(l_display_y);
gtk_table_attach(GTK_TABLE(table), l_display_y, 0, 1, 3, 4, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4); gtk_table_attach(GTK_TABLE(table), l_display_y, 0, 1, 3, 4, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4);
combo = gtk_combo_new(); w_display_y = gtk_combo_box_entry_new_text();
gtk_widget_show(combo); gtk_widget_show(w_display_y);
GList *glist2 = NULL; gtk_combo_box_append_text(GTK_COMBO_BOX(w_display_y), GetString(STR_SIZE_384_LAB));
glist2 = g_list_append(glist2, (void *)GetString(STR_SIZE_384_LAB)); gtk_combo_box_append_text(GTK_COMBO_BOX(w_display_y), GetString(STR_SIZE_480_LAB));
glist2 = g_list_append(glist2, (void *)GetString(STR_SIZE_480_LAB)); gtk_combo_box_append_text(GTK_COMBO_BOX(w_display_y), GetString(STR_SIZE_600_LAB));
glist2 = g_list_append(glist2, (void *)GetString(STR_SIZE_600_LAB)); gtk_combo_box_append_text(GTK_COMBO_BOX(w_display_y), GetString(STR_SIZE_768_LAB));
glist2 = g_list_append(glist2, (void *)GetString(STR_SIZE_768_LAB)); gtk_combo_box_append_text(GTK_COMBO_BOX(w_display_y), GetString(STR_SIZE_MAX_LAB));
glist2 = g_list_append(glist2, (void *)GetString(STR_SIZE_MAX_LAB));
gtk_combo_set_popdown_strings(GTK_COMBO(combo), glist2);
if (dis_height) if (dis_height)
sprintf(str, "%d", dis_height); sprintf(str, "%d", dis_height);
else else
strcpy(str, GetString(STR_SIZE_MAX_LAB)); strcpy(str, GetString(STR_SIZE_MAX_LAB));
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), str); gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(w_display_y))), str);
gtk_table_attach(GTK_TABLE(table), combo, 1, 2, 3, 4, (GtkAttachOptions)GTK_FILL, (GtkAttachOptions)0, 4, 4); gtk_table_attach(GTK_TABLE(table), w_display_y, 1, 2, 3, 4, (GtkAttachOptions)GTK_FILL, (GtkAttachOptions)0, 4, 4);
w_display_y = GTK_COMBO(combo)->entry;
make_checkbox(box, STR_GFXACCEL_CTRL, PrefsFindBool("gfxaccel"), G_CALLBACK(tb_gfxaccel)); make_checkbox(box, STR_GFXACCEL_CTRL, PrefsFindBool("gfxaccel"), G_CALLBACK(tb_gfxaccel));
@ -1143,13 +1142,13 @@ static void read_serial_settings(void)
{ {
const char *str; const char *str;
str = gtk_entry_get_text(GTK_ENTRY(w_seriala)); str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(w_seriala));
PrefsReplaceString("seriala", str); PrefsReplaceString("seriala", str);
str = gtk_entry_get_text(GTK_ENTRY(w_serialb)); str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(w_serialb));
PrefsReplaceString("serialb", str); PrefsReplaceString("serialb", str);
str = gtk_entry_get_text(GTK_ENTRY(w_ether)); str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(w_ether));
if (str && strlen(str)) if (str && strlen(str))
PrefsReplaceString("ether", str); PrefsReplaceString("ether", str);
else else
@ -1250,45 +1249,50 @@ static void create_serial_pane(GtkWidget *top)
label = gtk_label_new(GetString(STR_SERPORTA_CTRL)); label = gtk_label_new(GetString(STR_SERPORTA_CTRL));
gtk_widget_show(label); gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4);
combo = gtk_combo_new();
gtk_widget_show(combo);
gtk_combo_set_popdown_strings(GTK_COMBO(combo), glist);
const char *str = PrefsFindString("seriala");
if (str == NULL)
str = "";
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), str);
gtk_table_attach(GTK_TABLE(table), combo, 1, 2, 0, 1, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)0, 4, 4);
w_seriala = GTK_COMBO(combo)->entry;
label = gtk_label_new(GetString(STR_SERPORTB_CTRL)); label = gtk_label_new(GetString(STR_SERPORTB_CTRL));
gtk_widget_show(label); gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4);
combo = gtk_combo_new(); w_seriala = gtk_combo_box_entry_new_text();
gtk_widget_show(combo); gtk_widget_show(w_seriala);
gtk_combo_set_popdown_strings(GTK_COMBO(combo), glist); w_serialb = gtk_combo_box_entry_new_text();
gtk_widget_show(w_serialb);
while (glist)
{
gtk_combo_box_append_text(GTK_COMBO_BOX(w_seriala), (gchar *)glist->data);
gtk_combo_box_append_text(GTK_COMBO_BOX(w_serialb), (gchar *)glist->data);
glist = glist->next;
}
const char *str = PrefsFindString("seriala");
if (str == NULL)
str = "";
gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(w_seriala))), str);
str = PrefsFindString("serialb"); str = PrefsFindString("serialb");
if (str == NULL) if (str == NULL)
str = ""; str = "";
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), str); gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(w_serialb))), str);
gtk_table_attach(GTK_TABLE(table), combo, 1, 2, 1, 2, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)0, 4, 4);
w_serialb = GTK_COMBO(combo)->entry; gtk_table_attach(GTK_TABLE(table), w_seriala, 1, 2, 0, 1, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)0, 4, 4);
gtk_table_attach(GTK_TABLE(table), w_serialb, 1, 2, 1, 2, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)0, 4, 4);
label = gtk_label_new(GetString(STR_ETHERNET_IF_CTRL)); label = gtk_label_new(GetString(STR_ETHERNET_IF_CTRL));
gtk_widget_show(label); gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4);
glist = add_ether_names(); glist = add_ether_names();
combo = gtk_combo_new(); w_ether = gtk_combo_box_entry_new_text();
gtk_widget_show(combo); gtk_widget_show(w_ether);
gtk_combo_set_popdown_strings(GTK_COMBO(combo), glist); while (glist)
{
gtk_combo_box_append_text(GTK_COMBO_BOX(w_ether), (gchar *)glist->data);
glist = glist->next;
}
str = PrefsFindString("ether"); str = PrefsFindString("ether");
if (str == NULL) if (str == NULL)
str = ""; str = "";
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), str); gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(w_ether))), str);
gtk_table_attach(GTK_TABLE(table), combo, 1, 2, 2, 3, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)0, 4, 4); gtk_table_attach(GTK_TABLE(table), w_ether, 1, 2, 2, 3, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)0, 4, 4);
w_ether = GTK_COMBO(combo)->entry;
} }
@ -1314,7 +1318,7 @@ static void tb_ignoresegv(GtkWidget *widget)
// Read settings from widgets and set preferences // Read settings from widgets and set preferences
static void read_memory_settings(void) static void read_memory_settings(void)
{ {
const char *str = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(w_ramsize)->entry)); const char *str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(w_ramsize));
PrefsReplaceInt32("ramsize", atoi(str) << 20); PrefsReplaceInt32("ramsize", atoi(str) << 20);
str = gtk_entry_get_text(GTK_ENTRY(w_rom_file)); str = gtk_entry_get_text(GTK_ENTRY(w_rom_file));
@ -1333,8 +1337,6 @@ static void create_memory_pane(GtkWidget *top)
table = make_table(box, 2, 5); table = make_table(box, 2, 5);
static const combo_desc options[] = { static const combo_desc options[] = {
STR_RAMSIZE_4MB_LAB,
STR_RAMSIZE_8MB_LAB,
STR_RAMSIZE_16MB_LAB, STR_RAMSIZE_16MB_LAB,
STR_RAMSIZE_32MB_LAB, STR_RAMSIZE_32MB_LAB,
STR_RAMSIZE_64MB_LAB, STR_RAMSIZE_64MB_LAB,