diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-10-29 09:53:03 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-10-29 09:53:03 +0000 |
| commit | 26144025a450ab2adf200e751ace02ff3dd6f565 (patch) | |
| tree | 1b1dc0223c32017c3d985f840f57e4587284463d /plugins/dfinput | |
| parent | 8f670bd1cb89e1e867b6e86208d670489f905429 (diff) | |
| download | pcsxr-26144025a450ab2adf200e751ace02ff3dd6f565.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@33750 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'plugins/dfinput')
| -rw-r--r-- | plugins/dfinput/cfg-gtk2.c | 15 | ||||
| -rw-r--r-- | plugins/dfinput/dfinput.glade2 | 18 |
2 files changed, 29 insertions, 4 deletions
diff --git a/plugins/dfinput/cfg-gtk2.c b/plugins/dfinput/cfg-gtk2.c index a0e34647..c2013833 100644 --- a/plugins/dfinput/cfg-gtk2.c +++ b/plugins/dfinput/cfg-gtk2.c @@ -213,6 +213,13 @@ static void UpdateKey() { } static void OnConfigExit(GtkWidget *widget, gpointer user_data) { + gtk_widget_destroy(widget); + SDL_Quit(); + + gtk_exit(0); +} + +static void OnConfigOk(GtkWidget *widget, gpointer user_data) { SaveConfig(); gtk_widget_destroy(widget); @@ -560,9 +567,13 @@ long PADconfigure() { g_signal_connect_data(GTK_OBJECT(widget), "delete_event", GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER); - widget = glade_xml_get_widget(xml, "btnclose"); + widget = glade_xml_get_widget(xml, "btncancel"); + g_signal_connect_data(GTK_OBJECT(widget), "clicked", + GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER); + + widget = glade_xml_get_widget(xml, "btnok"); g_signal_connect_data(GTK_OBJECT(widget), "clicked", - GTK_SIGNAL_FUNC(OnConfigExit), xml, NULL, G_CONNECT_AFTER); + GTK_SIGNAL_FUNC(OnConfigOk), xml, NULL, G_CONNECT_AFTER); PopulateDevList(); UpdateKeyList(); diff --git a/plugins/dfinput/dfinput.glade2 b/plugins/dfinput/dfinput.glade2 index c7bdd114..e7958be0 100644 --- a/plugins/dfinput/dfinput.glade2 +++ b/plugins/dfinput/dfinput.glade2 @@ -463,8 +463,8 @@ Analog Pad</property> <property name="visible">True</property> <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="btnclose"> - <property name="label">gtk-close</property> + <widget class="GtkButton" id="btncancel"> + <property name="label">gtk-cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -476,6 +476,20 @@ Analog Pad</property> <property name="position">0</property> </packing> </child> + <child> + <widget class="GtkButton" id="btnok"> + <property name="label">gtk-ok</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> </widget> <packing> <property name="expand">False</property> |