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/nsmenu.m | |
| 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/nsmenu.m')
| -rw-r--r-- | src/nsmenu.m | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m index 26fe26e5e0d..a4c26fe82ba 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m | |||
| @@ -1506,7 +1506,11 @@ ns_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents) | |||
| 1506 | area.size.width = ICONSIZE; | 1506 | area.size.width = ICONSIZE; |
| 1507 | area.size.height= ICONSIZE; | 1507 | area.size.height= ICONSIZE; |
| 1508 | img = [[NSImage imageNamed: @"NSApplicationIcon"] copy]; | 1508 | img = [[NSImage imageNamed: @"NSApplicationIcon"] copy]; |
| 1509 | #ifdef NS_IMPL_COCOA | ||
| 1510 | #if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6 | ||
| 1509 | [img setScalesWhenResized: YES]; | 1511 | [img setScalesWhenResized: YES]; |
| 1512 | #endif | ||
| 1513 | #endif | ||
| 1510 | [img setSize: NSMakeSize (ICONSIZE, ICONSIZE)]; | 1514 | [img setSize: NSMakeSize (ICONSIZE, ICONSIZE)]; |
| 1511 | imgView = [[NSImageView alloc] initWithFrame: area]; | 1515 | imgView = [[NSImageView alloc] initWithFrame: area]; |
| 1512 | [imgView setImage: img]; | 1516 | [imgView setImage: img]; |