[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src nsterm.h
From: |
Adrian Robert |
Subject: |
[Emacs-diffs] emacs/src nsterm.h |
Date: |
Thu, 29 Jan 2009 10:35:55 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Adrian Robert <arobert> 09/01/29 10:35:55
Modified files:
src : nsterm.h
Log message:
* nsterm.h (EmacsPrefsController.cursorBlinkSlider): Only define
under GNUstep.
(ns_query_color): New declaration.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsterm.h?cvsroot=emacs&r1=1.22&r2=1.23
Patches:
Index: nsterm.h
===================================================================
RCS file: /sources/emacs/emacs/src/nsterm.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- nsterm.h 25 Jan 2009 19:43:34 -0000 1.22
+++ nsterm.h 29 Jan 2009 10:35:55 -0000 1.23
@@ -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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src nsterm.h,
Adrian Robert <=