Drop unnecessary functions that deals with frame pixel size.

* frame.h, msdos.h, w32term.h, xterm.h (x_pixel_width)
(x_pixel_height): Drop prototypes.
* msdos.c, nsfns.m, w32fns.c, xfns.c (x_pixel_width)
(x_pixel_height): Drop implementations.
* frame.c (Fframe_pixel_height): Use FRAME_PIXEL_HEIGHT
which should be always valid for window frame.
(Frame_pixel_width): Likewise with FRAME_PIXEL_WIDTH.
* w32menu.c (Fx_popup_dialog):
* xmenu.c (Fx_popup_dialog): Likewise for both.

12 files changed, 19 insertions, 67 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1c4880e3356..76ef664ccd0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,18 @@
 2013-07-31  Dmitry Antipov  <dmantipov@yandex.ru>
 
+        Drop unnecessary functions that deals with frame pixel size.
+        * frame.h, msdos.h, w32term.h, xterm.h (x_pixel_width)
+        (x_pixel_height): Drop prototypes.
+        * msdos.c, nsfns.m, w32fns.c, xfns.c (x_pixel_width)
+        (x_pixel_height): Drop implementations.
+        * frame.c (Fframe_pixel_height): Use FRAME_PIXEL_HEIGHT
+        which should be always valid for window frame.
+        (Frame_pixel_width): Likewise with FRAME_PIXEL_WIDTH.
+        * w32menu.c (Fx_popup_dialog):
+        * xmenu.c (Fx_popup_dialog): Likewise for both.
+
+2013-07-31  Dmitry Antipov  <dmantipov@yandex.ru>
+
         * frame.c (Fmake_terminal_frame): Use store_in_alist to setup
         frame parameters and call to Fmodify_frame_parameters just once.
         (Fset_frame_height, Fset_frame_width): Mention nil frame in docstring.
