From b9bf8df0f80b9e548200c0bc338ae3798695610a Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 5 Dec 2010 14:09:44 +0000
Subject: [PATCH] CtrlLib: FileSel icons in X11 fixed

git-svn-id: svn://ultimatepp.org/upp/trunk@2892 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlLib/FileSel.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/uppsrc/CtrlLib/FileSel.cpp b/uppsrc/CtrlLib/FileSel.cpp
index d6c8bee2b..4970c1997 100644
--- a/uppsrc/CtrlLib/FileSel.cpp
+++ b/uppsrc/CtrlLib/FileSel.cpp
@@ -171,7 +171,7 @@ struct FileExtMaker : ImageMaker {
 		String minor;
 		if(!Single<ExtToMime>().GetMime(ext, major, minor))
 			return Null;
-		Image img = GnomeImage("mime-" + major + '-' + minor, large ? 48 : 16);
+		Image img = GnomeImage("mime-" + major + '-' + minor, large);
 		return IsNull(img) ? GnomeImage("mime-" + major) : img;
 	}
 };
@@ -327,8 +327,7 @@ bool Load(FileList& list, const String& dir, const char *patterns, bool dirs,
 			   MatchSearch(fi.filename, search) && show) {
 			#ifdef PLATFORM_X11
 				Image img = isdrive ? PosixGetDriveImage(fi.filename, false)
-				                    : lazyicons ? fi.is_directory ? CtrlImg::Dir() : CtrlImg::File()
-				                                : GetFileIcon(dir, fi.filename, fi.is_directory, fi.unix_mode & 0111, false);
+				                    : GetFileIcon(dir, fi.filename, fi.is_directory, fi.unix_mode & 0111, false);
 			#else
 //				Image img = lazyicons ? fi.is_directory ? CtrlImg::Dir() : CtrlImg::File()
 //				                      : GetFileIcon(AppendFileName(dir, fi.filename), fi.is_directory, fi.unix_mode & 0111, false);
@@ -569,7 +568,9 @@ void FileSel::SearchLoad()
 		SearchLoad();
 	}
 
+#ifdef PLATFORM_WIN32
 	lazyicons.Start(list, d, WhenIcon);
+#endif
 	places.KillCursor();
 	if(d.GetCount())
 		places.FindSetCursor(d);