Mercurial > emacs
comparison src/xfns.c @ 112295:2108d829c749
* xfns.c (x_real_positions): Fix signedness of local var 'ign'.
XGetGeometry wants unsigned int *, not int *, for its last 4 args,
so change the type of 'ign' to unsigned int from int.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Sun, 16 Jan 2011 23:45:28 -0800 |
parents | 61f7601898b1 |
children | 28ca83ef1128 |
comparison
equal
deleted
inserted
replaced
112294:e72732ba15db | 112295:2108d829c749 |
---|---|
627 &bytes_remaining, &tmp_data); | 627 &bytes_remaining, &tmp_data); |
628 | 628 |
629 if (rc == Success && actual_type == target_type && !x_had_errors_p (dpy) | 629 if (rc == Success && actual_type == target_type && !x_had_errors_p (dpy) |
630 && actual_size == 4 && actual_format == 32) | 630 && actual_size == 4 && actual_format == 32) |
631 { | 631 { |
632 int ign; | 632 unsigned int ign; |
633 Window rootw; | 633 Window rootw; |
634 long *fe = (long *)tmp_data; | 634 long *fe = (long *)tmp_data; |
635 | 635 |
636 XGetGeometry (FRAME_X_DISPLAY (f), win, | 636 XGetGeometry (FRAME_X_DISPLAY (f), win, |
637 &rootw, &real_x, &real_y, &ign, &ign, &ign, &ign); | 637 &rootw, &real_x, &real_y, &ign, &ign, &ign, &ign); |
757 && ! EQ (new_value, Qbottom) && ! EQ (new_value, Qtop)) | 757 && ! EQ (new_value, Qbottom) && ! EQ (new_value, Qtop)) |
758 return; | 758 return; |
759 if (EQ (new_value, old_value)) return; | 759 if (EQ (new_value, old_value)) return; |
760 | 760 |
761 #ifdef USE_GTK | 761 #ifdef USE_GTK |
762 if (xg_change_toolbar_position (f, new_value)) | 762 if (xg_change_toolbar_position (f, new_value)) |
763 f->tool_bar_position = new_value; | 763 f->tool_bar_position = new_value; |
764 #endif | 764 #endif |
765 } | 765 } |
766 | 766 |
767 #ifdef USE_GTK | 767 #ifdef USE_GTK |
3511 /* Must have been Qnil. */ | 3511 /* Must have been Qnil. */ |
3512 ; | 3512 ; |
3513 } | 3513 } |
3514 | 3514 |
3515 BLOCK_INPUT; | 3515 BLOCK_INPUT; |
3516 | 3516 |
3517 /* Set machine name and pid for the purpose of window managers. */ | 3517 /* Set machine name and pid for the purpose of window managers. */ |
3518 set_machine_and_pid_properties(f); | 3518 set_machine_and_pid_properties(f); |
3519 | 3519 |
3520 /* Set the WM leader property. GTK does this itself, so this is not | 3520 /* Set the WM leader property. GTK does this itself, so this is not |
3521 needed when using GTK. */ | 3521 needed when using GTK. */ |
5066 CHECK_NUMBER (dy); | 5066 CHECK_NUMBER (dy); |
5067 | 5067 |
5068 #ifdef USE_GTK | 5068 #ifdef USE_GTK |
5069 if (x_gtk_use_system_tooltips) | 5069 if (x_gtk_use_system_tooltips) |
5070 { | 5070 { |
5071 int ok; | 5071 int ok; |
5072 | 5072 |
5073 /* Hide a previous tip, if any. */ | 5073 /* Hide a previous tip, if any. */ |
5074 Fx_hide_tip (); | 5074 Fx_hide_tip (); |
5075 | 5075 |
5076 BLOCK_INPUT; | 5076 BLOCK_INPUT; |
6102 x_last_font_name = NULL; | 6102 x_last_font_name = NULL; |
6103 #endif | 6103 #endif |
6104 } | 6104 } |
6105 | 6105 |
6106 #endif /* HAVE_X_WINDOWS */ | 6106 #endif /* HAVE_X_WINDOWS */ |
6107 |