Munge comment associated w/ last change to describe intent; nfc.

[gnu-emacs] / src / macgui.h

diff --git a/src/macgui.h b/src/macgui.h
index 96fd54a603baa4ac4223c0357076dd051bd81a54..ca55bad7a8c07142b2b1bef18d8ad3d0daf76427 100644 (file)
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
@@ -32,7 +32,9 @@ typedef unsigned long Time;
 #ifdef HAVE_CARBON
 #undef Z
 #ifdef MAC_OSX
+#if ! HAVE_MKTIME || BROKEN_MKTIME
 #undef mktime
+#endif
 #undef DEBUG
 #undef free
 #undef malloc
@@ -43,8 +45,10 @@ typedef unsigned long Time;
 #undef min
 #undef init_process
 #include <Carbon/Carbon.h>
+#if ! HAVE_MKTIME || BROKEN_MKTIME
 #undef mktime
 #define mktime emacs_mktime
+#endif
 #undef free
 #define free unexec_free
 #undef malloc
@@ -101,12 +105,16 @@ typedef struct _XCharStruct
    (xcs).descent = (bds).bottom)
 
 struct MacFontStruct {
-  char *fontname;
+  char *full_name;
 
   short mac_fontnum;  /* font number of font used in this window */
   int mac_fontsize;  /* size of font */
   short mac_fontface;  /* plain, bold, italics, etc. */
+#if TARGET_API_MAC_CARBON
+  int mac_scriptcode;  /* Mac OS script code for font used */
+#else
   short mac_scriptcode;  /* Mac OS script code for font used */
+#endif
 
 #if 0
   SInt16 mFontNum;  /* font number of font used in this window */
@@ -172,15 +180,24 @@ typedef struct _XGCValues
   XFontStruct *font;
 } XGCValues;
 
-typedef XGCValues *GC;
+typedef struct _XGC
+{
+  /* Original value.  */
+  XGCValues xgcv;
 
-extern XGCValues *
-XCreateGC (void *, Window, unsigned long, XGCValues *);
+  /* Cached data members follow.  */
 
-#define GCForeground 0x01
-#define GCBackground 0x02
-#define GCFont 0x03
-#define GCGraphicsExposures 0
+  /* QuickDraw foreground color.  */
+  RGBColor fore_color;
+
+  /* QuickDraw background color.  */
+  RGBColor back_color;
+} *GC;
+
+#define GCForeground            (1L<<2)
+#define GCBackground            (1L<<3)
+#define GCFont                         (1L<<14)
+#define GCGraphicsExposures    0
 
 /* Bit Gravity */
 
@@ -240,8 +257,6 @@ typedef struct {
 #define PBaseSize      (1L << 8) /* program specified base for incrementing */
 #define PWinGravity    (1L << 9) /* program specified window gravity */
 
-extern int XParseGeometry ();
-
 typedef struct {
     int x, y;
     unsigned width, height;