diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:51:39 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:51:39 +0000 |
| commit | 4fff806f397998ff778ec3b7a4569e0dcedbfaec (patch) | |
| tree | 6e1c7064cc64a9fb5775347b5ec142ea32344e36 | |
| parent | 3729410b645aaca9b96f61c4c2aca2700e9a8e1c (diff) | |
| download | ruby-4fff806f397998ff778ec3b7a4569e0dcedbfaec.tar.gz ruby-4fff806f397998ff778ec3b7a4569e0dcedbfaec.tar.xz ruby-4fff806f397998ff778ec3b7a4569e0dcedbfaec.zip | |
merges r20913 from trunk into ruby_1_9_1.
* ext/tk/tcltklib.c: fix wrong flag value.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21001 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/tk/tcltklib.c | 7 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Mon Dec 22 18:00:36 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> + + * ext/tk/tcltklib.c: fix wrong flag value. + Mon Dec 22 12:26:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * cygwin/GNUmakefile.in (rubydll.def), win32/mkexports.rb diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c index 22287e8c6..a187dceed 100644 --- a/ext/tk/tcltklib.c +++ b/ext/tk/tcltklib.c @@ -4,7 +4,7 @@ * Oct. 24, 1997 Y. Matsumoto */ -#define TCLTKLIB_RELEASE_DATE "2008-12-03" +#define TCLTKLIB_RELEASE_DATE "2008-12-22" #include "ruby.h" @@ -411,7 +411,7 @@ static VALUE eventloop_thread; Tcl_ThreadId tk_eventloop_thread_id; /* native thread ID of Tcl interpreter */ #endif static VALUE eventloop_stack; -static int window_event_mode = ( ~ TCL_IDLE_EVENTS | TCL_WINDOW_EVENTS ); +static int window_event_mode = ~0; static VALUE watchdog_thread; @@ -1187,7 +1187,7 @@ set_eventloop_window_mode(self, mode) if (RTEST(mode)) { window_event_mode = ~0; } else { - window_event_mode = ~(TCL_WINDOW_EVENTS | TCL_IDLE_EVENTS); + window_event_mode = ~TCL_WINDOW_EVENTS; } return mode; @@ -10152,3 +10152,4 @@ Init_tcltklib() } /* eof */ + |