← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ruby1.9.1/quantal

« back to all changes in this revision

Viewing changes to ext/tk/lib/tkextlib/tcllib/widget.rb

  • Committer: Bazaar Package Importer
  • Author(s): Lucas Nussbaum
  • Date: 2010-07-31 17:08:39 UTC
  • mfrom: (1.1.4 upstream) (8.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20100731170839-j034dmpdqt1cc4p6
Tags: 1.9.2~svn28788-1
http://bugs.debian.org/580852
http://bugs.debian.org/590002
http://bugs.debian.org/543805
http://bugs.debian.org/542927
* New release based on upstream snapshot from the 1.9.2 branch,
  after 1.9.2 RC2. That branch is (supposed to be) binary-compatible
  with the 1.9.1 branch.
  + Builds fine on i386. Closes: #580852.
* Upgrade to Standards-Version: 3.9.1. No changes needed.
* Updated generated incs.
* Patches that still need work:
  + Unclear status, need more investigation:
   090729_fix_Makefile_deps.dpatch
   090803_exclude_rdoc.dpatch
   203_adjust_base_of_search_path.dpatch
   902_define_YAML_in_yaml_stringio.rb.dpatch
   919_common.mk_tweaks.dpatch
   931_libruby_suffix.dpatch
   940_test_thread_mutex_sync_shorter.dpatch
  + Maybe not needed anymore, keeping but not applying.
   102_skip_test_copy_stream.dpatch (test doesn't block anymore?)
   104_skip_btest_io.dpatch (test doesn't block anymore?)
   201_gem_prelude.dpatch (we don't use that rubygems anyway?)
   202_gem_default_dir.dpatch (we don't use that rubygems anyway?)
   940_test_file_exhaustive_fails_as_root.dpatch
   940_test_priority_fails.dpatch
   100518_load_libc_libm.dpatch
* Add disable-tests.diff: disable some tests that cause failures on FreeBSD.
  Closes: #590002, #543805, #542927.
* However, many new failures on FreeBSD. Since that version is still an
  improvement, add the check that makes test suite failures non-fatal on
  FreeBSD again. That still needs to be investigated.
* Re-add 903_skip_base_ruby_check.dpatch
* Add build-dependency on ruby1.8 and drop all pre-generated files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/tk/lib/tkextlib/tcllib/widget.rb
26
26
        ''
27
27
      end
28
28
    end
 
29
 
 
30
    #--- followings may be private functions of tklib
 
31
    def self.isa(compare_as, *args)
 
32
      begin
 
33
        return Tk.tk_call('::widget::isa', compare_as, *args)
 
34
      rescue => e
 
35
        if TkComm.bool(Tk.tk_call('info','command','::widget::isa')) ||
 
36
            ! TkComm.bool(Tk.tk_call('info','command','::widget::validate'))
 
37
          fail e
 
38
        end
 
39
      end
 
40
      Tk.tk_call('::widget::validate', compare_as, *args)
 
41
    end
 
42
    def self.validate(compare_as, *args)
 
43
      begin
 
44
        return Tk.tk_call('::widget::validate', compare_as, *args)
 
45
      rescue => e
 
46
        if TkComm.bool(Tk.tk_call('info','command','::widget::validate')) ||
 
47
            ! TkComm.bool(Tk.tk_call('info','command','::widget::isa'))
 
48
          fail e
 
49
        end
 
50
      end
 
51
      Tk.tk_call('::widget::isa', compare_as, *args)
 
52
    end
29
53
  end
30
54
end
31
55
 
32
56
module Tk::Tcllib::Widget
 
57
  TkComm::TkExtlibAutoloadModule.unshift(self)
 
58
 
 
59
  autoload :Calendar,           'tkextlib/tcllib/calendar'
 
60
 
 
61
  autoload :Canvas_Sqmap,       'tkextlib/tcllib/canvas_sqmap'
 
62
  autoload :Canvas_Zoom,        'tkextlib/tcllib/canvas_zoom'
 
63
 
33
64
  autoload :Dialog,             'tkextlib/tcllib/dialog'
34
65
 
35
66
  autoload :Panelframe,         'tkextlib/tcllib/panelframe'
45
76
 
46
77
  autoload :Superframe,         'tkextlib/tcllib/superframe'
47
78
  autoload :SuperFrame,         'tkextlib/tcllib/superframe'
 
79
 
 
80
  autoload :Toolbar,            'tkextlib/tcllib/toolbar'
 
81
  autoload :ToolbarItem,        'tkextlib/tcllib/toolbar'
48
82
end