Commit 0ac9bb67 authored by Diederik van Arkel's avatar Diederik van Arkel
Browse files

Don't add 'Quit' menu item when running OS X;

parent 7351e5bb
......@@ -113,7 +113,7 @@ Start world
// , ProcessClipboardChanged clip_changed
: toolbar
] ++ PlatformProcessAttributes
#! (ids,world) = openIds 8 world
#! (ids,world) = openIds 7/*8*/ world
# (mFhMenId,world) = openId world
(mPhMenId,world) = openId world
pini = ini envspath prefspath
......@@ -193,7 +193,7 @@ where
, mCommandsId
, mOptionsId, mGoodiesId
, mPrNewId, mPrOpenId
, quitId
// , quitId
: _
] ps
......@@ -202,7 +202,7 @@ where
# (fhRecId,ps) = getFHI ps
# (phRecId,ps) = getPHI ps
# (menuIds,ps) = getMenuIds ps
# (err,ps) = openMenu Void (fileMenu prefspath menuIds mPrNewId mFileId mFhMenId mPhMenId quitId fhRecId phRecId prefs) ps
# (err,ps) = openMenu Void (fileMenu prefspath menuIds mPrNewId mFileId mFhMenId mPhMenId /*quitId*/ fhRecId phRecId prefs) ps
| err <> NoError
= abort "unable to open File menu"
# (editRecId,ps)= getEditRecId ps
......@@ -238,7 +238,7 @@ where
ini _ _ _ _ _ _ _ _ _ _ _ _ _ _ ps = abort "IDE.icl: ini called with insufficient id's"
fileMenu prefspath {mn_clo,mn_sva,mn_sav,mn_rev,mn_oth,mn_prt,mn_prs,mn_odm,mn_oim}
mPrNewId mFileId mFhMenId mPhMenId quitId fhRecId phRecId prefs
mPrNewId mFileId mFhMenId mPhMenId /*quitId*/ fhRecId phRecId prefs
# altgr_workaround = prefs.altgr_workaround
= Menu "&File"
......@@ -315,12 +315,14 @@ fileMenu prefspath {mn_clo,mn_sva,mn_sav,mn_rev,mn_oth,mn_prt,mn_prs,mn_odm,mn_o
:+: MenuSeparator []
:+: FileHistMenu "Recent Files" 12 mFileId fhRecId mFhMenId (StrictListToList prefs.file_hist) fhopen
:+: FileHistMenu "Recent Projects" 12 mFileId phRecId mPhMenId (StrictListToList prefs.proj_hist) phopen
:+: MenuSeparator []
:+: MenuItem "&Quit"
[ MenuShortKey 'Q'
, MenuFunction (noLS (Quit prefspath))
, MenuId (quitId)
]
:+: PlatformItem (PlatformDependant True (not onOSX))
( MenuSeparator []
:+: MenuItem "&Quit"
[ MenuShortKey 'Q'
, MenuFunction (noLS (Quit prefspath))
// , MenuId (quitId)
]
)
)
[ MenuId (mFileId)
]
......@@ -343,7 +345,17 @@ where
= pm_open_path pathName ps
// # (ok,ps) = pm_switch pathName ps
// = ps
:: PlatformItem m ls pst = PlatformItem Bool (m ls pst)
instance MenuElements (PlatformItem m) | MenuElements m where
menuElementToHandles (PlatformItem False _) pState
= menuElementToHandles NilLS pState
menuElementToHandles (PlatformItem True item) pState
= menuElementToHandles item pState
getMenuElementType _
= "PlatformItem"
searchMenu altgr_workaround mSearchId {srchIds,findIds,gotoIds,nextIds}
= Menu "&Search"
( MenuItem "&Find..." [ MenuId (findIds!!0), MenuShortKey 'F', MenuModsFunction (shiftfun sr_find) ]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment