From cd1e8da07fd437a0368c198a3ee2a16569ce7699 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 4 Nov 2011 19:01:32 +0000 Subject: [PATCH] */backend: Clean up the stage creation Use the default implementation of create_stage() wherever possible. --- clutter/cex100/clutter-backend-cex100.c | 27 ------------------------- clutter/cex100/clutter-backend-cex100.h | 3 --- clutter/egl/clutter-backend-eglnative.c | 27 ------------------------- clutter/egl/clutter-backend-eglnative.h | 3 --- clutter/gdk/clutter-backend-gdk.c | 12 ----------- clutter/win32/clutter-backend-win32.c | 20 ------------------ 6 files changed, 92 deletions(-) diff --git a/clutter/cex100/clutter-backend-cex100.c b/clutter/cex100/clutter-backend-cex100.c index 26848d3a4..8b9b50c5a 100644 --- a/clutter/cex100/clutter-backend-cex100.c +++ b/clutter/cex100/clutter-backend-cex100.c @@ -100,32 +100,6 @@ clutter_backend_cex100_dispose (GObject *gobject) G_OBJECT_CLASS (clutter_backend_cex100_parent_class)->dispose (gobject); } -static ClutterStageWindow * -clutter_backend_cex100_create_stage (ClutterBackend *backend, - ClutterStage *wrapper, - GError **error) -{ - ClutterBackendCex100 *backend_cex100 = CLUTTER_BACKEND_CEX100 (backend); - ClutterStageWindow *stage; - - if (G_UNLIKELY (backend_cex100->stage != NULL)) - { - g_set_error (error, CLUTTER_INIT_ERROR, - CLUTTER_INIT_ERROR_BACKEND, - "The Cex100 backend does not support multiple " - "onscreen windows"); - return backend_cex100->stage; - } - - stage = g_object_new (CLUTTER_TYPE_STAGE_COGL, - "backend", backend, - "wrapper", wrapper, - NULL); - backend_cex100->stage = stage; - - return stage; -} - static CoglDisplay * clutter_backend_cex100_get_display (ClutterBackend *backend, CoglRenderer *renderer, @@ -172,7 +146,6 @@ clutter_backend_cex100_class_init (ClutterBackendCex100Class *klass) backend_class->stage_window_type = CLUTTER_TYPE_STAGE_COGL; backend_class->get_device_manager = clutter_backend_cex100_get_device_manager; - backend_class->create_stage = clutter_backend_cex100_create_stage; backend_class->get_display = clutter_backend_cex100_get_display; } diff --git a/clutter/cex100/clutter-backend-cex100.h b/clutter/cex100/clutter-backend-cex100.h index b55b89aee..2d1fb69b4 100644 --- a/clutter/cex100/clutter-backend-cex100.h +++ b/clutter/cex100/clutter-backend-cex100.h @@ -49,9 +49,6 @@ struct _ClutterBackendCex100 { ClutterBackend parent_instance; - /* main stage singleton */ - ClutterStageWindow *stage; - /* device manager (ie evdev) */ ClutterDeviceManager *device_manager; diff --git a/clutter/egl/clutter-backend-eglnative.c b/clutter/egl/clutter-backend-eglnative.c index f9419f4dc..8d0f1a696 100644 --- a/clutter/egl/clutter-backend-eglnative.c +++ b/clutter/egl/clutter-backend-eglnative.c @@ -95,32 +95,6 @@ clutter_backend_egl_native_dispose (GObject *gobject) G_OBJECT_CLASS (clutter_backend_egl_native_parent_class)->dispose (gobject); } -static ClutterStageWindow * -clutter_backend_egl_native_create_stage (ClutterBackend *backend, - ClutterStage *wrapper, - GError **error) -{ - ClutterBackendEglNative *backend_egl_native = CLUTTER_BACKEND_EGL_NATIVE (backend); - ClutterStageWindow *stage; - - if (G_UNLIKELY (backend_egl_native->stage != NULL)) - { - g_set_error (error, CLUTTER_INIT_ERROR, - CLUTTER_INIT_ERROR_BACKEND, - "The EglNative backend does not support multiple " - "onscreen windows"); - return backend_egl_native->stage; - } - - stage = g_object_new (CLUTTER_TYPE_STAGE_COGL, - "backend", backend, - "wrapper", wrapper, - NULL); - backend_egl_native->stage = stage; - - return stage; -} - static void clutter_backend_egl_native_class_init (ClutterBackendEglNativeClass *klass) { @@ -132,7 +106,6 @@ clutter_backend_egl_native_class_init (ClutterBackendEglNativeClass *klass) backend_class->stage_window_type = CLUTTER_TYPE_STAGE_COGL; backend_class->get_device_manager = clutter_backend_egl_native_get_device_manager; - backend_class->create_stage = clutter_backend_egl_native_create_stage; } static void diff --git a/clutter/egl/clutter-backend-eglnative.h b/clutter/egl/clutter-backend-eglnative.h index 87ff7ee98..7c30d4ad6 100644 --- a/clutter/egl/clutter-backend-eglnative.h +++ b/clutter/egl/clutter-backend-eglnative.h @@ -49,9 +49,6 @@ struct _ClutterBackendEglNative { ClutterBackend parent_instance; - /* main stage singleton */ - ClutterStageWindow *stage; - /* device manager (ie evdev) */ ClutterDeviceManager *device_manager; diff --git a/clutter/gdk/clutter-backend-gdk.c b/clutter/gdk/clutter-backend-gdk.c index e3d93bfb0..14650a31e 100644 --- a/clutter/gdk/clutter-backend-gdk.c +++ b/clutter/gdk/clutter-backend-gdk.c @@ -367,17 +367,6 @@ clutter_backend_gdk_get_display (ClutterBackend *backend, return display; } -static ClutterStageWindow * -clutter_backend_gdk_create_stage (ClutterBackend *backend, - ClutterStage *wrapper, - GError **error) -{ - return g_object_new (CLUTTER_TYPE_STAGE_GDK, - "backend", backend, - "wrapper", wrapper, - NULL); -} - static void clutter_backend_gdk_class_init (ClutterBackendGdkClass *klass) { @@ -398,7 +387,6 @@ clutter_backend_gdk_class_init (ClutterBackendGdkClass *klass) backend_class->get_renderer = clutter_backend_gdk_get_renderer; backend_class->get_display = clutter_backend_gdk_get_display; - backend_class->create_stage = clutter_backend_gdk_create_stage; } static void diff --git a/clutter/win32/clutter-backend-win32.c b/clutter/win32/clutter-backend-win32.c index 99b75df17..cc4fe34e8 100644 --- a/clutter/win32/clutter-backend-win32.c +++ b/clutter/win32/clutter-backend-win32.c @@ -168,25 +168,6 @@ clutter_backend_win32_get_features (ClutterBackend *backend) | CLUTTER_FEATURE_STAGE_CURSOR; } -static ClutterStageWindow * -clutter_backend_win32_create_stage (ClutterBackend *backend, - ClutterStage *wrapper, - GError **error) -{ - ClutterBackendWin32 *backend_win32 = CLUTTER_BACKEND_WIN32 (backend); - ClutterStageWin32 *stage_win32; - ClutterStageWindow *stage; - - stage = g_object_new (CLUTTER_TYPE_STAGE_WIN32, NULL); - - /* copy backend data into the stage */ - stage_win32 = CLUTTER_STAGE_WIN32 (stage); - stage_win32->backend = backend_win32; - stage_win32->wrapper = wrapper; - - return stage; -} - static ClutterDeviceManager * clutter_backend_win32_get_device_manager (ClutterBackend *backend) { @@ -239,7 +220,6 @@ clutter_backend_win32_class_init (ClutterBackendWin32Class *klass) backend_class->stage_window_type = CLUTTER_TYPE_STAGE_WIN32; backend_class->init_events = clutter_backend_win32_init_events; - backend_class->create_stage = clutter_backend_win32_create_stage; backend_class->add_options = clutter_backend_win32_add_options; backend_class->get_features = clutter_backend_win32_get_features; backend_class->get_device_manager = clutter_backend_win32_get_device_manager;