pd/src desire.tk, 1.1.2.160, 1.1.2.161 objective.tcl, 1.1.2.7, 1.1.2.8 - Pd-cvs

16 Apr 2006


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14105
Modified Files:
      Tag: devel_0_39
    desire.tk objective.tcl 
Log Message:
more renaming
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.160
retrieving revision 1.1.2.161
diff -C2 -d -r1.1.2.160 -r1.1.2.161
*** desire.tk	16 Apr 2006 07:13:29 -0000	1.1.2.160
--- desire.tk	16 Apr 2006 08:30:45 -0000	1.1.2.161
***************
*** 300,310 ****
  ################## set up main window #########################
! #class_new client {menuable view}
! class_new client {menuable}
set ctrls_audio_on 0
  set ctrls_meter_on 0
! def client init_binds {} {
      global OS
      bind . <Control-Key>       {$main ctrlkey %K 0}
--- 300,310 ----
  ################## set up main window #########################
! #class_new Client {Menuable view}
! class_new Client {Menuable}
set ctrls_audio_on 0
  set ctrls_meter_on 0
! def Client init_binds {} {
      global OS
      bind . <Control-Key>       {$main ctrlkey %K 0}
***************
*** 333,337 ****
  }
! def client init_controls {} {
      global pd_tearoff OS
      menu .mbar
--- 333,337 ----
  }
! def Client init_controls {} {
      global pd_tearoff OS
      menu .mbar
***************
*** 519,524 ****
# a menuable must be a view
! class_new menuable {}
! def* menuable init {args} {
    eval [concat [list super] $args]
    set @accel {}
--- 519,524 ----
# a menuable must be a view
! class_new Menuable {}
! def* Menuable init {args} {
    eval [concat [list super] $args]
    set @accel {}
***************
*** 528,536 ****
  set untitled_directory [pwd]
! def client init {} {
    #super
  }
! def client new_file {} {
      global untitled_number untitled_directory
      pd pd filename Untitled-$untitled_number $untitled_directory
--- 528,536 ----
  set untitled_directory [pwd]
! def Client init {} {
    #super
  }
! def Client new_file {} {
      global untitled_number untitled_directory
      pd pd filename Untitled-$untitled_number $untitled_directory
***************
*** 539,547 ****
  }
! set main [client_new]
  $main init_controls
  $main init_binds
! def client open_file {} {
      global pd_opendir
      set filename [tk_getOpenFile -defaultextension .pd \
--- 539,547 ----
  }
! set main [Client new]
  $main init_controls
  $main init_binds
! def Client open_file {} {
      global pd_opendir
      set filename [tk_getOpenFile -defaultextension .pd \
***************
*** 551,555 ****
  }
! def client open_file_really {filename} {
      global pd_opendir font
      set i [string last / $filename]
--- 551,555 ----
  }
! def Client open_file_really {filename} {
      global pd_opendir font
      set i [string last / $filename]
***************
*** 562,566 ****
  }
! def client send_message {} {
      toplevel .sendpanel
      set e .sendpanel.entry
--- 562,566 ----
  }
! def Client send_message {} {
      toplevel .sendpanel
      set e .sendpanel.entry
***************
*** 579,587 ****
  #-----------------------------------------------------------------------------------#
! def menuable populate_menu {menu list} {
    if {[string index $menu 0]!="."} {set menu .$self.m.$menu}
    foreach e $list {$self populate_menu_1 $menu $e}
  }
! def menuable populate_menu_1 {menu e} {
    if {[llength $e]==0} {$menu add separator; return}
    mset {text cmd accel} $e
--- 579,587 ----
  #-----------------------------------------------------------------------------------#
! def Menuable populate_menu {menu list} {
    if {[string index $menu 0]!="."} {set menu .$self.m.$menu}
    foreach e $list {$self populate_menu_1 $menu $e}
  }
! def Menuable populate_menu_1 {menu e} {
    if {[llength $e]==0} {$menu add separator; return}
    mset {text cmd accel} $e
***************
*** 606,610 ****
  #################### the "File" menu for the Pd window ##############
! def client init_menus {} {
      $self populate_menu .mbar.file {
          {new_file     {} "Ctrl+n"}
--- 606,610 ----
  #################### the "File" menu for the Pd window ##############
! def Client init_menus {} {
      $self populate_menu .mbar.file {
          {new_file     {} "Ctrl+n"}
***************
*** 644,648 ****
# note: uplevel would be nice but with the supercalls we don't know how many levels up
! def* menuable eval% {code} {
    regsub -all %W $code $self code
    eval $code
--- 644,648 ----
# note: uplevel would be nice but with the supercalls we don't know how many levels up
! def* Menuable eval% {code} {
    regsub -all %W $code $self code
    eval $code
***************
*** 650,654 ****
! def* menuable ctrlkey {key shift} {
      set key [if {$shift} {string toupper $key} {string tolower $key}]
      set key "Ctrl+$key"
--- 650,654 ----
! def* Menuable ctrlkey {key shift} {
      set key [if {$shift} {string toupper $key} {string tolower $key}]
      set key "Ctrl+$key"
***************
*** 661,665 ****
  }
! def* menuable altkey {key iso} {
    #hum, where is shift?
      #set key [if {$shift} {string toupper $key} {string tolower $key}]
--- 661,665 ----
  }
! def* Menuable altkey {key iso} {
    #hum, where is shift?
      #set key [if {$shift} {string toupper $key} {string tolower $key}]
***************
*** 854,858 ****
  #-----------------------------------------------------------------------------------#
! class_new Canvas {menuable view}
#def Canvas close  {} {pd $self menuclose 0}
--- 854,858 ----
  #-----------------------------------------------------------------------------------#
! class_new Canvas {Menuable view}
#def Canvas close  {} {pd $self menuclose 0}
***************
*** 871,875 ****
  }
! def client paths {} {pd pd start-path-dialog}
proc menu_addstd {mbar} {
--- 871,875 ----
  }
! def Client paths {} {pd pd start-path-dialog}
proc menu_addstd {mbar} {
***************
*** 907,911 ****
  }
! def client about {} {
          set dialog [menu_doc_open doc/1.manual 1.introduction.txt]
          wm title $dialog "About Pd"
--- 907,911 ----
  }
! def Client about {} {
          set dialog [menu_doc_open doc/1.manual 1.introduction.txt]
          wm title $dialog "About Pd"
***************
*** 3630,3634 ****
  }
! def client pdrc_editor {} {pdrc_editor_new}
############ other stuff #########
--- 3630,3634 ----
  }
! def Client pdrc_editor {} {pdrc_editor_new}
############ other stuff #########
Index: objective.tcl
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/objective.tcl,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -C2 -d -r1.1.2.7 -r1.1.2.8
*** objective.tcl	16 Apr 2006 06:28:10 -0000	1.1.2.7
--- objective.tcl	16 Apr 2006 08:30:45 -0000	1.1.2.8
***************
*** 84,88 ****
    set self [lindex $args 0]
    if {"$self" == ""} {error "null pointer error"}
- 	set selector [lindex $args 1]
    if {[llength [array names _ $self:_class]] == 0} {
    	return [uplevel 1 [linsert $args 0 _original_unknown]]
--- 84,87 ----
***************
*** 90,93 ****
--- 89,93 ----
    set methods {}
    set ancestors {}
+ 	set selector [lindex $args 1]
    lookup_method $_($self:_class) $selector methods ancestors
    set i 0
***************
*** 118,121 ****
--- 118,123 ----
  class_new Class
  def Class subclasses {} {return $@subclasses}
+ def Class new    {   args} {eval [concat [list ${self}_new       ] $args]}
+ def Class new_as {id args} {eval [concat [list ${self}_new_as $id] $args]}
#-----------------------------------------------------------------------------------#