--- BasiliskII/src/Unix/prefs_editor_gtk.cpp 1999/10/12 20:00:52 1.3 +++ BasiliskII/src/Unix/prefs_editor_gtk.cpp 1999/10/14 11:37:45 1.4 @@ -258,13 +258,13 @@ static void mn_zap_pram(...) // Menu item descriptions static GtkItemFactoryEntry menu_items[] = { - {GetString(STR_PREFS_MENU_FILE_GTK), NULL, NULL, 0, ""}, - {GetString(STR_PREFS_ITEM_START_GTK), NULL, GTK_SIGNAL_FUNC(cb_start), 0, NULL}, - {GetString(STR_PREFS_ITEM_ZAP_PRAM_GTK), NULL, GTK_SIGNAL_FUNC(mn_zap_pram), 0, NULL}, - {GetString(STR_PREFS_ITEM_SEPL_GTK), NULL, NULL, 0, ""}, - {GetString(STR_PREFS_ITEM_QUIT_GTK), "Q", GTK_SIGNAL_FUNC(cb_quit), 0, NULL}, - {GetString(STR_HELP_MENU_GTK), NULL, NULL, 0, ""}, - {GetString(STR_HELP_ITEM_ABOUT_GTK), NULL, GTK_SIGNAL_FUNC(mn_about), 0, NULL} + {(gchar *)GetString(STR_PREFS_MENU_FILE_GTK), NULL, NULL, 0, ""}, + {(gchar *)GetString(STR_PREFS_ITEM_START_GTK), NULL, GTK_SIGNAL_FUNC(cb_start), 0, NULL}, + {(gchar *)GetString(STR_PREFS_ITEM_ZAP_PRAM_GTK), NULL, GTK_SIGNAL_FUNC(mn_zap_pram), 0, NULL}, + {(gchar *)GetString(STR_PREFS_ITEM_SEPL_GTK), NULL, NULL, 0, ""}, + {(gchar *)GetString(STR_PREFS_ITEM_QUIT_GTK), "Q", GTK_SIGNAL_FUNC(cb_quit), 0, NULL}, + {(gchar *)GetString(STR_HELP_MENU_GTK), NULL, NULL, 0, ""}, + {(gchar *)GetString(STR_HELP_ITEM_ABOUT_GTK), NULL, GTK_SIGNAL_FUNC(mn_about), 0, NULL} }; bool PrefsEditor(void) @@ -678,11 +678,11 @@ static void create_graphics_pane(GtkWidg combo = gtk_combo_new(); gtk_widget_show(combo); GList *glist1 = NULL; - glist1 = g_list_append(glist1, GetString(STR_SIZE_512_LAB)); - glist1 = g_list_append(glist1, GetString(STR_SIZE_640_LAB)); - glist1 = g_list_append(glist1, GetString(STR_SIZE_800_LAB)); - glist1 = g_list_append(glist1, GetString(STR_SIZE_1024_LAB)); - glist1 = g_list_append(glist1, GetString(STR_SIZE_MAX_LAB)); + glist1 = g_list_append(glist1, (void *)GetString(STR_SIZE_512_LAB)); + glist1 = g_list_append(glist1, (void *)GetString(STR_SIZE_640_LAB)); + glist1 = g_list_append(glist1, (void *)GetString(STR_SIZE_800_LAB)); + glist1 = g_list_append(glist1, (void *)GetString(STR_SIZE_1024_LAB)); + glist1 = g_list_append(glist1, (void *)GetString(STR_SIZE_MAX_LAB)); gtk_combo_set_popdown_strings(GTK_COMBO(combo), glist1); if (dis_width) sprintf(str, "%d", dis_width); @@ -699,11 +699,11 @@ static void create_graphics_pane(GtkWidg combo = gtk_combo_new(); gtk_widget_show(combo); GList *glist2 = NULL; - glist2 = g_list_append(glist2, GetString(STR_SIZE_384_LAB)); - glist2 = g_list_append(glist2, GetString(STR_SIZE_480_LAB)); - glist2 = g_list_append(glist2, GetString(STR_SIZE_600_LAB)); - glist2 = g_list_append(glist2, GetString(STR_SIZE_768_LAB)); - glist2 = g_list_append(glist2, GetString(STR_SIZE_MAX_LAB)); + glist2 = g_list_append(glist2, (void *)GetString(STR_SIZE_384_LAB)); + glist2 = g_list_append(glist2, (void *)GetString(STR_SIZE_480_LAB)); + glist2 = g_list_append(glist2, (void *)GetString(STR_SIZE_600_LAB)); + glist2 = g_list_append(glist2, (void *)GetString(STR_SIZE_768_LAB)); + glist2 = g_list_append(glist2, (void *)GetString(STR_SIZE_MAX_LAB)); gtk_combo_set_popdown_strings(GTK_COMBO(combo), glist2); if (dis_height) sprintf(str, "%d", dis_height); @@ -762,6 +762,8 @@ static GList *add_serial_names(void) if (strncmp(de->d_name, "ttyS", 4) == 0 || strncmp(de->d_name, "lp", 2) == 0) { #elif defined(__FreeBSD__) if (strncmp(de->d_name, "cuaa", 4) == 0 || strncmp(de->d_name, "lpt", 3) == 0) { +#elif defined(__NetBSD__) + if (strncmp(de->d_name, "tty0", 4) == 0 || strncmp(de->d_name, "lpt", 3) == 0) { #elif defined(sgi) if (strncmp(de->d_name, "ttyf", 4) == 0 || strncmp(de->d_name, "plp", 3) == 0) { #else @@ -777,7 +779,7 @@ static GList *add_serial_names(void) if (glist) g_list_sort(glist, gl_str_cmp); else - glist = g_list_append(glist, GetString(STR_NONE_LAB)); + glist = g_list_append(glist, (void *)GetString(STR_NONE_LAB)); return glist; } @@ -797,10 +799,12 @@ static GList *add_ether_names(void) struct ifreq req, *ifr = ifc.ifc_req; for (int i=0; iifr_name, 63); @@ -813,7 +817,7 @@ static GList *add_ether_names(void) if (glist) g_list_sort(glist, gl_str_cmp); else - glist = g_list_append(glist, GetString(STR_NONE_LAB)); + glist = g_list_append(glist, (void *)GetString(STR_NONE_LAB)); return glist; } @@ -910,7 +914,7 @@ static void read_memory_settings(void) // Create "Memory/Misc" pane static void create_memory_pane(GtkWidget *top) { - GtkWidget *box, *vbox, *hbox, *hbox2, *label, *scale, *opt, *menu; + GtkWidget *box, *vbox, *hbox, *hbox2, *label, *scale, *menu; box = make_pane(top, STR_MEMORY_MISC_PANE_TITLE);