From 391a8edb9c39786014c62f3fec32bd9d126a7b19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20=28kix=29?=
 <kix@kix.es>
Date: Wed, 4 Apr 2012 16:04:09 +0200
Subject: [PATCH] Turn wApplication{Activate,Deactivate} into real functions

The functions wApplicationActivate and wApplicationDeactivate are now defined
as functions, not as preprocessor functions.
---
 src/application.c | 21 +++++++++++++++++++++
 src/application.h | 21 ++-------------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/application.c b/src/application.c
index a9a308bd..8a1e3bb8 100644
--- a/src/application.c
+++ b/src/application.c
@@ -447,3 +447,24 @@ void wApplicationDestroy(WApplication * wapp)
 	if (wPreferences.auto_arrange_icons)
 		wArrangeIcons(scr, True);
 }
+
+void wApplicationActivate(WApplication *wapp)
+{
+#ifdef NEWAPPICON
+	if (wapp->app_icon) {
+		wIconSetHighlited(wapp->app_icon->icon, True);
+		wAppIconPaint(wapp->app_icon);
+	}
+#endif
+}
+
+void wApplicationDeactivate(WApplication *wapp)
+{
+#ifdef NEWAPPICON
+	if (wapp->app_icon) {
+		wIconSetHighlited(wapp->app_icon->icon, False);
+		wAppIconPaint(wapp->app_icon);
+	}
+#endif
+}
+
diff --git a/src/application.h b/src/application.h
index f866fef0..31cbe680 100644
--- a/src/application.h
+++ b/src/application.h
@@ -55,23 +55,6 @@ void wApplicationSaveIconPathFor(char *iconPath, char *wm_instance,
 
 void wAppBounce(WApplication *);
 void wAppBounceWhileUrgent(WApplication *);
-
-#ifdef NEWAPPICON
-#define wApplicationActivate(wapp) do { \
-		if (wapp->app_icon) { \
-			wIconSetHighlited(wapp->app_icon->icon, True); \
-			wAppIconPaint(wapp->app_icon);\
-		} \
-	} while (0)
-#define wApplicationDeactivate(wapp) do { \
-		if (wapp->app_icon) { \
-			wIconSetHighlited(wapp->app_icon->icon, False); \
-			wAppIconPaint(wapp->app_icon);\
-		} \
-	} while (0)
-#else
-#define wApplicationActivate(wapp) do { } while (0)
-#define wApplicationDeactivate(wapp) do { } while (0)
-#endif /* NEWAPPICON */
-
+void wApplicationActivate(WApplication *);
+void wApplicationDeactivate(WApplication *);
 #endif