summaryrefslogtreecommitdiff
path: root/clutter
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gmail.com>2022-08-25 15:45:46 +0000
committerEmmanuele Bassi <ebassi@gmail.com>2022-08-25 15:45:46 +0000
commit2779b9324d0a508c0678db39eaf969e6694d7710 (patch)
tree15cd46012a1e8d4306ee4aa3d0507edd998496aa /clutter
parent5b477d43a80bc7ea0d04b5d7a8f5d81e9477ddb2 (diff)
parent1f87d51414bde2a7a7951af60caff1557c0862ee (diff)
downloadclutter-master.tar.gz
Merge branch 'windows-fixes' into 'master'HEADmaster
Fix some Windows items See merge request GNOME/clutter!16
Diffstat (limited to 'clutter')
-rw-r--r--clutter/clutter-stage.c4
-rw-r--r--clutter/meson.build6
-rw-r--r--clutter/win32/clutter-event-win32.c2
3 files changed, 9 insertions, 3 deletions
diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c
index 2c67ca3ad..d28167274 100644
--- a/clutter/clutter-stage.c
+++ b/clutter/clutter-stage.c
@@ -3795,8 +3795,8 @@ _clutter_stage_schedule_update (ClutterStage *stage)
if (stage_window == NULL)
return;
- return _clutter_stage_window_schedule_update (stage_window,
- stage->priv->sync_delay);
+ _clutter_stage_window_schedule_update (stage_window,
+ stage->priv->sync_delay);
}
/* Returns the earliest time the stage is ready to update */
diff --git a/clutter/meson.build b/clutter/meson.build
index 68cd5f1a6..0c34638a9 100644
--- a/clutter/meson.build
+++ b/clutter/meson.build
@@ -365,6 +365,12 @@ if enabled_backends.contains('mir')
'#define CLUTTER_INPUT_MIR "mir"',
]
endif
+if enabled_backends.contains('win32')
+ clutter_config += [
+ '#define CLUTTER_WINDOWING_WIN32 "win32"',
+ '#define CLUTTER_INPUT_WIN32 "win32"',
+ ]
+endif
clutter_config += '#define CLUTTER_INPUT_NULL "null"'
clutter_config_h = configuration_data()
diff --git a/clutter/win32/clutter-event-win32.c b/clutter/win32/clutter-event-win32.c
index 391cadc58..6cd42662f 100644
--- a/clutter/win32/clutter-event-win32.c
+++ b/clutter/win32/clutter-event-win32.c
@@ -493,7 +493,7 @@ clutter_win32_handle_event (const MSG *msg)
break;
case WM_MBUTTONDBLCLK:
- make_button_event (msg, stage, CLUTER_BUTTON_MIDDLE, 2, FALSE, core_pointer);
+ make_button_event (msg, stage, CLUTTER_BUTTON_MIDDLE , 2, FALSE, core_pointer);
break;
case WM_RBUTTONDBLCLK: