Changeset 311 for trunk/src/user32/new/win32class.cpp

Timestamp:

Jul 15, 1999, 8:54:55 PM (26 years ago)

Author:

sandervl

Message:

* empty log message *

File:

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

trunk/src/user32/new/win32class.cpp

@@ -1 @@
-/* $Id: win32class.cpp,v 1.3 1999-07-14 21:05:58 cbratschi Exp $ */
+/* $Id: win32class.cpp,v 1.4 1999-07-15 18:54:55 sandervl Exp $ */
 /*
  * Win32 Window Class Managment Code for OS/2
@@ -54 +54 @@
         classAtom       = (DWORD)wndclass->lpszClassName;
   }
+  menuNameA = 0;
+  menuNameW = 0;
+  setMenuName((LPSTR)wndclass->lpszMenuName);
+
   this->isUnicode       = isUnicode;
 
@@ -66 +70 @@
   dprintf(("USER32:  wndclass->hbrBackground %X\n", wndclass->hbrBackground));
   if(HIWORD(wndclass->lpszClassName))
-       dprintf(("USER32:  wndclass->lpszClassName %s\n", wndclass->lpszClassName));
+       dprintf(("USER32:  wndclass->lpszClassName %s\n", classNameA));
   else dprintf(("USER32:  wndclass->lpszClassName %X\n", wndclass->lpszClassName));
 
   if(HIWORD(wndclass->lpszMenuName)) {//convert string name identifier to numeric id
-       dprintf(("USER32:  lpszMenuName %s\n", wndclass->lpszMenuName));
-  }
-  else dprintf(("USER32:  wndclass->lpszMenuName %X\n", wndclass->lpszMenuName));
+       dprintf(("USER32:  lpszMenuName %s\n", menuNameA));
+  }
+  else dprintf(("USER32:  wndclass->lpszMenuName %X\n", menuNameA));
 
   nrExtraClassWords     = wndclass->cbClsExtra;
@@ -80 +84 @@
   hIcon                 = wndclass->hIcon;
   hInstance             = wndclass->hInstance;
-
-  menuNameA = 0;
-  menuNameW = 0;
-  setMenuName((LPSTR)wndclass->lpszMenuName);
 
   windowStyle           = wndclass->style;