aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Reilly1994-09-24 00:12:06 +0000
committerPaul Reilly1994-09-24 00:12:06 +0000
commit2289f3f4df60bc58c2a9a919ea4a73019cfa8164 (patch)
tree0237729d9939d9585ec4aa7f9f5f58ed8b385af3
parentaea9f59e1c92e9d3b0e7879f294eb2c3c3a0ded8 (diff)
downloademacs-2289f3f4df60bc58c2a9a919ea4a73019cfa8164.tar.gz
emacs-2289f3f4df60bc58c2a9a919ea4a73019cfa8164.zip
*** empty log message ***
-rw-r--r--lwlib/xlwmenu.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index 7b7c3b3adbf..0df7a477bdd 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14GNU General Public License for more details. 14GNU General Public License for more details.
15 15
16You should have received a copy of the GNU General Public License 16You should have received a copy of the GNU General Public License
17along with GNU Emacs; see the file COPYING. If not, write to 17Alongalong with GNU Emacs; see the file COPYING. If not, write to
18the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ 18the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
19 19
20/* Created by devin@lucid.com */ 20/* Created by devin@lucid.com */
@@ -24,6 +24,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
24#include <sys/types.h> 24#include <sys/types.h>
25#include <X11/Xos.h> 25#include <X11/Xos.h>
26#include <X11/IntrinsicP.h> 26#include <X11/IntrinsicP.h>
27#include <X11/ObjectP.h>
27#include <X11/StringDefs.h> 28#include <X11/StringDefs.h>
28#include <X11/cursorfont.h> 29#include <X11/cursorfont.h>
29#include <X11/bitmaps/gray> 30#include <X11/bitmaps/gray>
@@ -1383,8 +1384,8 @@ Select (w, ev, params, num_params)
1383 { 1384 {
1384 mw->menu.popped_up = False; 1385 mw->menu.popped_up = False;
1385 XtUngrabPointer ((Widget)mw, ev->xmotion.time); 1386 XtUngrabPointer ((Widget)mw, ev->xmotion.time);
1386 if (XtIsShell (XtParent (mw))) 1387 if (XtIsShell (XtParent ((Widget) mw)))
1387 XtPopdown (XtParent (mw)); 1388 XtPopdown (XtParent ((Widget) mw));
1388 else 1389 else
1389 { 1390 {
1390 XtRemoveGrab ((Widget) mw); 1391 XtRemoveGrab ((Widget) mw);
@@ -1414,7 +1415,7 @@ pop_up_menu (mw, event)
1414 1415
1415 XtCallCallbackList ((Widget)mw, mw->menu.open, NULL); 1416 XtCallCallbackList ((Widget)mw, mw->menu.open, NULL);
1416 1417
1417 if (XtIsShell (XtParent (mw))) 1418 if (XtIsShell (XtParent ((Widget)mw)))
1418 size_menu (mw, 0); 1419 size_menu (mw, 0);
1419 1420
1420 w = mw->menu.windows [0].width; 1421 w = mw->menu.windows [0].width;
@@ -1432,11 +1433,11 @@ pop_up_menu (mw, event)
1432 y = HeightOfScreen (screen) - h - 2 * borderwidth; 1433 y = HeightOfScreen (screen) - h - 2 * borderwidth;
1433 1434
1434 mw->menu.popped_up = True; 1435 mw->menu.popped_up = True;
1435 if (XtIsShell (XtParent (mw))) 1436 if (XtIsShell (XtParent ((Widget)mw)))
1436 { 1437 {
1437 XtConfigureWidget (XtParent (mw), x, y, w, h, 1438 XtConfigureWidget (XtParent ((Widget)mw), x, y, w, h,
1438 XtParent (mw)->core.border_width); 1439 XtParent ((Widget)mw)->core.border_width);
1439 XtPopup (XtParent (mw), XtGrabExclusive); 1440 XtPopup (XtParent ((Widget)mw), XtGrabExclusive);
1440 display_menu (mw, 0, False, NULL, NULL, NULL, NULL, NULL); 1441 display_menu (mw, 0, False, NULL, NULL, NULL, NULL, NULL);
1441 mw->menu.windows [0].x = x + borderwidth; 1442 mw->menu.windows [0].x = x + borderwidth;
1442 mw->menu.windows [0].y = y + borderwidth; 1443 mw->menu.windows [0].y = y + borderwidth;