Mercurial > hg > xmms-sid
changeset 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 | 0fef72dce601 |
children | 50e036a32db8 |
files | src/xmms-sid.h src/xs_about.c src/xs_config.c src/xs_fileinfo.c |
diffstat | 4 files changed, 10 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xmms-sid.h Thu Apr 03 00:34:07 2008 +0300 +++ b/src/xmms-sid.h Thu Apr 03 00:44:33 2008 +0300 @@ -218,6 +218,8 @@ #define XS_SIGNAL_CONNECT(SOBJ, SNAME, SFUNC, SDATA) \ gtk_signal_connect(GTK_OBJECT(SOBJ), SNAME, GTK_SIGNAL_FUNC(SFUNC), SDATA) +#define XS_WINDOW_PRESENT(SWIN) gdk_window_raise(SWIN ->window) + #ifdef __cplusplus } #endif
--- a/src/xs_about.c Thu Apr 03 00:34:07 2008 +0300 +++ b/src/xs_about.c Thu Apr 03 00:44:33 2008 +0300 @@ -72,7 +72,7 @@ /* Check if there already is an open about window */ if (xs_aboutwin != NULL) { - gdk_window_raise(xs_aboutwin->window); + XS_WINDOW_PRESENT(xs_aboutwin); return; }
--- a/src/xs_config.c Thu Apr 03 00:34:07 2008 +0300 +++ b/src/xs_config.c Thu Apr 03 00:44:33 2008 +0300 @@ -775,7 +775,7 @@ (void) user_data; if (xs_sldb_fileselector != NULL) { - gdk_window_raise(xs_sldb_fileselector->window); + XS_WINDOW_PRESENT(xs_sldb_fileselector); return; } @@ -813,7 +813,7 @@ (void) user_data; if (xs_stil_fileselector != NULL) { - gdk_window_raise(xs_stil_fileselector->window); + XS_WINDOW_PRESENT(xs_stil_fileselector); return; } @@ -852,7 +852,7 @@ (void) user_data; if (xs_hvsc_selector != NULL) { - gdk_window_raise(xs_hvsc_selector->window); + XS_WINDOW_PRESENT(xs_hvsc_selector); return; } @@ -1011,7 +1011,7 @@ (void) user_data; if (xs_filt_importselector != NULL) { - gdk_window_raise(xs_filt_importselector->window); + XS_WINDOW_PRESENT(xs_filt_importselector); return; } @@ -1050,7 +1050,7 @@ (void) user_data; if (xs_filt_exportselector != NULL) { - gdk_window_raise(xs_filt_exportselector->window); + XS_WINDOW_PRESENT(xs_filt_exportselector); return; } @@ -1260,7 +1260,7 @@ /* Check if the window already exists */ if (xs_configwin) { - gdk_window_raise(xs_configwin->window); + XS_WINDOW_PRESENT(xs_configwin); return; }
--- a/src/xs_fileinfo.c Thu Apr 03 00:34:07 2008 +0300 +++ b/src/xs_fileinfo.c Thu Apr 03 00:44:33 2008 +0300 @@ -202,7 +202,7 @@ /* Check if there already is an open fileinfo window */ if (xs_fileinfowin) - gdk_window_raise(xs_fileinfowin->window); + XS_WINDOW_PRESENT(xs_fileinfowin); else { xs_fileinfowin = create_xs_fileinfowin(); #ifndef AUDACIOUS_PLUGIN