merge trunk

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

diff --git a/src/widget.h b/src/widget.h
index ad786ae..2903666 100644 (file)
--- a/src/widget.h
+++ b/src/widget.h
@@ -1,12 +1,12 @@
 /* The emacs frame widget public header file.
-   Copyright (C) 1993 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
@@ -14,8 +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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Emacs 19 face widget ported by Fred Pierresteguy */
 
@@ -71,6 +70,15 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #ifndef XtCGeometry
 #define XtCGeometry "Geometry"
 #endif
+#ifndef XtNshowGrip
+#define XtNshowGrip "showGrip"
+#endif
+#ifndef XtNallowResize
+#define XtNallowResize "allowResize"
+#endif
+#ifndef XtNresizeToPreferred
+#define XtNresizeToPreferred "resizeToPreferred"
+#endif
 
 #define XtNinitialGeometry "initialGeometry"
 #define XtCInitialGeometry "InitialGeometry"
@@ -84,7 +92,9 @@ extern WidgetClass emacsFrameClass;
 
 extern struct _DisplayContext* display_context;
 
-/* Special entrypoints */
-void EmacsFrameSetCharSize ();
+/* Special entry points */
+void EmacsFrameSetCharSize (Widget, int, int);
+void widget_store_internal_border (Widget widget);
+void widget_update_wm_size_hints (Widget widget);
 
 #endif /* _EmacsFrame_h */