aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2005-07-19 09:06:47 +0000
committerJan Djärv2005-07-19 09:06:47 +0000
commit7537ab9c84a0e2b9eb3682500b32675ef2014739 (patch)
tree1a0341a62e9dc815ece8f145bb6e2fafbaa86e22
parent829b13e279369fbb7860f219592a591ef8287594 (diff)
downloademacs-7537ab9c84a0e2b9eb3682500b32675ef2014739.tar.gz
emacs-7537ab9c84a0e2b9eb3682500b32675ef2014739.zip
* lwlib-Xm.c (make_menu_in_widget): Disable drag and drop for
labels in menu bar.
-rw-r--r--lwlib/ChangeLog5
-rw-r--r--lwlib/lwlib-Xm.c6
2 files changed, 11 insertions, 0 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 17a92de5415..4ce570b989c 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,8 @@
12005-07-19 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * lwlib-Xm.c (make_menu_in_widget): Disable drag and drop for
4 labels in menu bar.
5
12005-07-04 Lute Kamstra <lute@gnu.org> 62005-07-04 Lute Kamstra <lute@gnu.org>
2 7
3 Update FSF's address in GPL notices. 8 Update FSF's address in GPL notices.
diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index 02a2f035aa3..27118d8ab92 100644
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -524,6 +524,10 @@ make_menu_in_widget (instance, widget, val, keep_first_children)
524 Widget* old_children; 524 Widget* old_children;
525 unsigned int old_num_children; 525 unsigned int old_num_children;
526 526
527 /* Disable drag and drop for labels in menu bar. */
528 static char overrideTrans[] = "<Btn2Down>: Noop()";
529 XtTranslations override = XtParseTranslationTable (overrideTrans);
530
527 old_children = XtCompositeChildren (widget, &old_num_children); 531 old_children = XtCompositeChildren (widget, &old_num_children);
528 532
529 /* Allocate the children array */ 533 /* Allocate the children array */
@@ -632,6 +636,8 @@ make_menu_in_widget (instance, widget, val, keep_first_children)
632 636
633 XtAddCallback (button, XmNcascadingCallback, xm_pull_down_callback, 637 XtAddCallback (button, XmNcascadingCallback, xm_pull_down_callback,
634 (XtPointer)instance); 638 (XtPointer)instance);
639 XtOverrideTranslations (button, override);
640
635 } 641 }
636 642
637 children[child_index] = button; 643 children[child_index] = button;