[clutter/clutter-1.22] osx: Clean up installed clutter-osx.h header



commit b7c41203992e17c3d0744aaba558b1a8b7622cc9
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Mon Dec 15 16:51:05 2014 +0000

    osx: Clean up installed clutter-osx.h header
    
    The installed header should not have private API declarations and
    macros. Let's move those into the uninstalled clutter-backend-osx.h
    header file instead.

 clutter/osx/clutter-backend-osx.h |    8 +++++++-
 clutter/osx/clutter-event-osx.c   |    1 +
 clutter/osx/clutter-osx.h         |    9 +--------
 3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/clutter/osx/clutter-backend-osx.h b/clutter/osx/clutter-backend-osx.h
index b1720ab..cef4e0e 100644
--- a/clutter/osx/clutter-backend-osx.h
+++ b/clutter/osx/clutter-backend-osx.h
@@ -61,7 +61,13 @@ struct _ClutterBackendOSXClass
 
 GType _clutter_backend_osx_get_type (void) G_GNUC_CONST;
 
-void            _clutter_backend_osx_events_init        (ClutterBackend *backend);
+void _clutter_backend_osx_events_init (ClutterBackend *backend);
+
+#define CLUTTER_OSX_POOL_ALLOC()        NSAutoreleasePool *autorelease_pool = [[NSAutoreleasePool alloc] 
init]
+#define CLUTTER_OSX_POOL_RELEASE()      [autorelease_pool release];
+
+void _clutter_event_osx_put (NSEvent *nsevent,
+                             ClutterStage *wrapper);
 
 G_END_DECLS
 
diff --git a/clutter/osx/clutter-event-osx.c b/clutter/osx/clutter-event-osx.c
index 1f9ee77..4b53fef 100644
--- a/clutter/osx/clutter-event-osx.c
+++ b/clutter/osx/clutter-event-osx.c
@@ -24,6 +24,7 @@
 
 #include "clutter-osx.h"
 
+#include "clutter-backend-osx.h"
 #include "clutter-device-manager-osx.h"
 #include "clutter-stage-osx.h"
 
diff --git a/clutter/osx/clutter-osx.h b/clutter/osx/clutter-osx.h
index fb389e0..8930b0a 100644
--- a/clutter/osx/clutter-osx.h
+++ b/clutter/osx/clutter-osx.h
@@ -30,14 +30,7 @@
 
 G_BEGIN_DECLS
 
-#define CLUTTER_OSX_POOL_ALLOC()        NSAutoreleasePool *autorelease_pool = [[NSAutoreleasePool alloc] 
init]
-#define CLUTTER_OSX_POOL_RELEASE()      [autorelease_pool release];
-
-void _clutter_events_osx_init   (void);
-void _clutter_events_osx_uninit (void);
-
-void _clutter_event_osx_put     (NSEvent *nsevent, ClutterStage *wrapper);
-
+CLUTTER_AVAILABLE_IN_1_22
 void clutter_osx_disable_event_retrieval (void);
 
 G_END_DECLS


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]