Drop FGET and revert read access to Lisp_Objects slots of struct frame.

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

diff --git a/src/window.h b/src/window.h
index b6a37e2..64b6c19 100644 (file)
--- a/src/window.h
+++ b/src/window.h
@@ -474,14 +474,14 @@ struct window
 /* 1 if W is a menu bar window.  */
 
 #define WINDOW_MENU_BAR_P(W) \
-  (WINDOWP (FGET (WINDOW_XFRAME (W), menu_bar_window)) \
-   && (W) == XWINDOW (FGET (WINDOW_XFRAME (W), menu_bar_window)))
+  (WINDOWP (WINDOW_XFRAME (W)->menu_bar_window) \
+   && (W) == XWINDOW (WINDOW_XFRAME (W)->menu_bar_window))
 
 /* 1 if W is a tool bar window.  */
 
 #define WINDOW_TOOL_BAR_P(W) \
-  (WINDOWP (FGET (WINDOW_XFRAME (W), tool_bar_window)) \
-   && (W) == XWINDOW (FGET (WINDOW_XFRAME (W), tool_bar_window)))
+  (WINDOWP (WINDOW_XFRAME (W)->tool_bar_window) \
+   && (W) == XWINDOW (WINDOW_XFRAME (W)->tool_bar_window))
 
 /* Return the frame y-position at which window W starts.
    This includes a header line, if any.  */