← Back to branch summary

~ubuntu-branches/ubuntu/lucid/blender/lucid

« back to all changes in this revision

Viewing changes to intern/ghost/intern/GHOST_SystemCarbon.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-08-06 22:32:19 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090806223219-8z4eej1u8levu4pz
Tags: 2.49a+dfsg-0ubuntu1
https://launchpad.net/bugs/382153
* Merge from debian unstable, remaining changes:
  - debian/control: Build-depend on python-2.6 rather than python-2.5.
  - debian/misc/*.desktop: Add Spanish translation to .desktop 
    files.
  - debian/pyversions: 2.6.
  - debian/rules: Clean *.o of source/blender/python/api2_2x/
* New upstream release (LP: #382153).
* Refreshed patches:
  - 01_sanitize_sys.patch
  - 02_tmp_in_HOME
  - 10_use_systemwide_ftgl
  - 70_portability_platform_detection
* Removed patches merged upstream:
  - 30_fix_python_syntax_warning
  - 90_ubuntu_ffmpeg_52_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
intern/ghost/intern/GHOST_SystemCarbon.cpp
1
1
/**
2
 
 * $Id: GHOST_SystemCarbon.cpp 16448 2008-09-09 21:15:30Z ben2610 $
 
2
 * $Id: GHOST_SystemCarbon.cpp 20183 2009-05-13 06:53:21Z ben2610 $
3
3
 * ***** BEGIN GPL LICENSE BLOCK *****
4
4
 *
5
5
 * This program is free software; you can redistribute it and/or
28
28
 
29
29
/**
30
30
 
31
 
 * $Id: GHOST_SystemCarbon.cpp 16448 2008-09-09 21:15:30Z ben2610 $
 
31
 * $Id: GHOST_SystemCarbon.cpp 20183 2009-05-13 06:53:21Z ben2610 $
32
32
 * Copyright (C) 2001 NaN Technologies B.V.
33
33
 * @author      Maarten Gribnau
34
34
 * @date        May 7, 2001
35
35
 */
36
36
 
37
 
 
38
37
#include <Carbon/Carbon.h>
39
38
#include <ApplicationServices/ApplicationServices.h>
40
39
#include "GHOST_SystemCarbon.h"
430
429
    return window;
431
430
}
432
431
 
 
432
GHOST_TSuccess GHOST_SystemCarbon::beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window, const bool stereoVisual)
 
433
{       
 
434
        GHOST_TSuccess success = GHOST_kFailure;
 
435
 
 
436
        // need yo make this Carbon all on 10.5 for fullscreen to work correctly
 
437
        CGCaptureAllDisplays();
 
438
        
 
439
        success = GHOST_System::beginFullScreen( setting, window, stereoVisual);
 
440
        
 
441
        if( success != GHOST_kSuccess ) {
 
442
                        // fullscreen failed for other reasons, release
 
443
                        CGReleaseAllDisplays(); 
 
444
        }
 
445
 
 
446
        return success;
 
447
}
 
448
 
 
449
GHOST_TSuccess GHOST_SystemCarbon::endFullScreen(void)
 
450
{       
 
451
        CGReleaseAllDisplays();
 
452
        return GHOST_System::endFullScreen();
 
453
}
 
454
 
433
455
/* this is an old style low level event queue.
434
456
  As we want to handle our own timers, this is ok.
435
457
  the full screen hack should be removed */