*/
#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"
#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;
*/
#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,
@interface ClutterGLView : NSOpenGLView
{
ClutterStageOSX *stage_osx;
- NSTrackingRectTag tracking_rect;
+
+ NSTrackingRectTag trackingRect;
}
- (void) drawRect: (NSRect) bounds;
@end
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;
- (NSTrackingRectTag) trackingRect
{
- return tracking_rect;
+ return trackingRect;
}
- (ClutterActor *) clutterStage
{
- return stage_osx->wrapper;
+ return (ClutterActor *) stage_osx->wrapper;
}
- (void) drawRect: (NSRect) bounds
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. */