ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GTK: replaced depreciated combo with a nice nifty combo box (minor UI improvement)

This commit is contained in:
punkrockguy318 2010-02-19 04:33:43 +00:00
parent 735e239977
commit 125648d2f7
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/drivers/sdl/gui.cpp
View File

@ -27,7 +27,7 @@ int configGamepadButton(GtkButton* button, gpointer p)
{ {
int x = GPOINTER_TO_INT(p); int x = GPOINTER_TO_INT(p);
int padNo = 0; int padNo = 0;
char* padStr = (char*)gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(padNoCombo)->entry)); char* padStr = gtk_combo_box_get_active_text(GTK_COMBO_BOX(padNoCombo));
if(!strcmp(padStr, "1")) if(!strcmp(padStr, "1"))
padNo = 0; padNo = 0;
@ -77,20 +77,18 @@ void openGamepadConfig()
win = gtk_window_new(GTK_WINDOW_TOPLEVEL); win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(win), "Gamepad Config"); gtk_window_set_title(GTK_WINDOW(win), "Gamepad Config");
gtk_widget_set_size_request(win, 300, 600); gtk_widget_set_size_request(win, 250, 500);
vbox = gtk_vbox_new(TRUE, 2); vbox = gtk_vbox_new(TRUE, 2);
hboxPadNo = gtk_hbox_new(TRUE, 1); hboxPadNo = gtk_hbox_new(TRUE, 1);
padNoLabel = gtk_label_new("Gamepad Number:"); padNoLabel = gtk_label_new("Gamepad Number:");
padNoCombo = gtk_combo_new(); padNoCombo = gtk_combo_box_new_text();
GList *padList = NULL; gtk_combo_box_append_text(GTK_COMBO_BOX(padNoCombo), "1");
gtk_combo_box_append_text(GTK_COMBO_BOX(padNoCombo), "2");
gtk_combo_box_append_text(GTK_COMBO_BOX(padNoCombo), "3");
gtk_combo_box_append_text(GTK_COMBO_BOX(padNoCombo), "4");
padList = g_list_append (padList, (void*)"1"); gtk_combo_box_set_active(GTK_COMBO_BOX(padNoCombo), 0);
padList = g_list_append (padList, (void*)"2");
padList = g_list_append (padList, (void*)"3");
padList = g_list_append (padList, (void*)"4");
gtk_combo_set_popdown_strings(GTK_COMBO(padNoCombo), padList);
gtk_box_pack_start(GTK_BOX(hboxPadNo), padNoLabel, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hboxPadNo), padNoLabel, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(hboxPadNo), padNoCombo, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hboxPadNo), padNoCombo, TRUE, TRUE, 0);
@ -151,7 +149,6 @@ void openSoundConfig()
GtkWidget* vbox; GtkWidget* vbox;
GtkWidget* soundChk; GtkWidget* soundChk;
GtkWidget* hbox1; GtkWidget* hbox1;
GtkListStore* qualityList;
GtkWidget* qualityCombo; GtkWidget* qualityCombo;
GtkWidget* qualityLbl; GtkWidget* qualityLbl;
GtkWidget* hbox2; GtkWidget* hbox2;