btime overhaul. newer APIs. added btime_gettime. now requires int64.

[lcore.git] / unitwindowobject.pas

diff --git a/unitwindowobject.pas b/unitwindowobject.pas
index cc7f1e1f15307898b2475eeee79589e762d28af8..ec5d955fa3b0a3b1315ed59c686b2efa951c1d96 100644 (file)
--- a/unitwindowobject.pas
+++ b/unitwindowobject.pas
@@ -9,12 +9,12 @@ interface
 \r
 uses\r
   classes,\r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     windows,messages,wmessages,\r
   {$else}\r
-    lmessages,\r
+    lcoremessages,\r
     {$macro on}\r
-    {$define windows := lmessages}\r
+    {$define windows := lcoremessages}\r
   {$endif}\r
   sysutils,\r
   pgtypes;\r
@@ -34,7 +34,7 @@ type
     function killtimer(id:taddrint):boolean;\r
     procedure postmessage(msg,wparam,lparam:taddrint);\r
     procedure messageloop;\r
-    {$ifdef win32}\r
+    {$ifdef mswindows}\r
       procedure processmessages; virtual;\r
       function processmessage:boolean;\r
     {$endif}  \r
@@ -118,7 +118,7 @@ begin
     '', dwstyle, CW_USEDEFAULT, CW_USEDEFAULT,100, 100, hwnd(0), 0, HInstance, nil);\r
   //swriteln('about to check result of createwindowex');\r
   if hWndMain = hwnd(0) then raise exception.create('CreateWindowEx failed');\r
-  //swriteln('about to store reference to self in extra windo memory');\r
+  //swriteln('about to store reference to self in extra window memory');\r
   setwindowlongptr(hwndmain,0,taddrint(self));\r
   //swriteln('finished twindowobject.create , hwndmain='+inttohex(taddrint(hwndmain),16));\r
 end;\r
@@ -141,6 +141,7 @@ begin
   windows.postmessage(hwndmain,msg,wparam,lparam);\r
 end;\r
 \r
+{$ifdef mswindows}\r
 function twindowobjectbase.ProcessMessage : Boolean;\r
 var\r
     MsgRec : TMsg;\r
@@ -157,13 +158,16 @@ procedure twindowobjectbase.processmessages;
 begin\r
   while processmessage do;\r
 end;\r
+{$endif}\r
 \r
 procedure twindowobjectbase.messageloop;\r
 var\r
   MsgRec : TMsg;\r
 begin\r
   while GetMessage(MsgRec, hwnd(0), 0, 0) do begin\r
+    {$ifdef mswindows}\r
     TranslateMessage(MsgRec);\r
+    {$endif}\r
     DispatchMessage(MsgRec);\r
     if exitloopflag then exit;\r
     {if not peekmessage(msgrec,0,0,0,PM_NOREMOVE) then onidle}\r