aboutsummaryrefslogtreecommitdiffstats
path: root/src/gtkutil.c
diff options
context:
space:
mode:
authorPaul Eggert2015-02-08 10:52:05 -0800
committerPaul Eggert2015-02-08 10:52:37 -0800
commit61320cc95ca14ec282bb73307e9006fb1d6e7e80 (patch)
treeae387f1722f9072ab01a38e3106deb247db5c82a /src/gtkutil.c
parentdd2aa937d68390755d0b042a81560211aa138406 (diff)
downloademacs-61320cc95ca14ec282bb73307e9006fb1d6e7e80.tar.gz
emacs-61320cc95ca14ec282bb73307e9006fb1d6e7e80.zip
Minor tweaks to frame_size_history_add
* frame.c (frame_size_history_add): Don't assume length fits in 'int'. Prefer XCAR and XCDR to Fcar and Fcdr when the arg is a cons. (Fframe_after_make_frame): Simplify. * gtkutil.c: Remove commented-out code. * xfns.c (Fx_create_frame): Fix indenting.
Diffstat (limited to 'src/gtkutil.c')
-rw-r--r--src/gtkutil.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 063e88262d9..6f1707894c1 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -50,12 +50,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
50#include "emacsgtkfixed.h" 50#include "emacsgtkfixed.h"
51#endif 51#endif
52 52
53/** #define FRAME_TOTAL_PIXEL_HEIGHT(f) \ **/
54/** (FRAME_PIXEL_HEIGHT (f) + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f)) **/
55
56/** #define FRAME_TOTAL_PIXEL_WIDTH(f) \ **/
57/** (FRAME_PIXEL_WIDTH (f) + FRAME_TOOLBAR_WIDTH (f)) **/
58
59#ifndef HAVE_GTK_WIDGET_SET_HAS_WINDOW 53#ifndef HAVE_GTK_WIDGET_SET_HAS_WINDOW
60#define gtk_widget_set_has_window(w, b) \ 54#define gtk_widget_set_has_window(w, b) \
61 (gtk_fixed_set_has_window (GTK_FIXED (w), b)) 55 (gtk_fixed_set_has_window (GTK_FIXED (w), b))
@@ -903,9 +897,6 @@ xg_frame_resized (struct frame *f, int pixelwidth, int pixelheight)
903 || pixelwidth != FRAME_PIXEL_WIDTH (f) 897 || pixelwidth != FRAME_PIXEL_WIDTH (f)
904 || pixelheight != FRAME_PIXEL_HEIGHT (f)) 898 || pixelheight != FRAME_PIXEL_HEIGHT (f))
905 { 899 {
906/** FRAME_PIXEL_WIDTH (f) = pixelwidth; **/
907/** FRAME_PIXEL_HEIGHT (f) = pixelheight; **/
908
909 xg_clear_under_internal_border (f); 900 xg_clear_under_internal_border (f);
910 change_frame_size (f, width, height, 0, 1, 0, 1); 901 change_frame_size (f, width, height, 0, 1, 0, 1);
911 SET_FRAME_GARBAGED (f); 902 SET_FRAME_GARBAGED (f);