change ltimevalstuff to a unit and move defintion of ttimeval on windows

[lcore.git] / lmessages.pas

diff --git a/lmessages.pas b/lmessages.pas
index d6e3745b770868fe5746fedb1bfb3f9c2a049437..b5a6f25594f0a41cc5ca59463898a69a96ae3c0f 100755 (executable)
--- a/lmessages.pas
+++ b/lmessages.pas
@@ -99,7 +99,7 @@ procedure init;
 \r
 implementation\r
 uses\r
-  baseunix,unix,lcore,unixutil;//,safewriteln;\r
+  baseunix,unix,lcore,unixutil,ltimevalstuff;//,safewriteln;\r
 {$i unixstuff.inc}\r
 \r
 type\r
@@ -135,7 +135,7 @@ var
   //than crash after over four billion\r
   //windows have been made ;)\r
   nextwindowhandle : qword = $100000000;\r
-{$i ltimevalstuff.inc}\r
+
 \r
 //findthreaddata should only be called while holding the structurelock\r
 function findthreaddata(threadid : integer) : tthreaddata;\r
@@ -409,15 +409,15 @@ begin
       //we have to get the window procedure while the structurelock\r
       //is still held as the window could be destroyed from another thread\r
       //otherwise.\r
-      if window <> nil then begin
+      if window <> nil then begin\r
         windowproc := window.windowproc;\r
-      end else begin
-        windowproc := nil;
-      end;
+      end else begin\r
+        windowproc := nil;\r
+      end;\r
     finally\r
       structurelock.release;\r
     end;\r
-    if windowproc <> nil then begin\r
+    if assigned(windowproc) then begin\r
       result := windowproc(lpmsg.hwnd,lpmsg.message,lpmsg.wparam,lpmsg.lparam);\r
     end else begin\r
       result := -1;\r
@@ -494,7 +494,7 @@ end;
 \r
 function PeekMessage(var lpMsg: TMsg; hWnd: HWND; wMsgFilterMin, wMsgFilterMax, wRemoveMsg: UINT): WINBOOL;\r
 begin\r
-  result := getmessageinternal(lpmsg,hwnd,wmsgfiltermin,wmsgfiltermax,PM_REMOVE,true);\r
+  result := getmessageinternal(lpmsg,hwnd,wmsgfiltermin,wmsgfiltermax,wRemoveMsg,true);\r
 end;\r
 \r
 function SetEvent(hEvent:THevent):WINBOOL;\r