Changeset 5428 for trunk/src/user32/windowclass.cpp

Timestamp:

Apr 1, 2001, 9:38:51 PM (24 years ago)

Author:

sandervl

Message:

minor updates

File:

• trunk/src/user32/windowclass.cpp (modified) (5 diffs)

trunk/src/user32/windowclass.cpp

@@ -1 @@
-/* $Id: windowclass.cpp,v 1.17 2001-03-30 22:08:20 sandervl Exp $ */
+/* $Id: windowclass.cpp,v 1.18 2001-04-01 19:38:51 sandervl Exp $ */
 /*
  * Win32 Window Class Code for OS/2
@@ -52 +52 @@
     wc.hIconSm = 0;
  
-    //TODO: not destroyed when class is unregistered (neither does Wine, but that might be a bug)
-    int iSmIconWidth  = GetSystemMetrics(SM_CXSMICON);
-    int iSmIconHeight = GetSystemMetrics(SM_CYSMICON);
-
-    wc.hIconSm = CopyImage(wc.hIcon, IMAGE_ICON, iSmIconWidth, iSmIconHeight,
-                           LR_COPYFROMRESOURCE);
-
     if(Win32WndClass::FindClass(wc.hInstance, (LPSTR)wc.lpszClassName)) {
         if(HIWORD(wc.lpszClassName)) {
@@ -68 +61 @@
     }
 
+    //TODO: not destroyed when class is unregistered (neither does Wine, but that might be a bug)
+    int iSmIconWidth  = GetSystemMetrics(SM_CXSMICON);
+    int iSmIconHeight = GetSystemMetrics(SM_CYSMICON);
+
+    wc.hIconSm = CopyImage(wc.hIcon, IMAGE_ICON, iSmIconWidth, iSmIconHeight,
+                           LR_COPYFROMRESOURCE);
+
     wclass = new Win32WndClass(&wc,FALSE);
     if(wclass == NULL) {
@@ -114 +114 @@
     memcpy(&wc.style, lpwc, sizeof(WNDCLASSA));
 
-    //TODO: not destroyed when class is unregistered (neither does Wine, but that might be a bug)
-    int iSmIconWidth  = GetSystemMetrics(SM_CXSMICON);
-    int iSmIconHeight = GetSystemMetrics(SM_CYSMICON);
-
-    wc.hIconSm = CopyImage(wc.hIcon, IMAGE_ICON, iSmIconWidth, iSmIconHeight,
-                           LR_COPYFROMRESOURCE);
-
     if(Win32WndClass::FindClass(wc.hInstance, (LPWSTR)wc.lpszClassName)) {
         if(HIWORD(wc.lpszClassName)) {
@@ -129 +122 @@
         return 0;
     }
+
+    //TODO: not destroyed when class is unregistered (neither does Wine, but that might be a bug)
+    int iSmIconWidth  = GetSystemMetrics(SM_CXSMICON);
+    int iSmIconHeight = GetSystemMetrics(SM_CYSMICON);
+
+    wc.hIconSm = CopyImage(wc.hIcon, IMAGE_ICON, iSmIconWidth, iSmIconHeight,
+                           LR_COPYFROMRESOURCE);
 
     winclass = new Win32WndClass((WNDCLASSEXA *)&wc, TRUE);