diff --git a/src/frame.c b/src/frame.c
index 271d99904c3..6e56a20f850 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2361,7 +2361,7 @@ to `frame-height'). */)
 
 #ifdef HAVE_WINDOW_SYSTEM
   if (FRAME_WINDOW_P (f))
-    return make_number (x_pixel_height (f));
+    return make_number (FRAME_PIXEL_HEIGHT (f));
   else
 #endif
     return make_number (FRAME_LINES (f));
@@ -2378,7 +2378,7 @@ If FRAME is omitted or nil, the selected frame is used.  */)
 
 #ifdef HAVE_WINDOW_SYSTEM
   if (FRAME_WINDOW_P (f))
-    return make_number (x_pixel_width (f));
+    return make_number (FRAME_PIXEL_WIDTH (f));
   else
 #endif
     return make_number (FRAME_COLS (f));
diff --git a/src/frame.h b/src/frame.h
index 2e544770094..98cf54c13a4 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -1264,8 +1264,6 @@ extern void x_set_mouse_pixel_position (struct frame *f, int pix_x, int pix_y);
 extern void x_make_frame_visible (struct frame *f);
 extern void x_make_frame_invisible (struct frame *f);
 extern void x_iconify_frame (struct frame *f);
-extern int x_pixel_width (struct frame *f);
-extern int x_pixel_height (struct frame *f);
 extern void x_set_frame_alpha (struct frame *f);
 extern void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
 extern void x_set_tool_bar_lines (struct frame *f,
diff --git a/src/msdos.c b/src/msdos.c
index a2bcc06ac17..16308d06c85 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -3320,18 +3320,6 @@ XMenuDestroy (Display *foo, XMenu *menu)
   xfree (menu);
   menu_help_message = prev_menu_help_message = NULL;
 }
-
-int
-x_pixel_width (struct frame *f)
-{
-  return FRAME_COLS (f);
-}
-
-int
-x_pixel_height (struct frame *f)
-{
-  return FRAME_LINES (f);
-}
 #endif /* !HAVE_X_WINDOWS */
 
 /* ----------------------- DOS / UNIX conversion --------------------- */
diff --git a/src/msdos.h b/src/msdos.h
index ee0d49464ae..6a6fe349131 100644
--- a/src/msdos.h
+++ b/src/msdos.h
@@ -74,8 +74,6 @@ struct window;
 /* Defined in xfns.c; emulated on msdos.c */
 
 extern void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
-extern int x_pixel_width (struct frame *);
-extern int x_pixel_height (struct frame *);
 
 #define XFreeGC (void)
 #define x_destroy_bitmap(p1,p2)
diff --git a/src/nsfns.m b/src/nsfns.m
index 71f971a9f5b..3a4d95360c4 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -2231,21 +2231,6 @@ x_get_focus_frame (struct frame *frame)
   return nsfocus;
 }
 
-
-int
-x_pixel_width (struct frame *f)
-{
-  return FRAME_PIXEL_WIDTH (f);
-}
-
-
-int
-x_pixel_height (struct frame *f)
-{
-  return FRAME_PIXEL_HEIGHT (f);
-}
-
-
 void
 x_sync (struct frame *f)
 {
diff --git a/src/w32fns.c b/src/w32fns.c
index 2b06936d119..e46608f9d72 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5139,19 +5139,6 @@ SOUND is nil to use the normal beep.  */)
   return sound;
 }
 
-
-int
-x_pixel_width (register struct frame *f)
-{
-  return FRAME_PIXEL_WIDTH (f);
-}
-
-int
-x_pixel_height (register struct frame *f)
-{
-  return FRAME_PIXEL_HEIGHT (f);
-}
-
 int
 x_screen_planes (register struct frame *f)
 {
diff --git a/src/w32menu.c b/src/w32menu.c
index 346402b7c6b..aa13f26383f 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -206,8 +206,8 @@ otherwise it is "Question". */)
            in the middle of frame F.  */
         Lisp_Object x, y, frame, newpos;
         XSETFRAME (frame, f);
-        XSETINT (x, x_pixel_width (f) / 2);
-        XSETINT (y, x_pixel_height (f) / 2);
+        XSETINT (x, FRAME_PIXEL_WIDTH (f) / 2);
+        XSETINT (y, FRAME_PIXEL_HEIGHT (f) / 2);
         newpos = Fcons (Fcons (x, Fcons (y, Qnil)), Fcons (frame, Qnil));
         return Fx_popup_menu (newpos,
                               Fcons (Fcar (contents), Fcons (contents, Qnil)));
diff --git a/src/w32term.h b/src/w32term.h
index ace58758302..032047a2751 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -218,8 +218,6 @@ extern void x_set_mouse_pixel_position (struct frame *f, int pix_x, int pix_y);
 extern void x_make_frame_visible (struct frame *f);
 extern void x_make_frame_invisible (struct frame *f);
 extern void x_iconify_frame (struct frame *f);
-extern int x_pixel_width (struct frame *f);
-extern int x_pixel_height (struct frame *f);
 extern void x_set_frame_alpha (struct frame *f);
 extern void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
 extern void x_set_tool_bar_lines (struct frame *f,
diff --git a/src/xfns.c b/src/xfns.c
index a4492a10fdb..e86f71fb711 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4325,19 +4325,6 @@ Internal use only, use `display-monitor-attributes-list' instead.  */)
   return attributes_list;
 }
 
-
-int
-x_pixel_width (register struct frame *f)
-{
-  return FRAME_PIXEL_WIDTH (f);
-}
-
-int
-x_pixel_height (register struct frame *f)
-{
-  return FRAME_PIXEL_HEIGHT (f);
-}
-
 /************************************************************************
                               X Displays
  ************************************************************************/
diff --git a/src/xmenu.c b/src/xmenu.c
index 5cc37842da9..1292e264ffb 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -294,8 +294,8 @@ for instance using the window manager, then this produces a quit and
   {
     Lisp_Object x, y, frame, newpos;
     XSETFRAME (frame, f);
-    XSETINT (x, x_pixel_width (f) / 2);
-    XSETINT (y, x_pixel_height (f) / 2);
+    XSETINT (x, FRAME_PIXEL_WIDTH (f) / 2);
+    XSETINT (y, FRAME_PIXEL_HEIGHT (f) / 2);
     newpos = list2 (list2 (x, y), frame);
 
     return Fx_popup_menu (newpos,
diff --git a/src/xterm.h b/src/xterm.h
index 6bdc708220b..311b32c7930 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -1031,8 +1031,6 @@ extern void destroy_frame_xic (struct frame *);
 extern void xic_set_preeditarea (struct window *, int, int);
 extern void xic_set_statusarea (struct frame *);
 extern void xic_set_xfontset (struct frame *, const char *);
-extern int x_pixel_width (struct frame *);
-extern int x_pixel_height (struct frame *);
 extern bool x_defined_color (struct frame *, const char *, XColor *, bool);
 #ifdef HAVE_X_I18N
 extern void free_frame_xic (struct frame *);