github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlLib: Fixed icons in Win32 FileSel

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3714 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2011-07-26 20:56:17 +00:00
parent ca3e94e286
commit 80abeb8192
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
uppsrc/CtrlCore/Win32Gui.h
View file

@ -1,4 +1,5 @@
#define GUI_WIN
#define GUI_WIN32
NAMESPACE_UPP

4
uppsrc/CtrlLib/FileSel.cpp
View file

@ -341,7 +341,7 @@ bool Load(FileList& list, const String& dir, const char *patterns, bool dirs,
img = isdrive ? PosixGetDriveImage(fi.filename, false)
: GetFileIcon(dir, fi.filename, fi.is_directory, fi.unix_mode & 0111, false);
#endif
#ifdef GUI_WIN32
#ifdef GUI_WIN
// Image img = lazyicons ? fi.is_directory ? CtrlImg::Dir() : CtrlImg::File()
// : GetFileIcon(AppendFileName(dir, fi.filename), fi.is_directory, fi.unix_mode & 0111, false);
img = GetFileIcon(AppendFileName(dir, fi.filename), fi.is_directory, false, false, lazyicons);
@ -1218,7 +1218,7 @@ Image GetDirIcon(const String& s)
#ifdef GUI_X11
img = GetFileIcon(GetFileFolder(s), GetFileName(s), true, false, false);
#endif
#ifdef GUI_WIN32
#ifdef GUI_WIN
if((byte)*s.Last() == 255)
img = CtrlImg::Network();
else

2
uppsrc/XmlRpc/Server.cpp
View file

@ -167,7 +167,7 @@ bool XmlRpcPerform(Socket& http, const char *group)
response <<
"HTTP/1.0 200 OK\r\n"
"Date: " << ts << "\r\n"
"Server: U++\r\n"
"Server: U++ XMLRPC server\r\n"
"Content-Length: " << r.GetCount() << "\r\n"
"Connection: close\r\n"
"Content-Type: text/xml\r\n\r\n"