init wcore stuff in lcoreinit, eliminating dependency on messageloop

[lcore.git] / wcore.pas

diff --git a/wcore.pas b/wcore.pas
index f88aa530c59d50e8bcbda25b48d90ae2415640a7..e79fc1029af637577bc931e300bddca0ab1298d0 100755 (executable)
--- a/wcore.pas
+++ b/wcore.pas
@@ -1,8 +1,3 @@
-{ Copyright (C) 2005 Bas Steendijk and Peter Green\r
-  For conditions of distribution and use, see copyright notice in zlib_license.txt\r
-  which is included in the package\r
-  ----------------------------------------------------------------------------- }\r
-\r
 unit wcore;\r
 \r
 {\r
@@ -63,9 +58,10 @@ procedure addtask(ahandler:ttaskevent;aobj:tobject;awparam,alparam:longint);
 procedure disconnecttasks(aobj:tobject);\r
 procedure exitmessageloop;\r
 procedure processmessages;\r
+procedure wcoreinit;\r
 \r
 var\r
-  onshutdown:procedure(s:string);\r
+  onshutdown:procedure(s:ansistring);\r
 \r
 implementation\r
 \r
@@ -317,11 +313,8 @@ var
                                  lpszMenuName  : nil;\r
                                  lpszClassName : 'wcoreClass');\r
 \r
-procedure messageloop;\r
-var\r
-  MsgRec : TMsg;\r
+procedure wcoreinit;\r
 begin\r
-\r
   if Windows.RegisterClass(MyWindowClass) = 0 then halt;\r
   //writeln('about to create wcore handle, hinstance=',hinstance);\r
   hwndwcore := CreateWindowEx(WS_EX_TOOLWINDOW,\r
@@ -344,6 +337,14 @@ begin
   {$endif}\r
 \r
 \r
+end;\r
+\r
+procedure messageloop;\r
+var\r
+  MsgRec : TMsg;\r
+\r
+begin\r
+\r
   while GetMessage(MsgRec, 0, 0, 0) do begin\r
     TranslateMessage(MsgRec);\r
     DispatchMessage(MsgRec);\r
@@ -364,12 +365,13 @@ end;
 \r
 function ProcessMessage : Boolean;\r
 var\r
-    Msg : TMsg;\r
+    MsgRec : TMsg;\r
 begin\r
     Result := FALSE;\r
-    if PeekMessage(Msg, hwndwcore, 0, 0, PM_REMOVE) then begin\r
+    if PeekMessage(MsgRec, 0, 0, 0, PM_REMOVE) then begin\r
       Result := TRUE;\r
-      DispatchMessage(Msg);\r
+      TranslateMessage(MsgRec);\r
+      DispatchMessage(MsgRec);\r
     end;\r
 end;\r
 \r
@@ -380,3 +382,4 @@ end;
 \r
 \r
 end.\r
+\r