[PD-cvs] pd/src desire.tk,1.1.2.2,1.1.2.3

[chunlee]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23486

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
ok, it should be error proof for the menus. 
next, the wire_draw stuff


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** desire.tk	29 Jul 2005 01:49:57 -0000	1.1.2.2
--- desire.tk	30 Jul 2005 16:12:16 -0000	1.1.2.3
***************
*** 113,126 ****
  		#-command {pd "pd audio-setapi $pd_whichapi ;"}
      }
      populate_menu $mbar.audio {} {
! 	{"Audio settings..." {pd pd audio-properties} ""}
! 	{"MIDI settings..."  {pd pd midi-properties}  ""}
! 	{"Test Audio and MIDI" {menu_doc_open doc/7.stuff/tools testtone.pd} ""}
!         {"Load Meter" {menu_doc_open doc/7.stuff/tools load-meter.pd} ""}
      }
      populate_menu $mbar.help {} {
! 	{"About Pd" {menu_about} ""}
! 	{"Pure Documentation..." {menu_documentation} ""}
      }
  }
  
--- 113,143 ----
  		#-command {pd "pd audio-setapi $pd_whichapi ;"}
      }
+     
+     #the original
+     #populate_menu $mbar.audio {} {
+ 	#{"Audio settings..." {pd pd audio-properties} ""}
+ 	#{"MIDI settings..."  {pd pd midi-properties}  ""}
+ 	#{"Test Audio and MIDI" {menu_doc_open doc/7.stuff/tools testtone.pd} ""}
+      #   {"Load Meter" {menu_doc_open doc/7.stuff/tools load-meter.pd} ""}
+     #}
+     
+     #populate_menu $mbar.help {} {
+ 	#{"About Pd" {menu_about} ""}
+ 	#{"Pure Documentation..." {menu_documentation} ""}
+     #}
+     
+     #error proof
      populate_menu $mbar.audio {} {
! 	{"Audio settings..." {foo "pd audio-properties"} ""}
! 	{"MIDI settings..."  {foo "pd midi-properties"}  ""}
! 	{"Test Audio and MIDI" {foo "menu_doc_open doc/7.stuff/tools testtone.pd"} ""}
!         {"Load Meter" {foo "menu_doc_open doc/7.stuff/tools load-meter.pd"} ""}
      }
+     
      populate_menu $mbar.help {} {
! 	{"About Pd" {foo "menu_about"} ""}
! 	{"Pure Documentation..." {foo "menu_documentation"} ""}
      }
+     
  }
  
***************
*** 287,290 ****
--- 304,315 ----
  }
  #-----------------------------------------------------------------------------------#
+ 
+ proc menu_audio {flag} {
+ 	puts "menu_audio::: $flag"
+ 
+ 	pd "pd dsp $flag ;"
+ }
+ 
+ #-----------------------------------------------------------------------------------#
  #get the name of the toplevel window for a canvas; this is also
  #the name of the canvas object in Pd.
***************
*** 389,405 ****
      populate_menu $name.m.put $name $canvasmenu(put)
      
      menu $name.m.find -tearoff $pd_tearoff
      $name.m add cascade -label Find -menu $name.m.find
      populate_menu $name.m.find $name {
! 	{Find... {menu_findobject %W} "Ctrl+f"}
! 	{"Find Again" {pd "%W findagain ;"} "Ctrl+g"}
!     	{"Find last error" {menu_finderror} {}}
      }
      
!     menu $name.m.windows -postcommand "menu_fixwindowmenu $name" \
  	-tearoff $pd_tearoff
      populate_menu $name.m.windows $name {
! 	{"parent window" {menu_windowparent %W} {}}
! 	{"Pd window" {menu_pop_pd %W} {}}
  	{}
      }
--- 414,450 ----
      populate_menu $name.m.put $name $canvasmenu(put)
      
+     # the original
+     #menu $name.m.find -tearoff $pd_tearoff
+     #$name.m add cascade -label Find -menu $name.m.find
+     #populate_menu $name.m.find $name {
+ 	#{Find... {menu_findobject %W} "Ctrl+f"}
+ 	#{"Find Again" {pd "%W findagain ;"} "Ctrl+g"}
+     	#{"Find last error" {menu_finderror} {}}
+     #}
+     
+     #error proof
      menu $name.m.find -tearoff $pd_tearoff
      $name.m add cascade -label Find -menu $name.m.find
      populate_menu $name.m.find $name {
! 	{Find... {foo menu_findobject} "Ctrl+f"}
! 	{"Find Again" {foo "pd %W findagain"} "Ctrl+g"}
!     	{"Find last error" {foo menu_finderror} {}}
      }
      
!     #the original
!     #menu $name.m.windows -postcommand "menu_fixwindowmenu $name" \
! 	#-tearoff $pd_tearoff
!     #populate_menu $name.m.windows $name {
! 	#{"parent window" {menu_windowparent %W} {}}
! 	#{"Pd window" {menu_pop_pd %W} {}}
! 	#{}
!     #}
!     
!     #error proof
!     menu $name.m.windows -postcommand "foo menu_fixwindowmenu" \
  	-tearoff $pd_tearoff
      populate_menu $name.m.windows $name {
! 	{"parent window" {foo menu_windowparent} {}}
! 	{"Pd window" {foo menu_pop_pd} {}}
  	{}
      }
***************
*** 576,584 ****
       
      # for audio switch on/off	    
!     #switch -- $key {
!     #  slash {menu_audio 1}
!     #  period {menu_audio 0}
!     #  e {menu_editmode $topname}
!     #}
  }
  #-----------------------------------------------------------------------------------#
--- 621,629 ----
       
      # for audio switch on/off	    
!     switch -- $key {
!       slash {menu_audio 1}
!       period {menu_audio 0}
!       e {menu_editmode $topname}
!     }
  }
  #-----------------------------------------------------------------------------------#