diff options
| author | Jan Djärv | 2015-05-15 16:21:59 +0200 |
|---|---|---|
| committer | Jan Djärv | 2015-05-15 16:23:44 +0200 |
| commit | e0e0753505cc2efefcee16bbed99ec6b9e5bcb39 (patch) | |
| tree | c34a9973a17919fe937ae5591c3d99c4e4a58ecb /src/nsterm.h | |
| parent | 2abfe21de9241aea36f7221184886b6b39f7648b (diff) | |
| download | emacs-e0e0753505cc2efefcee16bbed99ec6b9e5bcb39.tar.gz emacs-e0e0753505cc2efefcee16bbed99ec6b9e5bcb39.zip | |
Fix warnings on OSX 10.10.
* nsfns.m (MODAL_OK_RESPONSE): New define for different OSX versions.
(Fns_read_file_name): Check against MODAL_OK_RESPONSE.
(compute_tip_xy): Use convertRectToScreen for OSX >= 10.7
* nsmenu.m (initWithContentRect:styleMask:backing:defer:)
* nsimage.m (allocInitFromFile, setPixmapData): Only call
setScalesWhenResized for OSX < 10.6.
* nsterm.h (EmacsScroller): Declare scrollerWidth.
* nsterm.m (ns_copy_bits): New function that does not use deprecated
NSCopyBits.
(ns_scroll_run, ns_shift_glyphs_for_insert): Call ns_copy_bits.
(runAlertPanel): New function.
(applicationShouldTerminate:): Call runAlertPanel.
(initFrameFromEmacs, toggleFullScreen:): Only call useOptimizedDrawing
for OSX < 10.10.
(initFrameFromEmacs:): Only call allocateGState for OSX < 10.10.
(windowWillUseStandardFrame:defaultFrame:): Cast arg to abs to int.
(draggingEntered:): Returns NSDragOperation.
(scrollerWidth): Use scrollerWidthForControlSize for OSX >= 10.7.
Diffstat (limited to 'src/nsterm.h')
| -rw-r--r-- | src/nsterm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/nsterm.h b/src/nsterm.h index d8ffd93a71b..c06b7c49a6d 100644 --- a/src/nsterm.h +++ b/src/nsterm.h | |||
| @@ -396,6 +396,7 @@ typedef float EmacsCGFloat; | |||
| 396 | - condemn; | 396 | - condemn; |
| 397 | - reprieve; | 397 | - reprieve; |
| 398 | - (bool)judge; | 398 | - (bool)judge; |
| 399 | + (CGFloat)scrollerWidth; | ||
| 399 | @end | 400 | @end |
| 400 | 401 | ||
| 401 | 402 | ||