Mercurial > emacs
changeset 101636:6bbb2d204513
* nsterm.h (EmacsPrefsController.cursorBlinkSlider): Only define
under GNUstep.
(ns_query_color): New declaration.
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Thu, 29 Jan 2009 10:35:55 +0000 |
| parents | 929f3ad94b86 |
| children | c32306216562 |
| files | src/nsterm.h |
| diffstat | 1 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/nsterm.h Thu Jan 29 08:53:37 2009 +0000 +++ b/src/nsterm.h Thu Jan 29 10:35:55 2009 +0000 @@ -335,16 +335,20 @@ IBOutlet NSPopUpButton *functionModMenu; #endif IBOutlet NSMatrix *cursorTypeMatrix; - IBOutlet NSSlider *cursorBlinkSlider; IBOutlet NSSlider *expandSpaceSlider; #ifdef NS_IMPL_COCOA IBOutlet NSButton *smoothFontsCheck; IBOutlet NSButton *useQuickdrawCheck; IBOutlet NSButton *useSysHiliteCheck; + IBOutlet NSButton *confirmQuitCheck; Lisp_Object prevUseHighlightColor; #endif float prevExpandSpace; - float prevBlinkRate; +#ifdef NS_IMPL_GNUSTEP + /* TODO: remove as soon as someone can edit the .nib to replace the + cursor-blink widget with checkbox conn to confirmQuitCheck */ + IBOutlet NSSlider *cursorBlinkSlider; +#endif } - (IBAction)cancel: (id)sender; - (IBAction)ok: (id)sender; @@ -744,11 +748,11 @@ extern Lisp_Object Qnone; extern char ns_no_defaults; -/* XColor defined in dispextern.h (we use color_def->pixel = NSColor id), but - this causes an #include snafu, so we can't declare it. */ extern int ns_defined_color (struct frame *f, char *name, XColor *color_def, int alloc, char makeIndex); +extern void +ns_query_color (void *col, XColor *color_def, int setPixel); #ifdef __OBJC__ extern Lisp_Object ns_color_to_lisp (NSColor *col);