brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

osx: Fix build

Browse Source
This commit is contained in:
Emmanuele Bassi 2012-04-04 15:33:32 +01:00
parent ea68ccf703
commit 532904e43d
4 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
clutter/osx/clutter-backend-osx.c
View File

@ -22,16 +22,15 @@
*/ */
#include "config.h" #include "config.h"
#include "clutter-osx.h" #import "clutter-osx.h"
#import "clutter-backend-osx.h"
#include "clutter-backend-osx.h" #import "clutter-device-manager-osx.h"
#include "clutter-device-manager-osx.h" #import "clutter-stage-osx.h"
#include "clutter-shader.h" #import "clutter-event-loop-osx.h"
#include "clutter-stage-osx.h"
#include "clutter-event-loop-osx.h"
#include "clutter-debug.h" #include "clutter-debug.h"
#include "clutter-private.h" #include "clutter-private.h"
#include "clutter-shader.h"
#include "clutter-stage-private.h" #include "clutter-stage-private.h"
#include "cogl/cogl.h" #include "cogl/cogl.h"

7
clutter/osx/clutter-backend-osx.h
View File

@ -23,8 +23,13 @@
#ifndef __CLUTTER_BACKEND_OSX_H__ #ifndef __CLUTTER_BACKEND_OSX_H__
#define __CLUTTER_BACKEND_OSX_H__ #define __CLUTTER_BACKEND_OSX_H__
#import <AppKit/AppKit.h>
#import <Cocoa/Cocoa.h>
#import <Foundation/Foundation.h>
#include <glib.h>
#include "clutter-backend-private.h" #include "clutter-backend-private.h"
#include "clutter-device-manager.h"
@class NSOpenGLPixelFormat, NSOpenGLContext; @class NSOpenGLPixelFormat, NSOpenGLContext;

2
clutter/osx/clutter-osx.h
View File

@ -22,6 +22,8 @@
#ifndef __CLUTTER_OSX_H__ #ifndef __CLUTTER_OSX_H__
#define __CLUTTER_OSX_H__ #define __CLUTTER_OSX_H__
#import <AppKit/AppKit.h>
#include <clutter/clutter-stage.h> #include <clutter/clutter-stage.h>
@class NSEvent; @class NSEvent;

33
clutter/osx/clutter-stage-osx.c
View File

@ -22,16 +22,14 @@
*/ */
#include "config.h" #include "config.h"
#include "clutter-osx.h" #import "clutter-osx.h"
#include "clutter-stage-osx.h" #import "clutter-stage-osx.h"
#include "clutter-backend-osx.h" #import "clutter-backend-osx.h"
#include "clutter-debug.h" #include "clutter-debug.h"
#include "clutter-private.h" #include "clutter-private.h"
#include "clutter-stage-private.h" #include "clutter-stage-private.h"
#import <AppKit/AppKit.h>
enum enum
{ {
PROP_0, PROP_0,
@ -153,7 +151,8 @@ clutter_stage_osx_get_wrapper (ClutterStageWindow *stage_window);
@interface ClutterGLView : NSOpenGLView @interface ClutterGLView : NSOpenGLView
{ {
ClutterStageOSX *stage_osx; ClutterStageOSX *stage_osx;
NSTrackingRectTag tracking_rect;
NSTrackingRectTag trackingRect;
} }
- (void) drawRect: (NSRect) bounds; - (void) drawRect: (NSRect) bounds;
@end @end
@ -164,10 +163,10 @@ clutter_stage_osx_get_wrapper (ClutterStageWindow *stage_window);
if ((self = [super initWithFrame:aFrame pixelFormat:aFormat]) != nil) if ((self = [super initWithFrame:aFrame pixelFormat:aFormat]) != nil)
{ {
self->stage_osx = aStage; self->stage_osx = aStage;
tracking_rect = [self addTrackingRect:[self bounds] trackingRect = [self addTrackingRect:[self bounds]
owner:self owner:self
userData:NULL userData:NULL
assumeInside:NO]; assumeInside:NO];
} }
return self; return self;
@ -186,12 +185,12 @@ clutter_stage_osx_get_wrapper (ClutterStageWindow *stage_window);
- (NSTrackingRectTag) trackingRect - (NSTrackingRectTag) trackingRect
{ {
return tracking_rect; return trackingRect;
} }
- (ClutterActor *) clutterStage - (ClutterActor *) clutterStage
{ {
return stage_osx->wrapper; return (ClutterActor *) stage_osx->wrapper;
} }
- (void) drawRect: (NSRect) bounds - (void) drawRect: (NSRect) bounds
@ -242,11 +241,11 @@ clutter_stage_osx_get_wrapper (ClutterStageWindow *stage_window);
stage_osx->requisition_width, stage_osx->requisition_width,
stage_osx->requisition_height); stage_osx->requisition_height);
[self removeTrackingRect:tracking_rect]; [self removeTrackingRect:trackingRect];
tracking_rect = [self addTrackingRect:[self bounds] trackingRect = [self addTrackingRect:[self bounds]
owner:self owner:self
userData:NULL userData:NULL
assumeInside:NO]; assumeInside:NO];
} }
/* Simply forward all events that reach our view to clutter. */ /* Simply forward all events that reach our view to clutter. */