HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
declare smobs in alloc.c
[bpt/emacs.git]
/
lwlib
/
xlwmenuP.h
diff --git
a/lwlib/xlwmenuP.h
b/lwlib/xlwmenuP.h
index
1c2a8e8
..
63789e8
100644
(file)
--- a/
lwlib/xlwmenuP.h
+++ b/
lwlib/xlwmenuP.h
@@
-1,7
+1,7
@@
/* Internals of a lightweight menubar widget.
/* Internals of a lightweight menubar widget.
+
+Copyright (C) 2002-2014 Free Software Foundation, Inc.
Copyright (C) 1992 Lucid, Inc.
Copyright (C) 1992 Lucid, Inc.
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
- Free Software Foundation, Inc.
This file is part of the Lucid Widget Library.
This file is part of the Lucid Widget Library.
@@
-16,9
+16,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
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/>. */
#ifndef _XlwMenuP_h
#define _XlwMenuP_h
#ifndef _XlwMenuP_h
#define _XlwMenuP_h
@@
-59,11
+57,11
@@
typedef struct _XlwMenu_part
XFontSetExtents *font_extents;
#endif
#ifdef HAVE_XFT
XFontSetExtents *font_extents;
#endif
#ifdef HAVE_XFT
- String faceName;
int default_face;
XftFont* xft_font;
XftColor xft_fg, xft_bg, xft_disabled_fg;
#endif
int default_face;
XftFont* xft_font;
XftColor xft_fg, xft_bg, xft_disabled_fg;
#endif
+ String fontName;
XFontStruct* font;
Pixel foreground;
Pixel disabled_foreground;
XFontStruct* font;
Pixel foreground;
Pixel disabled_foreground;
@@
-85,8
+83,8
@@
typedef struct _XlwMenu_part
int horizontal;
/* True means top_shadow_color and/or bottom_shadow_color must be freed. */
int horizontal;
/* True means top_shadow_color and/or bottom_shadow_color must be freed. */
-
unsigned
free_top_shadow_color_p : 1;
-
unsigned
free_bottom_shadow_color_p : 1;
+
bool_bf
free_top_shadow_color_p : 1;
+
bool_bf
free_bottom_shadow_color_p : 1;
/* State of the XlwMenu */
int top_depth;
/* State of the XlwMenu */
int top_depth;
@@
-141,6
+139,3
@@
typedef struct _XlwMenuClassRec
extern XlwMenuClassRec xlwMenuClassRec;
#endif /* _XlwMenuP_h */
extern XlwMenuClassRec xlwMenuClassRec;
#endif /* _XlwMenuP_h */
-
-/* arch-tag: 18d7fc41-ffa0-47a3-a49f-3469900c7a25
- (do not change this comment) */