aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2015-04-19 10:10:47 -0700
committerPaul Eggert2015-04-19 10:11:21 -0700
commite5bd39b2b4542c0fa87acfe464ef344364540dd9 (patch)
tree0642d5abee366191dc2b69c049fa18f9d9c0ae32 /src
parent4155619aacae2a225cec7ba9008f15258d30a7e0 (diff)
downloademacs-e5bd39b2b4542c0fa87acfe464ef344364540dd9.tar.gz
emacs-e5bd39b2b4542c0fa87acfe464ef344364540dd9.zip
* src/widget.c (set_frame_size): Prefer 'int' to 'unsigned'
where either will do.
Diffstat (limited to 'src')
-rw-r--r--src/widget.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/widget.c b/src/widget.c
index c45193f17f5..0986ba61dbf 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -268,8 +268,8 @@ set_frame_size (EmacsFrame ew)
268 */ 268 */
269 269
270 /* Hairily merged geometry */ 270 /* Hairily merged geometry */
271 unsigned int w = FRAME_COLS (ew->emacs_frame.frame); 271 int w = FRAME_COLS (ew->emacs_frame.frame);
272 unsigned int h = FRAME_LINES (ew->emacs_frame.frame); 272 int h = FRAME_LINES (ew->emacs_frame.frame);
273 273
274 Widget wmshell = get_wm_shell ((Widget) ew); 274 Widget wmshell = get_wm_shell ((Widget) ew);
275 /* Each Emacs shell is now independent and top-level. */ 275 /* Each Emacs shell is now independent and top-level. */
@@ -434,7 +434,7 @@ set_frame_size (EmacsFrame ew)
434static void 434static void
435update_wm_hints (EmacsFrame ew) 435update_wm_hints (EmacsFrame ew)
436{ 436{
437 Widget wmshell = get_wm_shell ((Widget)ew); 437 Widget wmshell = get_wm_shell ((Widget) ew);
438 int cw; 438 int cw;
439 int ch; 439 int ch;
440 Dimension rounded_width; 440 Dimension rounded_width;
@@ -477,7 +477,7 @@ update_wm_hints (EmacsFrame ew)
477void 477void
478widget_update_wm_size_hints (Widget widget) 478widget_update_wm_size_hints (Widget widget)
479{ 479{
480 EmacsFrame ew = (EmacsFrame)widget; 480 EmacsFrame ew = (EmacsFrame) widget;
481 update_wm_hints (ew); 481 update_wm_hints (ew);
482} 482}
483 483
@@ -516,7 +516,7 @@ update_from_various_frame_slots (EmacsFrame ew)
516static void 516static void
517EmacsFrameInitialize (Widget request, Widget new, ArgList dum1, Cardinal *dum2) 517EmacsFrameInitialize (Widget request, Widget new, ArgList dum1, Cardinal *dum2)
518{ 518{
519 EmacsFrame ew = (EmacsFrame)new; 519 EmacsFrame ew = (EmacsFrame) new;
520 520
521 if (!ew->emacs_frame.frame) 521 if (!ew->emacs_frame.frame)
522 { 522 {
@@ -542,7 +542,7 @@ resize_cb (Widget widget,
542static void 542static void
543EmacsFrameRealize (Widget widget, XtValueMask *mask, XSetWindowAttributes *attrs) 543EmacsFrameRealize (Widget widget, XtValueMask *mask, XSetWindowAttributes *attrs)
544{ 544{
545 EmacsFrame ew = (EmacsFrame)widget; 545 EmacsFrame ew = (EmacsFrame) widget;
546 546
547 /* This used to contain SubstructureRedirectMask, but this turns out 547 /* This used to contain SubstructureRedirectMask, but this turns out
548 to be a problem with XIM on Solaris, and events from that mask 548 to be a problem with XIM on Solaris, and events from that mask
@@ -551,7 +551,7 @@ EmacsFrameRealize (Widget widget, XtValueMask *mask, XSetWindowAttributes *attrs
551 | PropertyChangeMask 551 | PropertyChangeMask
552 | SubstructureNotifyMask); 552 | SubstructureNotifyMask);
553 *mask |= CWEventMask; 553 *mask |= CWEventMask;
554 XtCreateWindow (widget, InputOutput, (Visual *)CopyFromParent, *mask, 554 XtCreateWindow (widget, InputOutput, (Visual *) CopyFromParent, *mask,
555 attrs); 555 attrs);
556 /* Some ConfigureNotify events does not end up in EmacsFrameResize so 556 /* Some ConfigureNotify events does not end up in EmacsFrameResize so
557 make sure we get them all. Seen with xfcwm4 for example. */ 557 make sure we get them all. Seen with xfcwm4 for example. */
@@ -568,7 +568,7 @@ EmacsFrameDestroy (Widget widget)
568static void 568static void
569EmacsFrameResize (Widget widget) 569EmacsFrameResize (Widget widget)
570{ 570{
571 EmacsFrame ew = (EmacsFrame)widget; 571 EmacsFrame ew = (EmacsFrame) widget;
572 struct frame *f = ew->emacs_frame.frame; 572 struct frame *f = ew->emacs_frame.frame;
573 int width, height; 573 int width, height;
574 574
@@ -589,7 +589,7 @@ EmacsFrameResize (Widget widget)
589static XtGeometryResult 589static XtGeometryResult
590EmacsFrameQueryGeometry (Widget widget, XtWidgetGeometry *request, XtWidgetGeometry *result) 590EmacsFrameQueryGeometry (Widget widget, XtWidgetGeometry *request, XtWidgetGeometry *result)
591{ 591{
592 EmacsFrame ew = (EmacsFrame)widget; 592 EmacsFrame ew = (EmacsFrame) widget;
593 593
594 int mask = request->request_mode; 594 int mask = request->request_mode;
595 Dimension ok_width, ok_height; 595 Dimension ok_width, ok_height;