|
From: <cre...@us...> - 2006-09-18 19:48:20
|
Revision: 1513
http://svn.sourceforge.net/frontierkernel/?rev=1513&view=rev
Author: creecode
Date: 2006-09-18 12:48:14 -0700 (Mon, 18 Sep 2006)
Log Message:
-----------
in menuedit function set proxy window icon
minor formatting tweaks
Modified Paths:
--------------
Frontier/branches/FSRef_Migration/Common/source/menuverbs.c
Modified: Frontier/branches/FSRef_Migration/Common/source/menuverbs.c
===================================================================
--- Frontier/branches/FSRef_Migration/Common/source/menuverbs.c 2006-09-18 19:45:47 UTC (rev 1512)
+++ Frontier/branches/FSRef_Migration/Common/source/menuverbs.c 2006-09-18 19:48:14 UTC (rev 1513)
@@ -52,8 +52,13 @@
#include "cancoon.h"
#include "kernelverbdefs.h"
+#ifdef MACVERSION
+ #include "MoreFilesX.h"
+#endif
+
+
#define menustringlist 166
#define menutypestring 1
#define menusizestring 2
@@ -792,9 +797,11 @@
boolean menuedit (hdlexternalvariable hvariable, hdlwindowinfo hparent, ptrfilespec fs, bigstring bstitle, rectparam rzoom) {
- /*
- 5.0d19 dmb: set flwindowopen; use locals, not menu globals.
- */
+ //
+ // 2006-09-16 creedon: on Mac, set window proxy icon
+ //
+ // 5.0d19 dmb: set flwindowopen; use locals, not menu globals.
+ //
register hdlmenuvariable hv = (hdlmenuvariable) hvariable;
hdlmenurecord hm;
@@ -813,22 +820,31 @@
}
}
- if (!menuverbinmemory (hv)) /*error swapping menurecord into memory*/
+ if (!menuverbinmemory (hv)) // error swapping menurecord into memory
return (false);
hm = (hdlmenurecord) (**hv).variabledata;
- rwindow = (**hm).menuwindowrect; /*window comes up where it was last time*/
+ rwindow = (**hm).menuwindowrect; // window comes up where it was last time
if (!newchildwindow (idmenueditorconfig, hparent, &rwindow, rzoom, bstitle, &w))
return (false);
getwindowinfo (w, &hi);
- (**hi).hdata = (Handle) hm; /*link data into shell's structure*/
+ (**hi).hdata = (Handle) hm; // link data into shell's structure
- if (fs != nil)
+ if ( fs != nil ) {
+
(**hi).fspec = *fs;
+
+ #ifdef MACVERSION
+
+ if ( FSRefValid ( &( *fs ).fsref ) && ( *fs ).path == NULL )
+ SetWindowProxyCreatorAndType ( w, 'LAND', 'FTmb', kOnSystemDisk );
+ #endif
+
+ }
shellpushglobals (w);
@@ -841,10 +857,11 @@
if ((**hm).fldirty)
shellsetwindowchanges (hi, true);
- windowzoom (w); /*show the window to the user*/
+ windowzoom (w); // show the window to the user
return (true);
- } /*menuedit*/
+
+ } // menuedit
static boolean menudisposevariable (hdlexternalvariable hvariable, boolean fldisk) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|