Changeset 3153 for trunk/src/user32/win32wbasenonclient.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/win32wbasenonclient.cpp (modified) (4 diffs)

trunk/src/user32/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.16 2000-03-01 13:30:06 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.17 2000-03-18 16:13:39 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -490 +490 @@
       {
         /* Check if there is an user icon */
-        HICON hSysIcon = hIconSm;
-        if(!hSysIcon) hSysIcon = (HICON) GetClassLongA(Win32Hwnd,GCL_HICONSM);
-
-        /* If there is an icon associated with the window OR              */
-        /* If there is no hIcon specified and this is not a modal dialog, */
-        /* there is a system menu icon.                                   */
-        if((hSysIcon != 0) || (!(dwStyle & DS_MODALFRAME)))
+        if (IconForWindow(ICON_SMALL))
           rect.left += GetSystemMetrics(SM_CYCAPTION) - 1;
       }
@@ -644 +638 @@
   else r = *rect;
 
-  hSysIcon = hIconSm;
-
-  /* if no small icon and no large icon, use class small icon */
-  if (!hSysIcon && !hIcon)
-    hSysIcon =  (HICON) GetClassLongA(Win32Hwnd, GCL_HICONSM);
-
-  /* otherwise use the large icon */
-  if (!hSysIcon) hSysIcon = hIcon;
-
-  /* if all else fails, use the application icon. */
-  if(!hSysIcon) hSysIcon = (HICON) GetClassLongA(Win32Hwnd, GCL_HICON);
-
-  /* If there is no hIcon specified or this is not a modal dialog, */
-  /* get the default one.                                          */
-  if(hSysIcon == 0)
-    if (!(dwStyle & DS_MODALFRAME))
-      hSysIcon = LoadImageA(0, MAKEINTRESOURCEA(OIC_ODINICON), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR);
+  hSysIcon = IconForWindow(ICON_SMALL);
+
 //CB: todo: add icons (including Odin icon) to user32.rc
   if (hSysIcon)
@@ -1406 +1385 @@
 
       if (!win32wnd) return 0;
-
-      /* Get small icon. */
-      HICON hAppIcon = win32wnd->GetSmallIcon();
-
-      /* if no small icon and no large icon, use class small icon */
-      if (!hAppIcon && !win32wnd->GetIcon())
-        hAppIcon = (HICON) GetClassLongA(hwnd, GCL_HICONSM);
-
-      /* otherwise use the large icon it */
-      if (!hAppIcon) hAppIcon = win32wnd->GetIcon();
-
-      /* if all else fails, use the application icon. */
-      if(!hAppIcon) hAppIcon = (HICON) GetClassLongA(hwnd, GCL_HICON);
-
-      DrawIconEx (hdc, pt.x, pt.y, hAppIcon, GetSystemMetrics(SM_CXSMICON),
+        
+      DrawIconEx (hdc, pt.x, pt.y, win32wnd->IconForWindow(ICON_SMALL),
+                  GetSystemMetrics(SM_CXSMICON),
                   GetSystemMetrics(SM_CYSMICON), 0, 0, DI_NORMAL);
     }