kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/tk/tcltklib.c (ip_make_menu_embeddable): help to make a menu

Browse source 
widget embeddable (pack, grid, and so on) like as a general widget.
  However, an embeddable menu may require to be definied some event
  bindings for general use.
* ext/tk/lib/tk/event.rb: [bug fix] Tk.callback_break and
  Tk.callback_continue don't work on MultiTkIp.
* ext/tk/lib/multi-tk.rb: ditto.
* ext/tk/lib/tk.rb: lack of Tk.callback_return.
* ext/tk/lib/tk/menu.rb: improve creating clone menus.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10461 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagai 2006-07-03 10:08:11 +00:00
parent c6956e0d72
commit c47bf50af7
6 changed files with 317 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

109
ext/tk/tcltklib.c
View file

@ -4,7 +4,7 @@
* Oct. 24, 1997 Y. Matsumoto
*/
#define TCLTKLIB_RELEASE_DATE "2006-06-26"
#define TCLTKLIB_RELEASE_DATE "2006-07-03"
#include "ruby.h"
#include "rubysig.h"
@ -129,7 +129,10 @@ tcl_eval(interp, cmd)
const char *cmd; /* don't have to be writable */
{
char *buf = strdup(cmd);
const int ret = Tcl_Eval(interp, buf);
int ret;
Tcl_AllowExceptions(interp);
ret = Tcl_Eval(interp, buf);
free(buf);
return ret;
}
@ -143,7 +146,10 @@ tcl_global_eval(interp, cmd)
const char *cmd; /* don't have to be writable */
{
char *buf = strdup(cmd);
const int ret = Tcl_GlobalEval(interp, buf);
int ret;
Tcl_AllowExceptions(interp);
ret = Tcl_GlobalEval(interp, buf);
free(buf);
return ret;
}
@ -5591,6 +5597,7 @@ call_tcl_eval(arg)
{
struct call_eval_info *inf = (struct call_eval_info *)arg;
Tcl_AllowExceptions(inf->ptr->ip);
inf->ptr->return_value = Tcl_EvalObj(inf->ptr->ip, inf->cmd);
return Qnil;
@ -7721,6 +7728,98 @@ tcltklib_compile_info()
return ret;
}
/*###############################################*/
/*
* The following is based on tkMenu.[ch]
* of Tcl/Tk (>=8.0) source code.
*/
#if TCL_MAJOR_VERSION >= 8
#define MASTER_MENU 0
#define TEAROFF_MENU 1
#define MENUBAR 2
struct dummy_TkMenuEntry {
int type;
struct dummy_TkMenu *menuPtr;
/* , and etc. */
};
struct dummy_TkMenu {
Tk_Window tkwin;
Display *display;
Tcl_Interp *interp;
Tcl_Command widgetCmd;
struct dummy_TkMenuEntry **entries;
int numEntries;
int active;
int menuType; /* MASTER_MENU, TEAROFF_MENU, or MENUBAR */
Tcl_Obj *menuTypePtr;
/* , and etc. */
};
struct dummy_TkMenuRef {
struct dummy_TkMenu *menuPtr;
char *dummy1;
char *dummy2;
char *dummy3;
};
EXTERN struct dummy_TkMenuRef *TkFindMenuReferences(Tcl_Interp*, char*);
#endif
static VALUE
ip_make_menu_embeddable(interp, menu_path)
VALUE interp;
VALUE menu_path;
{
#if TCL_MAJOR_VERSION >= 8
struct tcltkip *ptr = get_ip(interp);
struct dummy_TkMenuRef *menuRefPtr;
StringValue(menu_path);
menuRefPtr = TkFindMenuReferences(ptr->ip, RSTRING(menu_path)->ptr);
if (menuRefPtr == (struct dummy_TkMenuRef *) NULL) {
rb_raise(rb_eArgError, "not a menu widget, or invalid widget path");
}
if (menuRefPtr->menuPtr == (struct dummy_TkMenu *) NULL) {
rb_raise(rb_eRuntimeError,
"invalid menu widget (maybe already destroyed)");
}
if ((menuRefPtr->menuPtr)->menuType != MENUBAR) {
rb_raise(rb_eRuntimeError,
"target menu widget must be a MENUBAR type");
}
(menuRefPtr->menuPtr)->menuType = TEAROFF_MENU;
#if 0 /* cause SEGV */
{
/* char *s = "tearoff"; */
char *s = "normal";
/* Tcl_SetStringObj((menuRefPtr->menuPtr)->menuTypePtr, s, strlen(s));*/
(menuRefPtr->menuPtr)->menuTypePtr = Tcl_NewStringObj(s, strlen(s));
/* (menuRefPtr->menuPtr)->menuType = TEAROFF_MENU; */
(menuRefPtr->menuPtr)->menuType = MASTER_MENU;
}
#endif
TkEventuallyRecomputeMenu(menuRefPtr->menuPtr);
TkEventuallyRedrawMenu(menuRefPtr->menuPtr,
(struct dummy_TkMenuEntry *)NULL);
#else /* TCL_MAJOR_VERSION <= 7 */
rb_notimplement();
#endif
return interp;
}
/*###############################################*/
/*---- initialization ----*/
void
@ -7918,6 +8017,10 @@ Init_tcltklib()
/* --------------------------------------------------------------- */
rb_define_method(ip, "_make_menu_embeddable", ip_make_menu_embeddable, 1);
/* --------------------------------------------------------------- */
rb_define_method(ip, "_split_tklist", ip_split_tklist, 1);
rb_define_method(ip, "_merge_tklist", lib_merge_tklist, -1);
rb_define_method(ip, "_conv_listelement", lib_conv_listelement, 1);