SF.net SVN: frontierkernel: [1292] Frontier/trunk/Common/source

[<and...@us...>]

Revision: 1292
Author:   andreradke
Date:     2006-04-17 10:52:12 -0700 (Mon, 17 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1292&view=rev

Log Message:
-----------
Fix breakage in WinProcessActivateAppEvent introduced in revision 1290 when the custom tyjugglermessage struct was replaced with endianness-agnostic code.

ViewCVS Links:
-------------
    http://svn.sourceforge.net/frontierkernel/?rev=1290&view=rev

Modified Paths:
--------------
    Frontier/trunk/Common/headers/macconv.h
    Frontier/trunk/Common/source/FrontierWinMain.c
    Frontier/trunk/Common/source/shelljuggler.c
Modified: Frontier/trunk/Common/headers/macconv.h
===================================================================
--- Frontier/trunk/Common/headers/macconv.h	2006-04-17 15:09:49 UTC (rev 1291)
+++ Frontier/trunk/Common/headers/macconv.h	2006-04-17 17:52:12 UTC (rev 1292)
@@ -67,7 +67,9 @@
 #define wmouseUp		38			//Windows Only
 #define zoomEvt			39			//Windows Only
 
-	
+#define suspendResumeMessage	0x0001
+#define resumeFlag				0x01
+
 #define everyEvent		-1
 #define activeFlag		256
 #define activMask		256

Modified: Frontier/trunk/Common/source/FrontierWinMain.c
===================================================================
--- Frontier/trunk/Common/source/FrontierWinMain.c	2006-04-17 15:09:49 UTC (rev 1291)
+++ Frontier/trunk/Common/source/FrontierWinMain.c	2006-04-17 17:52:12 UTC (rev 1292)
@@ -1820,22 +1820,23 @@
 	
 	/*
 	5.0a22 dmb: added
+	
+	2006-04-17 aradke: Removed tyjugglermessage for endianness-agnostic code.
+		See shellhandlejugglerevent in shelljuggler.c.
 	*/
 
 	EventRecord ev;
-	tyjugglermessage jmsg;
 
 	ev.hwnd = hwnd;
 	ev.winmsg = msg;
 	ev.wparam = wParam;
 	ev.lparam = lParam;
+	
+	ev.message = 0;
+	ev.message |= (suspendResumeMessage << 24);
+	ev.message |= ((wParam != 0) ? resumeFlag : 0);
 
-	*((long *)&jmsg) = 0;
-	jmsg.eventtype = 1;
-	jmsg.flresume = (BOOL) wParam;
-
 	ev.what = jugglerEvt;
-	ev.message = *(long *) &jmsg;
 	ev.when = gettickcount ();
 	ev.where.h = 0;
 	ev.where.v = 0;

Modified: Frontier/trunk/Common/source/shelljuggler.c
===================================================================
--- Frontier/trunk/Common/source/shelljuggler.c	2006-04-17 15:09:49 UTC (rev 1291)
+++ Frontier/trunk/Common/source/shelljuggler.c	2006-04-17 17:52:12 UTC (rev 1292)
@@ -139,7 +139,7 @@
 		if (fl)
 			shellactivatewindow (shellwindow, flshellactive);
 
-		#if !TARGET_API_MAC_CARBON
+		#if defined(TARGET_API_MAC_OS8) && (TARGET_API_MAC_OS8 == 1)
 			/*
 			2006-04-17 aradke: convertClipboardFlag is never set on Carbon
 			*/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.