mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-24 10:38:38 +00:00
Code Issues Releases Activity

* nsterm.h (EmacsPrefsController.cursorBlinkSlider): Only define

Browse Source 
under GNUstep.
	(ns_query_color): New declaration.
This commit is contained in:
Adrian Robert 2009-01-29 10:35:55 +00:00
parent bcca751d83
commit 5e1dedc1ec
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/nsterm.h
View File

@ -335,16 +335,20 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
IBOutlet NSPopUpButton *functionModMenu; IBOutlet NSPopUpButton *functionModMenu;
#endif #endif
IBOutlet NSMatrix *cursorTypeMatrix; IBOutlet NSMatrix *cursorTypeMatrix;
IBOutlet NSSlider *cursorBlinkSlider;
IBOutlet NSSlider *expandSpaceSlider; IBOutlet NSSlider *expandSpaceSlider;
#ifdef NS_IMPL_COCOA #ifdef NS_IMPL_COCOA
IBOutlet NSButton *smoothFontsCheck; IBOutlet NSButton *smoothFontsCheck;
IBOutlet NSButton *useQuickdrawCheck; IBOutlet NSButton *useQuickdrawCheck;
IBOutlet NSButton *useSysHiliteCheck; IBOutlet NSButton *useSysHiliteCheck;
IBOutlet NSButton *confirmQuitCheck;
Lisp_Object prevUseHighlightColor; Lisp_Object prevUseHighlightColor;
#endif #endif
float prevExpandSpace; 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)cancel: (id)sender;
- (IBAction)ok: (id)sender; - (IBAction)ok: (id)sender;
@ -744,11 +748,11 @@ extern Lisp_Object ns_cursor_type_to_lisp (int arg);
extern Lisp_Object Qnone; extern Lisp_Object Qnone;
extern char ns_no_defaults; 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 extern int
ns_defined_color (struct frame *f, char *name, XColor *color_def, int alloc, ns_defined_color (struct frame *f, char *name, XColor *color_def, int alloc,
char makeIndex); char makeIndex);
extern void
ns_query_color (void *col, XColor *color_def, int setPixel);
#ifdef __OBJC__ #ifdef __OBJC__
extern Lisp_Object ns_color_to_lisp (NSColor *col); extern Lisp_Object ns_color_to_lisp (NSColor *col);