diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2013-11-30 17:25:51 +0100 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2013-11-30 17:25:51 +0100 |
| commit | 90caab3fe722c43bfcf299d82c7aca3b60c24633 (patch) | |
| tree | 3c01222da6e554e0502a8f17491ab89a04964d9a /src/xdisp.c | |
| parent | 6ae87264fd7d9ce6614e7048bc57a431d480098a (diff) | |
Remove some unused items introduced during pixelwise change.
* window.c (window_resize_total_check): Remove unused function.
* xdisp.c (remember_mouse_glyph): Remove unused label.
(Ftool_bar_height): Move declaration inside #if.
* xterm.c (x_set_window_size): Don't use r and c.
Diffstat (limited to 'src/xdisp.c')
| -rw-r--r-- | src/xdisp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index e45a99d29d..35db8a0d8a 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -2484,7 +2484,6 @@ remember_mouse_glyph (struct frame *f, int gx, int gy, NativeRectangle *rect) goto store_rect; } - pixelwise: gx += WINDOW_LEFT_EDGE_X (w); gy += WINDOW_TOP_EDGE_Y (w); @@ -12108,10 +12107,11 @@ If FRAME is nil or omitted, use the selected frame. Optional argument PIXELWISE non-nil means return the height of the tool bar inpixels. */) (Lisp_Object frame, Lisp_Object pixelwise) { - struct frame *f = decode_any_frame (frame); int height = 0; #if ! defined (USE_GTK) && ! defined (HAVE_NS) + struct frame *f = decode_any_frame (frame); + if (WINDOWP (f->tool_bar_window) && WINDOW_PIXEL_HEIGHT (XWINDOW (f->tool_bar_window)) > 0) { |