mirror of https://github.com/proxmox/mirror_qemu
cocoa queue:
* fixes for compiler warnings * fix mouse cursor flickering -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABCAAGBQJWIMzqAAoJEDwlJe0UNgzeTM8P/2XTU4q0s2ICXRwvhe+tCd30 Wq9F02WDyG/SztjIzBTPd+FWw015D30kjs/Eco1fR/fbsV6eSPdflBqcy4FvMuWD FlnHA0ZR31O41pj8NQySYrcUc5Q++tCNShBZ8M+lttI1wpSD3RkLcdq5cG3Kmi7/ QJ/GintsfWc8dEHkLmjdzj4Mrk7Vp+L6+gdftTl40SkQjR8/y8pVwg64GG25UsaA E7QekzoIk0g8DDnrX8SLGJ5gc6wCVjkCQocsE93/LNftwrXToTxEJV72Lo8mFKXm rz+NJenuQ21+zHILggENnR1LBv/71KvovCAi+FNa7qbKq9nR0O+ESkbgckxa2MaA X6yuZ8nQEI3MP6hb/0cpuQ1pXD96BGU46SKzvPtoqHD+QbxLjThchpHuGw6esU+q y5AtKKHNcmjcJb2oQlIUsRMRr9couV+ccl5aiZyne7NjLRal5QTSmjVv64C0ehqk VFYfa+I0a5cFbVtG7F8tGjqVKDcbVdem+hVNH7jhI46dso0Szrk5RQjoI+G0WTag IyvC/oDHZBbSfweJnSWQ55Qn4YYMyxXCkMX0NFdCse+BUMwUjAJ4ULp5DCLBS9MT fbx+sFoQ/2WP0fEh7XYw6Ku3yWA1fB+R9NqoPtxn+cdMLx9DB16QJzSPjlfNS/pq wOZ42bpTzFwUA/04xRx8 =mkIq -----END PGP SIGNATURE----- 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: Peter Maydell <peter.maydell@linaro.org>master
commit
9c1f5bbc73
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue