From 59106395c061f2343e37b3ba9b199987fe9d9507 Mon Sep 17 00:00:00 2001 From: Christophe CURIS Date: Mon, 8 Dec 2014 22:42:30 +0100 Subject: [PATCH] WINGs: remove dead code from 'loadPixmaps' It seems the code had the possibility to load a default icon, probably to be used on the windows if the main program does not provide any. This code however have never been enabled, probably because it is better to not provide an icon and let the window manager use its own. This patch then removes that dead code, but keeps the image as part of the WINGs resource for the case where an application would have been using it. Signed-off-by: Christophe CURIS --- WINGs/widgets.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/WINGs/widgets.c b/WINGs/widgets.c index 87fa9d62..2cb27b8a 100644 --- a/WINGs/widgets.c +++ b/WINGs/widgets.c @@ -363,10 +363,7 @@ static WMPixmap *makePixmap(W_Screen * sPtr, char **data, int width, int height, } #define T_WINGS_IMAGES_FILE RESOURCE_PATH"/Images.tiff" -#define T_DEFAULT_OBJECT_ICON_FILE RESOURCE_PATH"/defaultIcon.tiff" - #define X_WINGS_IMAGES_FILE RESOURCE_PATH"/Images.xpm" -#define X_DEFAULT_OBJECT_ICON_FILE RESOURCE_PATH"/defaultIcon.xpm" static Bool loadPixmaps(WMScreen * scr) { @@ -474,16 +471,6 @@ static Bool loadPixmaps(WMScreen * scr) RReleaseImage(image); -#if 0 - scr->defaultObjectIcon = WMCreatePixmapFromFile(scr, T_DEFAULT_OBJECT_ICON_FILE); - if (!scr->defaultObjectIcon) { - scr->defaultObjectIcon = WMCreatePixmapFromFile(scr, X_DEFAULT_OBJECT_ICON_FILE); - } - if (!scr->defaultObjectIcon) { - wwarning("WINGs: could not load default icon file"); - return False; - } -#endif return True; }