Changeset 3153 for trunk/src/user32/win32class.cpp

Timestamp:

Mar 18, 2000, 5:13:41 PM (25 years ago)

Author:

cbratschi

Message:

merged with Corel 20000317, small icon

File:

• trunk/src/user32/win32class.cpp (modified) (7 diffs)

trunk/src/user32/win32class.cpp

@@ -1 @@
-/* $Id: win32class.cpp,v 1.15 2000-02-22 19:15:20 sandervl Exp $ */
+/* $Id: win32class.cpp,v 1.16 2000-03-18 16:13:37 cbratschi Exp $ */
 /*
  * Win32 Window Class Managment Code for OS/2
@@ -25 +25 @@
 #include <win\winproc.h>
 
-#define DBG_LOCALLOG    DBG_win32class
+#define DBG_LOCALLOG    DBG_win32class
 #include "dbglocal.h"
 
@@ -63 +63 @@
                 AsciiToUnicode(classNameA, classNameW);
         }
-        classAtom = 0;
-        //SvL: If a system control has already be registered, use that atom instead
+        classAtom = 0;
+        //SvL: If a system control has already be registered, use that atom instead
         //     of creating a new one
-        if(wndclass->style & CS_GLOBALCLASS) {
-                classAtom = GlobalFindAtomA(classNameA);
-        }
-        if(!classAtom) classAtom = GlobalAddAtomA(classNameA);
+        if(wndclass->style & CS_GLOBALCLASS) {
+                classAtom = GlobalFindAtomA(classNameA);
+        }
+        if(!classAtom) classAtom = GlobalAddAtomA(classNameA);
   }
   else {
@@ -77 +77 @@
   }
   if(!(wndclass->style & CS_GLOBALCLASS)) {
-        processId = GetCurrentProcess();
+        processId = GetCurrentProcess();
   }
   menuNameA = 0;
@@ -100 +100 @@
   }
   else dprintf(("USER32:  wndclass->lpszMenuName %X\n", menuNameA));
+  dprintf(("USER32:  wndclass->hIconSm %X\n", wndclass->hIconSm));
 
   nrExtraClassWords     = wndclass->cbClsExtra;
@@ -362 +363 @@
         case GCL_HICON:
                 return hIcon;
+        case GCL_HICONSM:
+                return hIconSm;
         case GCL_HMODULE:
                 return hInstance;
@@ -428 +431 @@
                 hIcon = lNewVal;
                 break;
+        case GCL_HICONSM:
+                rc = hIconSm;
+                hIconSm = lNewVal;
+                break;
         case GCL_HMODULE:
                 rc = hInstance;