Changeset 7182 for trunk/src/user32/window.cpp

Timestamp:

Oct 24, 2001, 11:53:14 AM (24 years ago)

Author:

sandervl

Message:

scrollbar fix; don't set focus unless it has the WS_TABSTOP style

File:

• trunk/src/user32/window.cpp (modified) (2 diffs)

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.110 2001-10-17 14:30:10 sandervl Exp $ */
+/* $Id: window.cpp,v 1.111 2001-10-24 09:53:14 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -1967 +1967 @@
               LPCWSTR, str )
 {
-    LPSTR strA;
-    HANDLE ret;
-
-    if (!HIWORD(str)) return GetPropA( hwnd, (LPCSTR)(UINT)LOWORD(str) );
-    strA = HEAP_strdupWtoA( GetProcessHeap(), 0, str );
-    ret = GetPropA( hwnd, strA );
-    HeapFree( GetProcessHeap(), 0, strA );
+  Win32BaseWindow *window;
+  LPSTR strA;
+  HANDLE ret;
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
+        dprintf(("GetPropW, window %x not found", hwnd));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return 0;
+    }
+
+    if(HIWORD(str)) {
+         strA = HEAP_strdupWtoA( GetProcessHeap(), 0, str );
+    }
+    else strA = (LPSTR)str;
+
+    ret = window->getProp(strA);
+
+    RELEASE_WNDOBJ(window);
+    if(HIWORD(str)) HeapFree( GetProcessHeap(), 0, strA );
     return ret;
 }