SF.net SVN: frontierkernel: [1501] Frontier/branches/FSRef_Migration/Common /source/scripts.c

[<cre...@us...>]

Revision: 1501
          http://svn.sourceforge.net/frontierkernel/?rev=1501&view=rev
Author:   creecode
Date:     2006-09-09 12:29:11 -0700 (Sat, 09 Sep 2006)

Log Message:
-----------
in scripttitleclick function, fix command clicking not activating pop-up menu

Modified Paths:
--------------
    Frontier/branches/FSRef_Migration/Common/source/scripts.c

Modified: Frontier/branches/FSRef_Migration/Common/source/scripts.c
===================================================================
--- Frontier/branches/FSRef_Migration/Common/source/scripts.c	2006-09-09 19:24:48 UTC (rev 1500)
+++ Frontier/branches/FSRef_Migration/Common/source/scripts.c	2006-09-09 19:29:11 UTC (rev 1501)
@@ -3530,14 +3530,15 @@
 
 
 static boolean scripttitleclick (Point pt) {
+
+	//
+	// 2006-08-26 creedon:	for Mac, fix command clicking not activating pop-up menu
+	//
+	//				both Mac and Win XP have their own built-in behaviours defined for mouse double clicks,
+	//					disabled code so as not to mess things up
+	//
 	
-	if (scriptindatabase ()) /*lives in symbol table -- see scriptinstallable*/
-		return (langexternaltitleclick (pt, (hdlexternalvariable) (**outlinedata).outlinerefcon));
-	
-	if ((**outlinewindowinfo).parentwindow == nil)
-		return (false);
-
-	if (scriptinmenubar ()) { /*do same popup as parent window would*/
+	if (scriptinmenubar ()) { // do same popup as parent window would
 		
 		if (cmdkeydown () || ismouserightclick()) {
 		
@@ -3547,7 +3548,7 @@
 				
 				shellpopglobals ();
 				
-				pt.v += 50; /*hack: this signals special case*/
+				pt.v += 50; // hack: this signals special case
 				
 				tableclienttitlepopuphit (pt, hv);
 				
@@ -3555,17 +3556,28 @@
 				}
 			}
 		}
+		
+	return (langexternaltitleclick (pt, (hdlexternalvariable) (**outlinedata).outlinerefcon));
 	
+	/* old code, discard after awhile
+
+	if (scriptindatabase ()) // lives in symbol table -- see scriptinstallable
+		return (langexternaltitleclick (pt, (hdlexternalvariable) (**outlinedata).outlinerefcon));
+	
+	if ((**outlinewindowinfo).parentwindow == nil)
+		return (false);
+	
 	if (!mousedoubleclick ())
 		return (false);
 	
 	shellbringtofront ((**outlinewindowinfo).parentwindow);
 	
 	if (keyboardstatus.floptionkey)
-		shellclosewindow (outlinewindow);
+		shellclosewindow (outlinewindow); */
 	
-	return (true); /*consumed*/
-	} /*scripttitleclick*/
+	return (true); // consumed
+	
+	} // scripttitleclick
 
 
 #ifdef flcomponent


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