brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

win32: Fixup compilation errors from b398292089

Browse Source 
That commit added some Win32 code which breaks compilation.

Thanks to Samuel Degrande for help with this.
This commit is contained in:
Neil Roberts 2010-02-17 18:18:38 +00:00
parent 5de743de70
commit a2afc9d7ba
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clutter/win32/clutter-backend-win32.c
View File

@ -28,6 +28,7 @@
#include "clutter-backend-win32.h" #include "clutter-backend-win32.h"
#include "clutter-stage-win32.h" #include "clutter-stage-win32.h"
#include "clutter-win32.h" #include "clutter-win32.h"
#include "clutter-device-manager-win32.h"
#include "../clutter-event.h" #include "../clutter-event.h"
#include "../clutter-main.h" #include "../clutter-main.h"
@ -66,8 +67,6 @@ static void
clutter_backend_win32_init_events (ClutterBackend *backend) clutter_backend_win32_init_events (ClutterBackend *backend)
{ {
ClutterBackendWin32 *backend_win32 = CLUTTER_BACKEND_WIN32 (backend); ClutterBackendWin32 *backend_win32 = CLUTTER_BACKEND_WIN32 (backend);
ClutterDeviceManager *manager;
ClutterInputDevice *device;
CLUTTER_NOTE (EVENT, "initialising the event loop"); CLUTTER_NOTE (EVENT, "initialising the event loop");
@ -229,7 +228,7 @@ clutter_backend_win32_get_features (ClutterBackend *backend)
for the swap control extension */ for the swap control extension */
if (getenv ("__GL_SYNC_TO_VBLANK") || check_vblank_env ("default")) if (getenv ("__GL_SYNC_TO_VBLANK") || check_vblank_env ("default"))
CLUTTER_NOTE (BACKEND, "vblank sync: left at default at user request"); CLUTTER_NOTE (BACKEND, "vblank sync: left at default at user request");
else if (cogl_check_extension ("WGL_EXT_swap_control", extensions) else if (_cogl_check_extension ("WGL_EXT_swap_control", extensions)
&& (swap_interval = (SwapIntervalProc) && (swap_interval = (SwapIntervalProc)
cogl_get_proc_address ("wglSwapIntervalEXT"))) cogl_get_proc_address ("wglSwapIntervalEXT")))
{ {

18
clutter/win32/clutter-device-manager-win32.c
View File

@ -25,25 +25,19 @@
#include "config.h" #include "config.h"
#endif #endif
#include "clutter-backend-x11.h" #include "clutter-backend-win32.h"
#include "clutter-device-manager-x11.h" #include "clutter-device-manager-win32.h"
#include "clutter-input-device-x11.h" #include "clutter-device-manager-win32.h"
#include "clutter-stage-x11.h" #include "clutter-stage-win32.h"
#include "clutter-backend.h" #include "clutter-backend.h"
#include "clutter-debug.h" #include "clutter-debug.h"
#include "clutter-device-manager.h" #include "clutter-device-manager.h"
#include "clutter-private.h" #include "clutter-private.h"
#ifdef HAVE_XINPUT
#include <X11/extensions/XInput.h>
#endif
enum enum
{ {
PROP_0, PROP_0
PROP_USE_XINPUT_1
}; };
G_DEFINE_TYPE (ClutterDeviceManagerWin32, G_DEFINE_TYPE (ClutterDeviceManagerWin32,
@ -155,7 +149,7 @@ static void
clutter_device_manager_win32_class_init (ClutterDeviceManagerWin32Class *klass) clutter_device_manager_win32_class_init (ClutterDeviceManagerWin32Class *klass)
{ {
ClutterDeviceManagerClass *manager_class; ClutterDeviceManagerClass *manager_class;
GObjectClass *gobject_class; GObjectClass *gobject_class = (GObjectClass *) klass;
gobject_class->constructed = clutter_device_manager_win32_constructed; gobject_class->constructed = clutter_device_manager_win32_constructed;

2
clutter/win32/clutter-event-win32.c
View File

@ -334,7 +334,7 @@ message_translate (ClutterBackend *backend,
ClutterBackendWin32 *backend_win32; ClutterBackendWin32 *backend_win32;
ClutterStageWin32 *stage_win32; ClutterStageWin32 *stage_win32;
ClutterDeviceManager *manager; ClutterDeviceManager *manager;
ClutterInputDevice *core_device, *core_keyboard; ClutterInputDevice *core_pointer, *core_keyboard;
ClutterStage *stage; ClutterStage *stage;
ClutterStageWindow *impl; ClutterStageWindow *impl;
gboolean res; gboolean res;