Mercurial > hg > xmms-sid
comparison src/xs_config.c @ 665:94186706beed
Use macro wrapping for Gtk+ v1 vs v2 differences, yet again.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Thu, 03 Apr 2008 00:44:33 +0300 |
parents | b0743dc9165d |
children | 50e036a32db8 |
comparison
equal
deleted
inserted
replaced
664:0fef72dce601 | 665:94186706beed |
---|---|
773 { | 773 { |
774 (void) button; | 774 (void) button; |
775 (void) user_data; | 775 (void) user_data; |
776 | 776 |
777 if (xs_sldb_fileselector != NULL) { | 777 if (xs_sldb_fileselector != NULL) { |
778 gdk_window_raise(xs_sldb_fileselector->window); | 778 XS_WINDOW_PRESENT(xs_sldb_fileselector); |
779 return; | 779 return; |
780 } | 780 } |
781 | 781 |
782 xs_sldb_fileselector = create_xs_sldb_fs(); | 782 xs_sldb_fileselector = create_xs_sldb_fs(); |
783 XS_MUTEX_LOCK(xs_cfg); | 783 XS_MUTEX_LOCK(xs_cfg); |
811 { | 811 { |
812 (void) button; | 812 (void) button; |
813 (void) user_data; | 813 (void) user_data; |
814 | 814 |
815 if (xs_stil_fileselector != NULL) { | 815 if (xs_stil_fileselector != NULL) { |
816 gdk_window_raise(xs_stil_fileselector->window); | 816 XS_WINDOW_PRESENT(xs_stil_fileselector); |
817 return; | 817 return; |
818 } | 818 } |
819 | 819 |
820 xs_stil_fileselector = create_xs_stil_fs(); | 820 xs_stil_fileselector = create_xs_stil_fs(); |
821 XS_MUTEX_LOCK(xs_cfg); | 821 XS_MUTEX_LOCK(xs_cfg); |
850 { | 850 { |
851 (void) button; | 851 (void) button; |
852 (void) user_data; | 852 (void) user_data; |
853 | 853 |
854 if (xs_hvsc_selector != NULL) { | 854 if (xs_hvsc_selector != NULL) { |
855 gdk_window_raise(xs_hvsc_selector->window); | 855 XS_WINDOW_PRESENT(xs_hvsc_selector); |
856 return; | 856 return; |
857 } | 857 } |
858 | 858 |
859 xs_hvsc_selector = create_xs_hvsc_fs(); | 859 xs_hvsc_selector = create_xs_hvsc_fs(); |
860 XS_MUTEX_LOCK(xs_cfg); | 860 XS_MUTEX_LOCK(xs_cfg); |
1009 { | 1009 { |
1010 (void) button; | 1010 (void) button; |
1011 (void) user_data; | 1011 (void) user_data; |
1012 | 1012 |
1013 if (xs_filt_importselector != NULL) { | 1013 if (xs_filt_importselector != NULL) { |
1014 gdk_window_raise(xs_filt_importselector->window); | 1014 XS_WINDOW_PRESENT(xs_filt_importselector); |
1015 return; | 1015 return; |
1016 } | 1016 } |
1017 | 1017 |
1018 xs_filt_importselector = create_xs_filter_import_fs(); | 1018 xs_filt_importselector = create_xs_filter_import_fs(); |
1019 gtk_widget_show(xs_filt_importselector); | 1019 gtk_widget_show(xs_filt_importselector); |
1048 { | 1048 { |
1049 (void) button; | 1049 (void) button; |
1050 (void) user_data; | 1050 (void) user_data; |
1051 | 1051 |
1052 if (xs_filt_exportselector != NULL) { | 1052 if (xs_filt_exportselector != NULL) { |
1053 gdk_window_raise(xs_filt_exportselector->window); | 1053 XS_WINDOW_PRESENT(xs_filt_exportselector); |
1054 return; | 1054 return; |
1055 } | 1055 } |
1056 | 1056 |
1057 xs_filt_exportselector = create_xs_filter_export_fs(); | 1057 xs_filt_exportselector = create_xs_filter_export_fs(); |
1058 gtk_widget_show(xs_filt_exportselector); | 1058 gtk_widget_show(xs_filt_exportselector); |
1258 GList *tmpList = NULL; | 1258 GList *tmpList = NULL; |
1259 GtkWidget *tmpCurve; | 1259 GtkWidget *tmpCurve; |
1260 | 1260 |
1261 /* Check if the window already exists */ | 1261 /* Check if the window already exists */ |
1262 if (xs_configwin) { | 1262 if (xs_configwin) { |
1263 gdk_window_raise(xs_configwin->window); | 1263 XS_WINDOW_PRESENT(xs_configwin); |
1264 return; | 1264 return; |
1265 } | 1265 } |
1266 | 1266 |
1267 /* Create the window */ | 1267 /* Create the window */ |
1268 xs_configwin = create_xs_configwin(); | 1268 xs_configwin = create_xs_configwin(); |