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 | fbdf4de0938cdd4606094ed44a31cfce36dc5aac (patch) | |
tree | 6e1c7064cc64a9fb5775347b5ec142ea32344e36 /ext | |
parent | d0ac50680a23fe94e11ad359e073f4f6ee904925 (diff) |
merges r20913 from trunk into ruby_1_9_1.
* ext/tk/tcltklib.c: fix wrong flag value.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21001 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/tk/tcltklib.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c index 22287e8c65..a187dceed5 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 */ + |