X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/32ccc8a5747ec380a9375251e1285264356b8866..16adf2e6eb1ddf0b32ebea2d5ce8fa1e4c226614:/src/widgetprv.h

diff --git a/src/widgetprv.h b/src/widgetprv.h
index ac845209ba..c0a5238743 100644
--- a/src/widgetprv.h
+++ b/src/widgetprv.h
@@ -1,13 +1,12 @@
 /* The emacs frame widget private header file.
-   Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001-2014 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Emacs 19 face widget ported by Fred Pierresteguy */
 
@@ -46,7 +43,7 @@ typedef struct {
   int		internal_border_width;	/* internal borders */
   int		interline;		/* skips between lines */
 
-  XFontStruct*	font;			/* font */
+  struct font*	font;			/* font */
   Pixel		foreground_pixel;	/* foreground */
 
   Pixel		cursor_color;		/* text cursor color */
@@ -73,11 +70,4 @@ typedef struct _EmacsFrameClassRec {	/* full class record declaration */
     EmacsFrameClassPart	emacs_frame_class;
 } EmacsFrameClassRec;
 
-extern EmacsFrameClassRec emacsFrameClassRec;	 /* class pointer */
-
-
-
 #endif /* _EmacsFrameP_h */
-
-/* arch-tag: 2b579b4c-f697-4f86-b27a-35b7cb1a4a1c
-   (do not change this comment) */