comparison src/menubar-x.c @ 4533:4a7c4ccac2fe

Merge.
author Aidan Kehoe <kehoea@parhasard.net>
date Mon, 22 Dec 2008 12:05:47 +0000
parents 726060ee587c
children 19a72041c5ed
comparison
equal deleted inserted replaced
4527:8418d1ad4944 4533:4a7c4ccac2fe
688 shellx = shelly = 0; 688 shellx = shelly = 0;
689 #ifndef HAVE_WMCOMMAND 689 #ifndef HAVE_WMCOMMAND
690 { 690 {
691 Widget shell = XtParent (daddy); 691 Widget shell = XtParent (daddy);
692 692
693 XtSetArg (al [0], XtNx, &shellx); 693 Xt_SET_ARG (al [0], XtNx, &shellx);
694 XtSetArg (al [1], XtNy, &shelly); 694 Xt_SET_ARG (al [1], XtNy, &shelly);
695 XtGetValues (shell, al, 2); 695 XtGetValues (shell, al, 2);
696 } 696 }
697 #endif 697 #endif
698 XtSetArg (al [0], XtNx, &framex); 698 Xt_SET_ARG (al [0], XtNx, &framex);
699 XtSetArg (al [1], XtNy, &framey); 699 Xt_SET_ARG (al [1], XtNy, &framey);
700 XtGetValues (daddy, al, 2); 700 XtGetValues (daddy, al, 2);
701 btn->x_root = shellx + framex + btn->x; 701 btn->x_root = shellx + framex + btn->x;
702 btn->y_root = shelly + framey + btn->y; 702 btn->y_root = shelly + framey + btn->y;
703 btn->state = ButtonPressMask; /* all buttons pressed */ 703 btn->state = ButtonPressMask; /* all buttons pressed */
704 } 704 }