Changeset 5429 for trunk/src/user32/win32wbase.cpp

Timestamp:

Apr 2, 2001, 12:13:28 AM (24 years ago)

Author:

sandervl

Message:

create dialog controls with CreateWindowExW; use correct SendMessage during CreateWindow

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.247 2001-03-30 11:14:36 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.248 2001-04-01 22:13:27 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -300 +300 @@
     else
     if ((cs->style & WS_CHILD) && !(cs->style & WS_POPUP)) {
-            dprintf(("No parent for child window\n" ));
+            dprintf(("No parent for child window" ));
             SetLastError(ERROR_INVALID_PARAMETER);
             return FALSE;  /* WS_CHILD needs a parent, but WS_POPUP doesn't */
@@ -310 +310 @@
     {
         GlobalGetAtomNameA( classAtom, buffer, sizeof(buffer) );
-        dprintf(("Bad class '%s'\n", buffer ));
+        dprintf(("Bad class '%s'", buffer ));
         SetLastError(ERROR_INVALID_PARAMETER);
         return 0;
@@ -320 +320 @@
     if(HIWORD(cs->lpszClass))
     {
-        char *astring;
-
-        if(isUnicode) astring = UnicodeToAsciiString((LPWSTR)cs->lpszClass);
-        else          astring = (char *)cs->lpszClass;
-
-        dprintf(("Window class %s", astring));
-        if(isUnicode) FreeAsciiString(astring);
+         if(isUnicode) dprintf(("Window class %ls", cs->lpszClass));
+         else          dprintf(("Window class %s", cs->lpszClass));
     }
     else dprintf(("Window class %x", cs->lpszClass));
@@ -490 +485 @@
  POINT          maxSize, maxPos, minTrack, maxTrack;
  HWND           hwnd = getWindowHandle();
+ LRESULT (* CALLBACK localSend32)(HWND, UINT, WPARAM, LPARAM);
 
     OS2Hwnd      = hwndOS2;
@@ -685 +681 @@
     }
 
-    //cs is ascii version of create structure. so use SendInternalMessageA
-    if(SendInternalMessageA(WM_NCCREATE,0,(LPARAM)cs))
+    localSend32 = (isUnicode) ? ::SendMessageW : ::SendMessageA;
+
+    if(localSend32(getWindowHandle(), WM_NCCREATE,0,(LPARAM)cs))
     {
         RECT tmpRect;
@@ -710 +707 @@
         fNoSizeMsg = FALSE;
         if (cs->style & WS_VISIBLE) dwStyle |= WS_VISIBLE; //program could change position in WM_CREATE
-        if( (SendInternalMessageA(WM_CREATE, 0, (LPARAM)cs )) != -1 )
+        if( (localSend32(getWindowHandle(), WM_CREATE, 0, (LPARAM)cs )) != -1 )
         {
             if(!(flags & WIN_NEED_SIZE))