Changeset 4599 for trunk/src

Timestamp:

Nov 15, 2000, 9:30:46 PM (25 years ago)

Author:

sandervl

Message:

OB: clipboard fixes + changes

Location:

trunk/src/user32

Files:

• clipboard.cpp (modified) (2 diffs)
• oslibmsgtranslate.cpp (modified) (2 diffs)
• pmwindow.cpp (modified) (2 diffs)

trunk/src/user32/clipboard.cpp

@@ -1 @@
-/* $Id: clipboard.cpp,v 1.8 2000-06-07 14:51:25 sandervl Exp $ */
+/* $Id: clipboard.cpp,v 1.9 2000-11-15 20:30:45 sandervl Exp $ */
 
 /*
@@ -169 +169 @@
   Win32BaseWindow *window;
 
-    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
-    if(!window) {
-        dprintf(("OpenClipboard, window %x not found", hwnd));
-        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
-        return 0;
+    if (hwnd) {
+        window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+        if(!window) {
+            dprintf(("OpenClipboard, window %x not found", hwnd));
+            SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+            return 0;
+        }
     }
     dprintf(("USER32:  OpenClipboard\n"));
-    return O32_OpenClipboard(window->getOS2WindowHandle());
+    return O32_OpenClipboard(hwnd ? window->getOS2WindowHandle() : NULL);
 }
 //******************************************************************************

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.37 2000-10-08 18:45:35 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.38 2000-11-15 20:30:46 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -687 +687 @@
         break;
 
+    case WM_RENDERFMT:
+        winMsg->message = WINWM_RENDERFORMAT;
+        winMsg->wParam  = (UINT) os2Msg->mp1;
+        break;
+
+    case WM_RENDERALLFMTS:
+        winMsg->message = WINWM_RENDERALLFORMATS;
+        break;
+
     case WM_INITMENU:
     case WM_MENUSELECT:

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.106 2000-10-22 14:54:35 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.107 2000-11-15 20:30:46 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -792 +792 @@
         break;
 
+    case WM_RENDERFMT:
+    case WM_RENDERALLFMTS:
+        win32wnd->DispatchMsgA(pWinMsg);
+        break;
+
     case WM_CHAR:
         win32wnd->MsgChar(pWinMsg);