PERFORCE change 12964 for review

Change 12964 by pudge@pudge-mobile on 2001/11/13 05:42:35

	Get Mac::Navigation to compile (bug #464684).

Affected files ...

.... //depot/maint-5.6/macperl/macos/Makefile.mk#10 edit
.... //depot/maint-5.6/macperl/macos/ext/Mac/Makefile.mk#4 edit
.... //depot/maint-5.6/macperl/macos/ext/Mac/Navigation/Makefile.PL#2 edit
.... //depot/maint-5.6/macperl/macos/ext/Mac/Navigation/Navigation.xs#2 edit
.... //depot/maint-5.6/macperl/macos/macperl/Makefile.mk#6 edit

Differences ...

==== //depot/maint-5.6/macperl/macos/Makefile.mk#10 (text) ====
Index: perl/macos/Makefile.mk
--- perl/macos/Makefile.mk.~1~	Mon Nov 12 22:45:09 2001
+++ perl/macos/Makefile.mk	Mon Nov 12 22:45:09 2001
@@ -160,6 +160,7 @@
 #	Mac:Menus:Menus				\
 #	Mac:MoreFiles:MoreFiles			\
 #	Mac:Movies:Movies			\
+#	Mac:Navigation:Navigation		\
 #	Mac:Notification:Notification		\
 #	Mac:OSA:OSA				\
 #	Mac:Processes:Processes			\

==== //depot/maint-5.6/macperl/macos/ext/Mac/Makefile.mk#4 (text) ====
Index: perl/macos/ext/Mac/Makefile.mk
--- perl/macos/ext/Mac/Makefile.mk.~1~	Mon Nov 12 22:45:09 2001
+++ perl/macos/ext/Mac/Makefile.mk	Mon Nov 12 22:45:09 2001
@@ -5,7 +5,6 @@
 
 COpt += -i :::
 
-# Navigation:Navigation
 # DCon:DCon
 # SAT:SAT
 # ImageCompression:ImageCompression
@@ -25,6 +24,7 @@
 	Menus:Menus				\
 	MoreFiles:MoreFiles			\
 	Movies:Movies				\
+	Navigation:Navigation			\
 	Notification:Notification		\
 	OSA:OSA					\
 	Processes:Processes			\

==== //depot/maint-5.6/macperl/macos/ext/Mac/Navigation/Makefile.PL#2 (text) ====
Index: perl/macos/ext/Mac/Navigation/Makefile.PL
--- perl/macos/ext/Mac/Navigation/Makefile.PL.~1~	Mon Nov 12 22:45:09 2001
+++ perl/macos/ext/Mac/Navigation/Makefile.PL	Mon Nov 12 22:45:09 2001
@@ -2,9 +2,9 @@
 
 WriteMakefile(
 	NAME			=> q(Mac::Navigation),
-	'VERSION_FROM'		=> 'Navigation.pm',
+	'VERSION_FROM'	=> 'Navigation.pm',
 	'LINKTYPE'		=> 'static dynamic',
 	TYPEMAPS		=> 'typemap ::Events:typemap ::Files:typemap ::QuickDraw:typemap',
 	XSPROTOARG		=> '-noprototypes', 		# XXX remove later?
-	'LIBS'			=> ['"{{MW68KLibraries}}"NavigationLib "{{MWPPCLibraries}}"NavigationLib'],   # e.g., '-lm' 
+	'MACLIBS_SHARED'=> '"{{SharedLibraries}}"NavigationLib',   # e.g., '-lm' 
 );

==== //depot/maint-5.6/macperl/macos/ext/Mac/Navigation/Navigation.xs#2 (text) ====
Index: perl/macos/ext/Mac/Navigation/Navigation.xs
--- perl/macos/ext/Mac/Navigation/Navigation.xs.~1~	Mon Nov 12 22:45:09 2001
+++ perl/macos/ext/Mac/Navigation/Navigation.xs	Mon Nov 12 22:45:09 2001
@@ -19,7 +19,32 @@
 #include "XSUB.h"
 #include <Types.h>
 #include <Navigation.h>
-#include <TFileSpec.h>
+#include <GUSIFileSpec.h>
+
+typedef struct {
+	Boolean                         locked;             /* file is locked */
+	Boolean                         resourceOpen;       /* resource fork is opened */
+	Boolean                         dataOpen;           /* data fork is opened */
+	Boolean                         reserved1;
+	UInt32                          dataSize;           /* size of the data fork */
+	UInt32                          resourceSize;       /* size of the resource fork */
+	FInfo                           finderInfo;         /* more file info: */
+	FXInfo                          finderXInfo;
+}                                 NavFileInfo;
+typedef struct {
+	Boolean                         shareable;
+	Boolean                         sharePoint;
+	Boolean                         mounted;
+	Boolean                         readable;
+	Boolean                         writeable;
+	Boolean                         reserved2;
+	UInt32                          numberOfFiles;
+	DInfo                           finderDInfo;
+	DXInfo                          finderDXInfo;
+	OSType                          folderType;
+	OSType                          folderCreator;
+	char                            reserved3[206];
+}                                 NavFolderInfo;
 
 typedef struct {
 	SV *	eventProc;
@@ -43,7 +68,7 @@
 	OSErr	err;
 	FSSpec 	spec;
 	
-	if (err = Path2FSSpec(path, &spec))
+	if (err = GUSIPath2FSp(path, &spec))
 		return err;
 	else
 		return AECreateDesc(typeFSS, &spec, sizeof(FSSpec), desc);
@@ -160,10 +185,10 @@
 		READ_ONLY
 	NavFileInfo		fileInfo;
 		READ_ONLY
-		ALIAS &STRUCT->fileAndFolder.fileInfo
+		ALIAS (NavFileInfo) &STRUCT->fileAndFolder.fileInfo
 	NavFolderInfo	folderInfo;
 		READ_ONLY
-		ALIAS &STRUCT->fileAndFolder.folderInfo
+		ALIAS (NavFolderInfo) &STRUCT->fileAndFolder.folderInfo
 
 =item NavFileInfo
 
@@ -172,7 +197,6 @@
 	Boolean 	locked;						/* file is locked */
 	Boolean 	resourceOpen;				/* resource fork is opened */
 	Boolean 	dataOpen;					/* data fork is opened */
-	Boolean 	reserved;
 	U32 		dataSize;					/* size of the data fork */
 	U32 		resourceSize;				/* size of the resource fork */
 	FInfo 		finderInfo;					/* more file info: */
@@ -186,16 +210,17 @@
 		READ_ONLY
 	Boolean 	dataOpen;					/* data fork is opened */
 		READ_ONLY
-	Boolean 	reserved;
-		READ_ONLY
 	U32 		dataSize;					/* size of the data fork */
 		READ_ONLY
 	U32 		resourceSize;				/* size of the resource fork */
 		READ_ONLY
 	FInfo 		finderInfo;					/* more file info: */
 		READ_ONLY
+	FXInfo		finderXInfo
+		READ_ONLY
 	FXInfo 		moreFinderInfo;
 		READ_ONLY
+		ALIAS STRUCT->finderXInfo
 
 =item NavFolderInfo
 
@@ -224,10 +249,16 @@
 		READ_ONLY
 	U32 		numberOfFiles;
 		READ_ONLY
+	DInfo 		finderDInfo;
+		READ_ONLY
+	DXInfo 		finderDXInfo;
+		READ_ONLY
 	DInfo 		finderInfo;
 		READ_ONLY
+		ALIAS	STRUCT->finderDInfo
 	DXInfo 		moreFinderInfo;
 		READ_ONLY
+		ALIAS 	STRUCT->finderDXInfo
 
 =item NavCBRec
 
@@ -250,7 +281,7 @@
 	EventRecord 	event;
 		READ_ONLY
 		OUTPUT:
-		XS_OUTPUT(ToolboxEvent, &STRUCT->eventData.event, $arg);
+		XS_OUTPUT(ToolboxEvent, &STRUCT->eventData.eventDataParms.event, $arg);
 
 =item NavDialogOptions
 
@@ -266,7 +297,6 @@
 	Str255 			savedFileName;				/* default name for text box in NavPutFile (or null string for default) */
 	Str255 			message;					/* custom message prompt (or null string for default) */
 	U32 			preferenceKey;				/* a key for to managing preferences for using multiple utility dialogs */
-	Handle 			popupExtension;				/* extended popup menu items, an array of NavMenuItemSpecs */
 
 =cut
 STRUCT NavDialogOptions
@@ -280,7 +310,6 @@
 	Str255 			savedFileName;				/* default name for text box in NavPutFile (or null string for default) */
 	Str255 			message;					/* custom message prompt (or null string for default) */
 	U32 			preferenceKey;				/* a key for to managing preferences for using multiple utility dialogs */
-	Handle 			popupExtension;				/* extended popup menu items, an array of NavMenuItemSpecs */
 
 MODULE = Mac::QuickDraw	PACKAGE = NavReplyRecord
 

==== //depot/maint-5.6/macperl/macos/macperl/Makefile.mk#6 (text) ====
Index: perl/macos/macperl/Makefile.mk
--- perl/macos/macperl/Makefile.mk.~1~	Mon Nov 12 22:45:09 2001
+++ perl/macos/macperl/Makefile.mk	Mon Nov 12 22:45:09 2001
@@ -82,6 +82,7 @@
 #	Mac:Menus:Menus				\
 #	Mac:MoreFiles:MoreFiles			\
 #	Mac:Movies:Movies			\
+#	Mac:Navigation:Navigation		\
 #	Mac:Notification:Notification		\
 #	Mac:OSA:OSA				\
 #	Mac:Processes:Processes			\
End of Patch.