git-svn-id: svn://ultimatepp.org/upp/trunk@2192 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2010-03-08 00:37:22 +00:00
parent 9e9328407f
commit 21d088b2a1
2 changed files with 1 additions and 10 deletions

View file

@ -23,14 +23,10 @@ struct FileIconMaker : ImageMaker {
#ifdef _DEBUG
AvoidPaintingCheck__();
#endif
DDUMP(dir);
DDUMP(file);
SHGetFileInfo(ToSystemCharset(file), dir ? FILE_ATTRIBUTE_DIRECTORY : FILE_ATTRIBUTE_NORMAL,
&info, sizeof(info),
SHGFI_ICON|(large ? SHGFI_LARGEICON : SHGFI_SMALLICON)|(exe ? 0 : SHGFI_USEFILEATTRIBUTES));
HICON icon = info.hIcon;
DDUMP(!!icon);
DLOG("-------------------");
ICONINFO iconinfo;
if(!icon || !GetIconInfo(icon, &iconinfo))
return Image();
@ -53,7 +49,6 @@ struct FileIconMaker : ImageMaker {
Image GetFileIcon(const char *path, bool dir, bool force, bool large)
{
DDUMP(path);
FileIconMaker m;
String ext = GetFileExt(path);
m.exe = false;
@ -1122,7 +1117,6 @@ struct FolderDisplay : public Display {
Image GetDirIcon(const String& s)
{
DDUMP(s);
#ifdef PLATFORM_X11
Image img = GetFileIcon(GetFileFolder(s), GetFileName(s), true, false, false);
#else
@ -1138,7 +1132,7 @@ Image GetDirIcon(const String& s)
}
void FolderDisplay::Paint(Draw& w, const Rect& r, const Value& q,
Color ink, Color paper, dword style) const
Color ink, Color paper, dword style) const
{
String s = q;
w.DrawRect(r, paper);

View file

@ -56,8 +56,6 @@ void Splitter::Layout() {
for(Ctrl *q = GetFirstChild(); q; q = q->GetNext()) {
int lo = i > 0 ? PosToClient(pos[i - 1]) + wd : 0;
int hi = i < count ? PosToClient(pos[i]) - wd : vert ? sz.cy : sz.cx;
DDUMP(lo);
DDUMP(hi);
q->Show();
if(vert)
q->SetRect(0, lo, sz.cx, hi - lo);
@ -65,7 +63,6 @@ void Splitter::Layout() {
q->SetRect(lo, 0, hi - lo, sz.cy);
i++;
}
DLOG("-----------");
}
void Splitter::Paint(Draw& w) {