(cvs-parse-run-table): Remove misleading text.

[bpt/emacs.git] / src / frame.h

diff --git a/src/frame.h b/src/frame.h
index f74a70e..5a8e660 100644 (file)
--- a/src/frame.h
+++ b/src/frame.h
@@ -1,10 +1,5 @@
-/* Don't multiply include: dispextern.h includes macterm.h which includes frame.h 
-   some emacs source includes both dispextern.h and frame.h */
-#ifndef _XFRAME_H_
-#define _XFRAME_H_
-
 /* Define frame-object for GNU Emacs.
-   Copyright (C) 1993, 1994, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1999, 2000, 2001 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -23,6 +18,13 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+/* Don't multiply include: dispextern.h includes macterm.h which
+   includes frame.h some emacs source includes both dispextern.h and
+   frame.h */
+
+#ifndef EMACS_FRAME_H
+#define EMACS_FRAME_H
+
 \f
 /* Miscellanea.  */
 
@@ -45,7 +47,6 @@ enum output_method
   output_x_window,
   output_msdos_raw,
   output_w32,
-  output_w32_console,
   output_mac
 };
 
@@ -390,7 +391,6 @@ typedef struct frame *FRAME_PTR;
 #define FRAME_TERMCAP_P(f) ((f)->output_method == output_termcap)
 #define FRAME_X_P(f) ((f)->output_method == output_x_window)
 #define FRAME_W32_P(f) ((f)->output_method == output_w32)
-#define FRAME_W32_CONSOLE_P(f) ((f)->output_method == output_w32_console)
 #define FRAME_MSDOS_P(f) ((f)->output_method == output_msdos_raw)
 #define FRAME_MAC_P(f) ((f)->output_method == output_mac)
 
@@ -518,11 +518,21 @@ typedef struct frame *FRAME_PTR;
 #define FRAME_SCROLL_BAR_COLS(f) ((f)->scroll_bar_cols)
 
 /* Width of a scroll bar in frame F, measured in columns (characters),
-   but only if scroll bars are on the left.
-   If scroll bars are on the right in this frame, it is 0.  */
-#define FRAME_LEFT_SCROLL_BAR_WIDTH(f) \
-     (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f) \
-      ? FRAME_SCROLL_BAR_COLS (f) \
+   but only if scroll bars are on the left.  If scroll bars are on
+   the right in this frame, or there are no scroll bars, value is 0.  */
+
+#define FRAME_LEFT_SCROLL_BAR_WIDTH(f)                 \
+     (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f)       \
+      ? FRAME_SCROLL_BAR_COLS (f)                      \
+      : 0)
+
+/* Width of a scroll bar in frame F, measured in columns (characters),
+   but only if scroll bars are on the right.  If scroll bars are on
+   the left in this frame, or there are no scroll bars, value is 0.  */
+
+#define FRAME_RIGHT_SCROLL_BAR_WIDTH(f)                        \
+     (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f)      \
+      ? FRAME_SCROLL_BAR_COLS (f)                      \
       : 0)
 
 /* Width of a scroll bar in frame F, measured in columns (characters).  */
@@ -773,4 +783,4 @@ extern Lisp_Object selected_frame;
       ? make_float ((double) (Y) / CANON_Y_UNIT (F))   \
       : make_number ((Y) / CANON_Y_UNIT (F)))  
                             
-#endif /* not defined _FRAME_H_ */
+#endif /* not EMACS_FRAME_H */