src/tclx/ucbsrc/tclexpr.sed: Micropolis build fixes for recent macOS

[micropolis] / res / wmap.tcl

diff --git a/res/wmap.tcl b/res/wmap.tcl
index 73e7d6f85fcc6ee86d4d2e0a86aa6f392aa1b93a..f6504f064cc88ef333aca58dea7839e18f304fc7 100644 (file)
--- a/res/wmap.tcl
+++ b/res/wmap.tcl
@@ -124,7 +124,7 @@ menubutton $win.topframe.zones\
 LinkWindow $win.zones $win.topframe.zones
 tk_bindForTraversal $win.topframe.zones
 bind $win.topframe.zones <F10> {tk_firstMenu %W} 
 LinkWindow $win.zones $win.topframe.zones
 tk_bindForTraversal $win.topframe.zones
 bind $win.topframe.zones <F10> {tk_firstMenu %W} 

-bind $win.topframe.zones <Mod2-Key> {tk_traverseToMenu %W %A} 
+bind $win.topframe.zones <Alt-Key> {tk_traverseToMenu %W %A} 

 tk_menus $win $win.topframe.zones
 
 SetHelp $win.topframe.zones Map.Zones
 tk_menus $win $win.topframe.zones
 
 SetHelp $win.topframe.zones Map.Zones


@@ -133,7 +133,7 @@ menu $win.topframe.zones.m\
   -font [Font $win Medium]
 tk_bindForTraversal $win.topframe.zones.m
 bind $win.topframe.zones.m <F10> {tk_firstMenu %W} 
   -font [Font $win Medium]
 tk_bindForTraversal $win.topframe.zones.m
 bind $win.topframe.zones.m <F10> {tk_firstMenu %W} 

-bind $win.topframe.zones.m <Mod2-Key> {tk_traverseToMenu %W %A} 
+bind $win.topframe.zones.m <Alt-Key> {tk_traverseToMenu %W %A} 

   $win.topframe.zones.m add radiobutton\
     -label {All}\
     -variable MapState.$win\
   $win.topframe.zones.m add radiobutton\
     -label {All}\
     -variable MapState.$win\


@@ -176,7 +176,7 @@ menubutton $win.topframe.overlays\
 LinkWindow $win.overlays $win.topframe.overlays
 tk_bindForTraversal $win.topframe.overlays
 bind $win.topframe.overlays <F10> {tk_firstMenu %W} 
 LinkWindow $win.overlays $win.topframe.overlays
 tk_bindForTraversal $win.topframe.overlays
 bind $win.topframe.overlays <F10> {tk_firstMenu %W} 

-bind $win.topframe.overlays <Mod2-Key> {tk_traverseToMenu %W %A} 
+bind $win.topframe.overlays <Alt-Key> {tk_traverseToMenu %W %A} 

 tk_menus $win $win.topframe.overlays
 
 SetHelp $win.topframe.overlays Map.Overlays
 tk_menus $win $win.topframe.overlays
 
 SetHelp $win.topframe.overlays Map.Overlays


@@ -185,7 +185,7 @@ menu $win.topframe.overlays.m\
   -font [Font $win Medium]
 tk_bindForTraversal $win.topframe.overlays.m
 bind $win.topframe.overlays.m <F10> {tk_firstMenu %W} 
   -font [Font $win Medium]
 tk_bindForTraversal $win.topframe.overlays.m
 bind $win.topframe.overlays.m <F10> {tk_firstMenu %W} 

-bind $win.topframe.overlays.m <Mod2-Key> {tk_traverseToMenu %W %A} 
+bind $win.topframe.overlays.m <Alt-Key> {tk_traverseToMenu %W %A} 

   $win.topframe.overlays.m add radiobutton\
     -label {Population Density}\
     -variable MapState.$win\
   $win.topframe.overlays.m add radiobutton\
     -label {Population Density}\
     -variable MapState.$win\


@@ -232,6 +232,30 @@ bind $win.topframe.overlays.m <Mod2-Key> {tk_traverseToMenu %W %A}
     -value 13\
     -command "SetMapState $win 13"
 
     -value 13\
     -command "SetMapState $win 13"
 

+button $win.topframe.hide\
+  -text {Hide Map}\
+  -font [Font $win Medium]\
+  -borderwidth 1\
+  -command "HideMap $win" \
+  -relief flat
+LinkWindow $win.hide $win.topframe.hide
+tk_bindForTraversal $win.topframe.hide
+
+proc HideMap {win} {
+  pack unpack $win.centerframe
+  $win.topframe.hide configure \
+    -text {Show Map}\
+    -command "ShowMap $win"
+}
+
+proc ShowMap {win} {
+  pack append $win\
+    $win.centerframe           {top frame center fill}
+  $win.topframe.hide configure \
+    -text {Hide Map}\
+    -command "HideMap $win"
+}
+

 label $win.topframe.legend\
   -bitmap "@images/legendn.xpm" \
   -font [Font $win Medium]
 label $win.topframe.legend\
   -bitmap "@images/legendn.xpm" \
   -font [Font $win Medium]


@@ -240,6 +264,7 @@ LinkWindow $win.legend $win.topframe.legend
 pack append $win.topframe\
   $win.topframe.zones          {left frame nw} \
   $win.topframe.overlays       {left frame nw} \
 pack append $win.topframe\
   $win.topframe.zones          {left frame nw} \
   $win.topframe.overlays       {left frame nw} \

+  $win.topframe.hide           {left frame nw} \

   $win.topframe.legend         {right frame ne}
 
 pack append $win\
   $win.topframe.legend         {right frame ne}
 
 pack append $win\