Changeset 1418 for trunk/src/user32/pmwindow.cpp

Timestamp:

Oct 23, 1999, 6:45:24 PM (26 years ago)

Author:

cbratschi

Message:

GetSystemMetrics, timer and scrollbar fixes

File:

• trunk/src/user32/pmwindow.cpp (modified) (3 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.41 1999-10-23 10:21:43 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.42 1999-10-23 16:45:20 cbratschi Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -29 +29 @@
 #include "oslibmsg.h"
 #include "dc.h"
+#include "timer.h"
 #include <thread.h>
 #include <wprocess.h>
@@ -767 +768 @@
 
     case WM_TIMER:
-        if (mp2) win32wnd->MsgTimer((ULONG)mp1);
+        if (mp2)
+        {
+          BOOL sys;
+          ULONG id;
+
+          if (TIMER_GetTimerInfo(hwnd,(ULONG)mp1,&sys,&id))
+          {
+            if (sys)
+              win32wnd->MsgSysTimer(id);
+            else
+              win32wnd->MsgTimer(id);
+          }
+        }
         goto RunDefWndProc;