diff options
| -rw-r--r-- | clutter/osx/clutter-backend-osx.c | 13 | ||||
| -rw-r--r-- | clutter/osx/clutter-backend-osx.h | 7 | ||||
| -rw-r--r-- | clutter/osx/clutter-osx.h | 2 | ||||
| -rw-r--r-- | clutter/osx/clutter-stage-osx.c | 33 |
4 files changed, 30 insertions, 25 deletions
diff --git a/clutter/osx/clutter-backend-osx.c b/clutter/osx/clutter-backend-osx.c index 8f7e6f29a..6dd1efae4 100644 --- a/clutter/osx/clutter-backend-osx.c +++ b/clutter/osx/clutter-backend-osx.c @@ -22,16 +22,15 @@ */ #include "config.h" -#include "clutter-osx.h" - -#include "clutter-backend-osx.h" -#include "clutter-device-manager-osx.h" -#include "clutter-shader.h" -#include "clutter-stage-osx.h" -#include "clutter-event-loop-osx.h" +#import "clutter-osx.h" +#import "clutter-backend-osx.h" +#import "clutter-device-manager-osx.h" +#import "clutter-stage-osx.h" +#import "clutter-event-loop-osx.h" #include "clutter-debug.h" #include "clutter-private.h" +#include "clutter-shader.h" #include "clutter-stage-private.h" #include "cogl/cogl.h" diff --git a/clutter/osx/clutter-backend-osx.h b/clutter/osx/clutter-backend-osx.h index 4e0cf6706..b1720abb9 100644 --- a/clutter/osx/clutter-backend-osx.h +++ b/clutter/osx/clutter-backend-osx.h @@ -23,8 +23,13 @@ #ifndef __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-device-manager.h" @class NSOpenGLPixelFormat, NSOpenGLContext; diff --git a/clutter/osx/clutter-osx.h b/clutter/osx/clutter-osx.h index 49d10267c..b8ea62854 100644 --- a/clutter/osx/clutter-osx.h +++ b/clutter/osx/clutter-osx.h @@ -22,6 +22,8 @@ #ifndef __CLUTTER_OSX_H__ #define __CLUTTER_OSX_H__ +#import <AppKit/AppKit.h> + #include <clutter/clutter-stage.h> @class NSEvent; diff --git a/clutter/osx/clutter-stage-osx.c b/clutter/osx/clutter-stage-osx.c index 0c8ab9bf4..9536e9588 100644 --- a/clutter/osx/clutter-stage-osx.c +++ b/clutter/osx/clutter-stage-osx.c @@ -22,16 +22,14 @@ */ #include "config.h" -#include "clutter-osx.h" -#include "clutter-stage-osx.h" -#include "clutter-backend-osx.h" +#import "clutter-osx.h" +#import "clutter-stage-osx.h" +#import "clutter-backend-osx.h" #include "clutter-debug.h" #include "clutter-private.h" #include "clutter-stage-private.h" -#import <AppKit/AppKit.h> - enum { PROP_0, @@ -153,7 +151,8 @@ clutter_stage_osx_get_wrapper (ClutterStageWindow *stage_window); @interface ClutterGLView : NSOpenGLView { ClutterStageOSX *stage_osx; - NSTrackingRectTag tracking_rect; + + NSTrackingRectTag trackingRect; } - (void) drawRect: (NSRect) bounds; @end @@ -164,10 +163,10 @@ clutter_stage_osx_get_wrapper (ClutterStageWindow *stage_window); if ((self = [super initWithFrame:aFrame pixelFormat:aFormat]) != nil) { self->stage_osx = aStage; - tracking_rect = [self addTrackingRect:[self bounds] - owner:self - userData:NULL - assumeInside:NO]; + trackingRect = [self addTrackingRect:[self bounds] + owner:self + userData:NULL + assumeInside:NO]; } return self; @@ -186,12 +185,12 @@ clutter_stage_osx_get_wrapper (ClutterStageWindow *stage_window); - (NSTrackingRectTag) trackingRect { - return tracking_rect; + return trackingRect; } - (ClutterActor *) clutterStage { - return stage_osx->wrapper; + return (ClutterActor *) stage_osx->wrapper; } - (void) drawRect: (NSRect) bounds @@ -242,11 +241,11 @@ clutter_stage_osx_get_wrapper (ClutterStageWindow *stage_window); stage_osx->requisition_width, stage_osx->requisition_height); - [self removeTrackingRect:tracking_rect]; - tracking_rect = [self addTrackingRect:[self bounds] - owner:self - userData:NULL - assumeInside:NO]; + [self removeTrackingRect:trackingRect]; + trackingRect = [self addTrackingRect:[self bounds] + owner:self + userData:NULL + assumeInside:NO]; } /* Simply forward all events that reach our view to clutter. */ |