Changeset 4696 for trunk/src

Timestamp:

Nov 24, 2000, 11:52:27 PM (25 years ago)

Author:

sandervl

Message:

icon index fixes

Location:

trunk/src/shell32

Files:

• folders.c (modified) (3 diffs)
• shres.orc (modified) (2 diffs)

trunk/src/shell32/folders.c

@@ -1 @@
-/* $Id: folders.c,v 1.4 2000-11-24 15:23:30 sandervl Exp $ */
+/* $Id: folders.c,v 1.5 2000-11-24 22:52:26 sandervl Exp $ */
 /*
  *  Copyright 1997  Marcus Meissner
@@ -274 +274 @@
       {
         lstrcpynA(szIconFile, "shell32.dll", cchMax);
+#ifdef __WIN32OS2__
+        *piIndex = (uFlags & GIL_OPENICON)? -SHLICON_FOLDER_OPEN : -SHLICON_FOLDER_CLOSED;
+#else
         *piIndex = (uFlags & GIL_OPENICON)? 4 : 3;
+#endif
       }
     }
@@ -307 +311 @@
                 lstrcpynA(szIconFile, "shell32.dll", cchMax);
 #ifdef __WIN32OS2__
-                *piIndex = -SHLICON_TREE; //???
+                *piIndex = -SHLICON_COMPUTERS;
 #else
                 *piIndex = 42;

trunk/src/shell32/shres.orc

@@ -1 @@
-/* $Id: shres.orc,v 1.7 2000-11-24 13:19:12 sandervl Exp $ */
+/* $Id: shres.orc,v 1.8 2000-11-24 22:52:27 sandervl Exp $ */
 /*
  * Top level resource file for Common Dialogs
@@ -192 +192 @@
 SHLICON_TEXTFILE   ICON LOADONCALL DISCARDABLE "ico/textfile.ico"
 SHLICON_APPLICATION   ICON LOADONCALL DISCARDABLE "ico/application.ico"
-SHLICON_FOLDER_OPEN   ICON LOADONCALL DISCARDABLE "ico/folder-c.ico"
-SHLICON_FOLDER_CLOSED   ICON LOADONCALL DISCARDABLE "ico/folder-o.ico"
+SHLICON_FOLDER_OPEN   ICON LOADONCALL DISCARDABLE "ico/folder-o.ico"
+SHLICON_FOLDER_CLOSED   ICON LOADONCALL DISCARDABLE "ico/folder-c.ico"
 SHLICON_FLOPPY525   ICON LOADONCALL DISCARDABLE "ico/floppy5.ico"
 SHLICON_FLOPPY35   ICON LOADONCALL DISCARDABLE "ico/floppy3.ico"