Commit 9c1f5bbc authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-cocoa-20151016' into staging 



cocoa queue:
 * fixes for compiler warnings
 * fix mouse cursor flickering

# gpg: Signature made Fri 16 Oct 2015 11:09:46 BST using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>"
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"

* remotes/pmaydell/tags/pull-cocoa-20151016:
  ui/cocoa.m: blinky mouse cursor fix
  ui/cocoa.m: addRemovableDevicesMenuItems() warning fix
  ui/cocoa.m: eliminate normalWindow warning

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 61f7901b 468a895b

ui/cocoa.m

+3 −3
Original line number Diff line number Diff line
@@ -874,7 +874,7 @@ QemuCocoaView *cocoaView; 
            exit(1);

        }

        [normalWindow setAcceptsMouseMovedEvents:YES];

        [normalWindow setTitle:[NSString stringWithFormat:@"QEMU"]];

        [normalWindow setTitle:@"QEMU"];

        [normalWindow setContentView:cocoaView];

#if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_10)

        [normalWindow useOptimizedDrawing:YES];
@@ -1287,6 +1287,7 @@ static void cocoa_refresh(DisplayChangeListener *dcl) 
    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];



    COCOA_DEBUG("qemu_cocoa: cocoa_refresh\n");

    graphic_hw_update(NULL);



    if (qemu_input_is_absolute()) {

        if (![cocoaView isAbsoluteEnabled]) {
@@ -1307,7 +1308,6 @@ static void cocoa_refresh(DisplayChangeListener *dcl) 
            [cocoaView handleEvent:event];

        }

    } while(event != nil);

    graphic_hw_update(NULL);

    [pool release];

}
@@ -1353,7 +1353,7 @@ static void add_console_menu_entries(void) 
/* Make menu items for all removable devices.

 * Each device is given an 'Eject' and 'Change' menu item.

 */

static void addRemovableDevicesMenuItems()

static void addRemovableDevicesMenuItems(void)

{

    NSMenu *menu;

    NSMenuItem *menuItem;