From 8e0ef4766d59ed82b8a783005897020a16c6f172 Mon Sep 17 00:00:00 2001 From: "Alexey I. Froloff" Date: Fri, 17 Sep 2010 00:25:34 +0400 Subject: [PATCH] Drop BOUNCE_APP #ifdef's Since bouncing respects DisableAnimations option, there's no need in #ifdef's. Acked-by: Carlos R. Mafra Signed-off-by: Alexey I. Froloff --- src/application.c | 2 -- src/application.h | 2 -- src/superfluous.c | 8 -------- src/wconfig.h.in | 3 --- 4 files changed, 15 deletions(-) diff --git a/src/application.c b/src/application.c index 21155c79..1415efa8 100644 --- a/src/application.c +++ b/src/application.c @@ -409,14 +409,12 @@ void wApplicationDestroy(WApplication * wapp) if (wapp->refcount > 0) return; -#ifdef BOUNCE_APP if (wapp->flags.bouncing) { /* event.c:handleDestroyNotify forced this destroy and thereby overlooked the bounce callback */ wapp->refcount = 1; return; } -#endif scr = wapp->main_window_desc->screen_ptr; main_window = wapp->main_window; diff --git a/src/application.h b/src/application.h index 111491d3..5eeefefb 100644 --- a/src/application.h +++ b/src/application.h @@ -46,9 +46,7 @@ typedef struct WApplication { unsigned int skip_next_animation:1; unsigned int hidden:1; unsigned int emulated:1; -#ifdef BOUNCE_APP unsigned int bouncing:1; -#endif } flags; } WApplication; diff --git a/src/superfluous.c b/src/superfluous.c index d5aaf504..8bbef819 100644 --- a/src/superfluous.c +++ b/src/superfluous.c @@ -253,8 +253,6 @@ void DoWindowBirth(WWindow *wwin) } #endif -#ifdef BOUNCE_APP - #define BOUNCE_HZ 25 #define BOUNCE_DELAY (1000/BOUNCE_HZ) #define BOUNCE_HEIGHT 24 @@ -402,9 +400,3 @@ void wAppBounce(WApplication *wapp) data->timer = WMAddPersistentTimerHandler(BOUNCE_DELAY, doAppBounce, data); } } - -#else -void wAppBounce(WApplication *wapp) -{ -} -#endif diff --git a/src/wconfig.h.in b/src/wconfig.h.in index 6045cb72..5008ac65 100644 --- a/src/wconfig.h.in +++ b/src/wconfig.h.in @@ -38,9 +38,6 @@ /* If you want the application icon to be highlighted when it has the focus */ #define NEWAPPICON -/* If you want the application icon to bounce when opening a dialog etc */ -#define BOUNCE_APP - /* undefine it if you don't want your config files to be preprocessed by cpp */ #define USECPP