mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
process.c : unify indentation
configure.in : add --enable-setreuid option
tcltklib.c : TclTkIp.new accepts 'ip-name' and 'options'
( e.g. TclTkIp.new('FOO', '-geometry 500x200 -use 0x2200009') )
tk.rb : support arguments of TclTkIp.new
( see TkCore::IP_NAME, TkCore::IP_OPTS )
tk*.rb : preparations for multi-Tk interpreter support
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4127 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
528b6c3f64
commit
fd46a1da0a
17 changed files with 631 additions and 468 deletions
|
|
@ -9,17 +9,16 @@ class TkFont
|
|||
include Tk
|
||||
extend TkCore
|
||||
|
||||
Tk_FontID = [0]
|
||||
Tk_FontNameTBL = {}
|
||||
Tk_FontUseTBL = {}
|
||||
TkCommandNames = ['font'.freeze].freeze
|
||||
|
||||
TkComm.__add_target_for_init__(self)
|
||||
Tk_FontID = ["@font".freeze, "00000"]
|
||||
Tk_FontNameTBL = TkCore::INTERP.create_table
|
||||
Tk_FontUseTBL = TkCore::INTERP.create_table
|
||||
|
||||
def self.__init_tables__
|
||||
TkCore::INTERP.init_ip_env{
|
||||
Tk_FontNameTBL.clear
|
||||
Tk_FontUseTBL.clear
|
||||
Tk_FontID[0] = 0
|
||||
end
|
||||
}
|
||||
|
||||
# set default font
|
||||
case Tk::TK_VERSION
|
||||
|
|
@ -222,8 +221,8 @@ class TkFont
|
|||
private
|
||||
###################################
|
||||
def initialize(ltn=DEFAULT_LATIN_FONT_NAME, knj=nil, keys=nil)
|
||||
@id = format("@font%.4d", Tk_FontID[0])
|
||||
Tk_FontID[0] += 1
|
||||
@id = Tk_FontID.join
|
||||
Tk_FontID[1].succ!
|
||||
Tk_FontNameTBL[@id] = self
|
||||
knj = DEFAULT_KANJI_FONT_NAME if JAPANIZED_TK && !knj
|
||||
create_compoundfont(ltn, knj, keys)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue