Fix method redefined and circular require verbose warnings

lib/multi-tk.rb

@@ -3519,4 +3519,4 @@ class MultiTkIp
 module TkCore
   INTERP = MultiTkIp
 end
-require 'tk'
+require 'tk' unless defined?(Tk)

lib/thread_tk.rb

@@ -10,4 +10,4 @@
 end
 
 module TkCore; RUN_EVENTLOOP_ON_MAIN_THREAD = false; end
-require 'tk'
+require 'tk' unless defined?(Tk)

lib/tk.rb

@@ -1317,8 +1317,10 @@ def @tk_cmd_tbl.[]=(idx,val)
       @add_tk_procs = []  # table of [name, args, body]
 
       @force_default_encoding ||= [false]
-      @encoding ||= [nil]
-      def @encoding.to_s; self.join(nil); end
+      unless @encoding
+        @encoding = [nil]
+        def @encoding.to_s; self.join(nil); end
+      end
 
       @cb_entry_class = Class.new(TkCallbackEntry){
         class << self

lib/tk/bgerror.rb

@@ -3,7 +3,7 @@
 #  tkbgerror -- bgerror ( tkerror ) module
 #                     1998/07/16 by Hidetoshi Nagai <[email protected]>
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkBgError
   extend Tk

lib/tk/bindtag.rb

@@ -2,7 +2,7 @@
 #
 # tk/bind.rb : control event binding
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 class TkBindTag
   include TkBindCore

lib/tk/busy.rb

@@ -2,7 +2,7 @@
 #
 # tk/busy.rb: support 'tk busy' command (Tcl/Tk8.6 or later)
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module Tk::Busy
   include TkCore

lib/tk/button.rb

@@ -2,7 +2,7 @@
 #
 # tk/button.rb : treat button widget
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/label'
 
 class Tk::Button<Tk::Label

lib/tk/canvas.rb

@@ -3,7 +3,7 @@
 #               tk/canvas.rb - Tk canvas classes
 #                       by Yukihiro Matsumoto <[email protected]>
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/canvastag'
 require 'tk/itemconfig'
 require 'tk/scrollable'

lib/tk/canvastag.rb

@@ -2,7 +2,7 @@
 #
 # tk/canvastag.rb - methods for treating canvas tags
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/tagfont'
 
 module TkcTagAccess

lib/tk/checkbutton.rb

@@ -2,7 +2,7 @@
 #
 # tk/checkbutton.rb : treat checkbutton widget
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/radiobutton'
 
 class Tk::CheckButton<Tk::RadioButton

lib/tk/clipboard.rb

@@ -2,7 +2,7 @@
 #
 # tk/clipboard.rb : methods to treat clipboard
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkClipboard
   include Tk

lib/tk/clock.rb

@@ -2,7 +2,7 @@
 #
 # tk/clock.rb : methods for clock command
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module Tk
   module Clock

lib/tk/composite.rb

@@ -2,7 +2,7 @@
 #
 # tk/composite.rb :
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkComposite
   include Tk

lib/tk/console.rb

@@ -2,7 +2,7 @@
 #
 #   tk/console.rb : control the console on system without a real console
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkConsole
   include Tk

lib/tk/dialog.rb

@@ -2,7 +2,7 @@
 #
 #   tk/dialog.rb : create dialog boxes
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/variable.rb'
 
 class TkDialogObj < TkWindow

lib/tk/encodedstr.rb

@@ -2,7 +2,7 @@
 #
 # tk/encodedstr.rb : Tk::EncodedString class
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 ###########################################
 #  string with Tcl's encoding

lib/tk/entry.rb

@@ -3,7 +3,7 @@
 #               tk/entry.rb - Tk entry classes
 #                       by Yukihiro Matsumoto <[email protected]>
 
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/label'
 require 'tk/scrollable'
 require 'tk/validation'

lib/tk/font.rb

@@ -4,7 +4,7 @@
 #
 #                               by  Hidetoshi NAGAI ([email protected])
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 class TkFont
   include Tk

lib/tk/fontchooser.rb

@@ -2,7 +2,7 @@
 #
 # tk/fontchooser.rb -- "tk fontchooser" support (Tcl/Tk8.6 or later)
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/font'
 
 module TkFont::Chooser

lib/tk/frame.rb

@@ -2,7 +2,7 @@
 #
 # tk/frame.rb : treat frame widget
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 class Tk::Frame<TkWindow
   TkCommandNames = ['frame'.freeze].freeze

lib/tk/grid.rb

@@ -2,7 +2,7 @@
 #
 # tk/grid.rb : control grid geometry manager
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkGrid
   include Tk

lib/tk/image.rb

@@ -3,7 +3,7 @@
 # tk/image.rb : treat Tk image objects
 #
 
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 class TkImage<TkObject
   include Tk

lib/tk/itemconfig.rb

@@ -2,7 +2,7 @@
 #
 # tk/itemconfig.rb : control item/tag configuration of widget
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tkutil'
 require 'tk/itemfont.rb'
 

lib/tk/itemfont.rb

@@ -2,7 +2,7 @@
 #
 # tk/itemfont.rb : control font of widget items
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkItemFontOptkeys
   def __item_font_optkeys(id)

lib/tk/kinput.rb

@@ -2,7 +2,7 @@
 #
 # tk/kinput.rb : control kinput
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkKinput
   include Tk

lib/tk/label.rb

@@ -2,7 +2,7 @@
 #
 # tk/label.rb : treat label widget
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 class Tk::Label<TkWindow
   TkCommandNames = ['label'.freeze].freeze

lib/tk/labelframe.rb

@@ -2,7 +2,7 @@
 #
 # tk/labelframe.rb : treat labelframe widget
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/frame'
 
 class Tk::LabelFrame<Tk::Frame

lib/tk/listbox.rb

@@ -2,7 +2,7 @@
 #
 # tk/listbox.rb : treat listbox widget
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/itemconfig'
 require 'tk/scrollable'
 require 'tk/txtwin_abst'

lib/tk/macpkg.rb

@@ -7,7 +7,7 @@
 #         This is NOT TESTED. Because I have no test-environment.
 #
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module Tk
   def Tk.load_tclscript_rsrc(resource_name, file=None)

lib/tk/menu.rb

@@ -2,7 +2,7 @@
 #
 # tk/menu.rb : treat menu and menubutton
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/itemconfig'
 require 'tk/menuspec'
 

lib/tk/menubar.rb

@@ -85,7 +85,7 @@
 # To use add_menu, configuration must be done by calling configure after
 # adding all menus by add_menu, not by the constructor arguments.
 
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/frame'
 require 'tk/composite'
 require 'tk/menuspec'

lib/tk/message.rb

@@ -2,7 +2,7 @@
 #
 # tk/message.rb : treat message widget
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/label'
 
 class Tk::Message<Tk::Label

lib/tk/mngfocus.rb

@@ -3,7 +3,7 @@
 #   tk/mngfocus.rb : methods for Tcl/Tk standard library 'focus.tcl'
 #                           by Hidetoshi Nagai <[email protected]>
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkManageFocus
   extend Tk

lib/tk/msgcat.rb

@@ -3,7 +3,7 @@
 #   tk/msgcat.rb : methods for Tcl message catalog
 #                     by Hidetoshi Nagai <[email protected]>
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 #class TkMsgCatalog
 class TkMsgCatalog < TkObject

lib/tk/namespace.rb

@@ -3,7 +3,7 @@
 #   tk/namespace.rb : methods to manipulate Tcl/Tk namespace
 #                           by Hidetoshi Nagai <[email protected]>
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 class TkNamespace < TkObject
   extend Tk

lib/tk/optiondb.rb

@@ -2,7 +2,7 @@
 #
 # tk/optiondb.rb : treat option database
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkOptionDB
   include Tk

lib/tk/optionobj.rb

@@ -8,7 +8,7 @@
 #        e.g. hash_kv({'aaa'=>1, 'bbb'=>Tk::None, 'ccc'=>3})
 #                 => ["-aaa", 1, "-bbb", "-ccc", 3]
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module Tk
   class OptionObj < Hash

lib/tk/pack.rb

@@ -2,7 +2,7 @@
 #
 # tk/pack.rb : control pack geometry manager
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkPack
   include Tk

lib/tk/package.rb

@@ -2,7 +2,7 @@
 #
 # tk/package.rb : package command
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkPackage
   include TkCore

lib/tk/palette.rb

@@ -3,7 +3,7 @@
 #   tk/palette.rb : methods for Tcl/Tk standard library 'palette.tcl'
 #                     1998/06/21 by Hidetoshi Nagai <[email protected]>
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkPalette
   include Tk

lib/tk/panedwindow.rb

@@ -2,7 +2,7 @@
 #
 # tk/panedwindow.rb : treat panedwindow
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 class Tk::PanedWindow<TkWindow
   TkCommandNames = ['panedwindow'.freeze].freeze

lib/tk/place.rb

@@ -2,7 +2,7 @@
 #
 # tk/place.rb : control place geometry manager
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 
 module TkPlace
   include Tk

lib/tk/radiobutton.rb

@@ -2,7 +2,7 @@
 #
 # tk/radiobutton.rb : treat radiobutton widget
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/button'
 
 class Tk::RadioButton<Tk::Button

lib/tk/root.rb

@@ -2,7 +2,7 @@
 #
 # tk/root.rb : treat root widget
 #
-require 'tk'
+require 'tk' unless defined?(Tk)
 require 'tk/wm'
 require 'tk/menuspec'