← 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/tk/wm.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/tk/wm.rb
123
123
    TOPLEVEL_METHODCALL_OPTKEYS['focusmodel'] = 'focusmodel'
124
124
 
125
125
    def Wm.forget(win)
126
 
      # Tcl/Tk 8.5+ 
 
126
      # Tcl/Tk 8.5+
127
127
      # work with dockable frames
128
128
      tk_call_without_enc('wm', 'forget', win.epath)
129
129
      win
200
200
      if imgs.empty?
201
201
        win.instance_eval{
202
202
          @wm_iconphoto = nil unless defined? @wm_iconphoto
203
 
          return @wm_iconphoto 
 
203
          return @wm_iconphoto
204
204
        }
205
205
      end
206
206
 
308
308
    def Wm.manage(win, use_id = nil)
309
309
      # Tcl/Tk 8.5+ feature
310
310
      # --------------------------------------------------------------
311
 
      # In the future release, I want to support to embed the 'win' 
 
311
      # In the future release, I want to support to embed the 'win'
312
312
      # into the container which has window-id 'use-id'.
313
 
      # It may give users frexibility on controlling their GUI. 
314
 
      # However, it may be difficult for current Tcl/Tk (Tcl/Tk8.5.1), 
 
313
      # It may give users frexibility on controlling their GUI.
 
314
      # However, it may be difficult for current Tcl/Tk (Tcl/Tk8.5.1),
315
315
      # because it seems to require to modify Tcl/Tk's source code.
316
316
      # --------------------------------------------------------------
317
317
      if use_id