diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-12-28 09:04:21 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-12-28 09:04:21 +0000 |
| commit | b7e261606bffd87c8bcc81a76cf09b276eca7ec1 (patch) | |
| tree | 5c7cb22ffeb3eb604d574d1bd19b5e68fc75b668 /plugins/dfinput | |
| parent | c3282a78c64fae6b9aa96b04f2ccef3f646d55ca (diff) | |
| download | pcsxr-b7e261606bffd87c8bcc81a76cf09b276eca7ec1.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@39695 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'plugins/dfinput')
| -rw-r--r-- | plugins/dfinput/cfg-gtk2.c | 13 | ||||
| -rw-r--r-- | plugins/dfinput/dfinput.glade2 | 18 |
2 files changed, 3 insertions, 28 deletions
diff --git a/plugins/dfinput/cfg-gtk2.c b/plugins/dfinput/cfg-gtk2.c index 644269ba..0434d363 100644 --- a/plugins/dfinput/cfg-gtk2.c +++ b/plugins/dfinput/cfg-gtk2.c @@ -255,13 +255,6 @@ 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); @@ -631,14 +624,10 @@ 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, "btncancel"); + widget = glade_xml_get_widget(xml, "btnclose"); 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(OnConfigOk), xml, NULL, G_CONNECT_AFTER); - PopulateDevList(); UpdateKeyList(); diff --git a/plugins/dfinput/dfinput.glade2 b/plugins/dfinput/dfinput.glade2 index e7958be0..c7bdd114 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="btncancel"> - <property name="label">gtk-cancel</property> + <widget class="GtkButton" id="btnclose"> + <property name="label">gtk-close</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -476,20 +476,6 @@ 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> |