HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(fontset_find_font): Check if rfont_def is Qnil or not.
[bpt/emacs.git]
/
src
/
nsgui.h
diff --git
a/src/nsgui.h
b/src/nsgui.h
index
90dbef6
..
9bf6be6
100644
(file)
--- a/
src/nsgui.h
+++ b/
src/nsgui.h
@@
-1,5
+1,5
@@
/* Definitions and headers for communication on the NeXT/Open/GNUstep API.
/* Definitions and headers for communication on the NeXT/Open/GNUstep API.
- Copyright (C) 1995, 2005, 2008 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2005, 2008
, 2009
Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-30,16
+30,8
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#undef init_process
#endif /* NS_IMPL_COCOA */
#undef init_process
#endif /* NS_IMPL_COCOA */
-#ifdef NS_IMPL_GNUSTEP
-#undef hash_remove
-#endif
-
#import <AppKit/AppKit.h>
#import <AppKit/AppKit.h>
-#ifdef NS_IMPL_GNUSTEP
-#define hash_remove emacs_hash_remove
-#endif
-
#ifdef NS_IMPL_COCOA
#undef Cursor
#define init_process emacs_init_process
#ifdef NS_IMPL_COCOA
#undef Cursor
#define init_process emacs_init_process
@@
-68,7
+60,7
@@
typedef struct _XCharStruct
int descent;
} XCharStruct;
int descent;
} XCharStruct;
-/*
23:
Fake tructure from Xlib.h to represent two-byte characters. */
+/* Fake tructure from Xlib.h to represent two-byte characters. */
#ifndef __OBJC__
typedef unsigned short unichar;
#endif
#ifndef __OBJC__
typedef unsigned short unichar;
#endif
@@
-83,20
+75,16
@@
typedef unichar XChar2b;
#define XCHAR2B_BYTE2(chp) \
((*chp) & 0x00ff)
#define XCHAR2B_BYTE2(chp) \
((*chp) & 0x00ff)
-#define FACE_DEFAULT (~0)
-
-/*
PENDING
: xfaces requires these structures, but the question is are we
-
forced to use them? */
+/*
XXX
: xfaces requires these structures, but the question is are we
+ forced to use them? */
typedef struct _XGCValues
{
typedef struct _XGCValues
{
+ unsigned long foreground;
+ unsigned long background;
#ifdef __OBJC__
#ifdef __OBJC__
- NSColor *foreground;
- NSColor *background;
struct ns_font *font;
#else
struct ns_font *font;
#else
- void *foreground;
- void *background;
void *font;
#endif
} XGCValues;
void *font;
#endif
} XGCValues;
@@
-133,8
+121,8
@@
typedef int Display;
typedef Lisp_Object XrmDatabase;
typedef Lisp_Object XrmDatabase;
-/*
23:
some sort of attempt to normalize rectangle handling.. seems a bit much
-
for what is accomplished */
+/* some sort of attempt to normalize rectangle handling.. seems a bit much
+ for what is accomplished */
typedef struct {
int x, y;
unsigned width, height;
typedef struct {
int x, y;
unsigned width, height;