From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Wed, 16 Mar 2005 03:29:57 +0000 (+0000)
Subject: (struct mac_output) [TARGET_API_MAC_CARBON]: New member
X-Git-Tag: ttn-vms-21-2-B4~1789
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ee292cd47f72cdc797dcc5730fe970fdad2bb309;p=emacs.git

(struct mac_output) [TARGET_API_MAC_CARBON]: New member
hourglass_control.
(HOURGLASS_WIDTH, HOURGLASS_HEIGHT): New defines.
(activate_scroll_bars, deactivate_scroll_bars): Remove declarations.
---

diff --git a/src/macterm.h b/src/macterm.h
index 27cd1f49646..dd2e2652c90 100644
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -355,6 +355,12 @@ struct mac_output {
 
 #endif
 
+#if TARGET_API_MAC_CARBON
+  /* The Mac control reference for the hourglass (progress indicator)
+     shown at the upper-right corner of the window.  */
+  ControlRef hourglass_control;
+#endif
+
 #if 0
   DWORD dwStyle;
 #endif
@@ -573,6 +579,10 @@ struct scroll_bar {
    text from glomming up against the scroll bar */
 #define VERTICAL_SCROLL_BAR_WIDTH_TRIM (0)
 
+/* Size of hourglass controls */
+#define HOURGLASS_WIDTH 16
+#define HOURGLASS_HEIGHT 16
+
 struct frame;
 struct face;
 struct image;
@@ -586,9 +596,6 @@ EXFUN (Fx_display_grayscale_p, 1);
 EXFUN (Fx_display_planes, 1);
 extern void x_free_gcs P_ ((struct frame *));
 
-void activate_scroll_bars (FRAME_PTR);
-void deactivate_scroll_bars (FRAME_PTR);
-
 /* Defined in macterm.c.  */
 
 extern void x_set_window_size P_ ((struct frame *, int, int, int));