AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-12 20:00:09 +00:00
Code Issues Projects Releases Wiki Activity

quartz: Stop deriving from GdkDeviceManager

Browse Source 
We can just derive from GObject.
This commit is contained in:
Matthias Clasen 2017-11-25 08:20:57 -05:00
parent fd958939be
commit 1471c64fb2
2 changed files with 8 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
gdk/quartz/gdkdevicemanager-core-quartz.c
View File

@ -37,68 +37,20 @@ static void gdk_quartz_device_manager_core_constructed (GObject *object);
static GdkDevice * gdk_quartz_device_manager_core_get_client_pointer (GdkDeviceManager *device_manager); static GdkDevice * gdk_quartz_device_manager_core_get_client_pointer (GdkDeviceManager *device_manager);
G_DEFINE_TYPE (GdkQuartzDeviceManagerCore, gdk_quartz_device_manager_core, GDK_TYPE_DEVICE_MANAGER) G_DEFINE_TYPE (GdkQuartzDeviceManagerCore, gdk_quartz_device_manager_core, G_TYPE_OBJECT)
static void
gdk_device_manager_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
switch (prop_id)
{
case PROP_DISPLAY:
GDK_QUARTZ_DEVICE_MANAGER_CORE (object)->display = g_value_get_object (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
gdk_device_manager_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
switch (prop_id)
{
case PROP_DISPLAY:
g_value_set_object (value, GDK_QUARTZ_DEVICE_MANAGER_CORE (object)->display);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void static void
gdk_quartz_device_manager_core_class_init (GdkQuartzDeviceManagerCoreClass *klass) gdk_quartz_device_manager_core_class_init (GdkQuartzDeviceManagerCoreClass *klass)
{ {
GdkDeviceManagerClass *device_manager_class = GDK_DEVICE_MANAGER_CLASS (klass);
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->finalize = gdk_quartz_device_manager_core_finalize; object_class->finalize = gdk_quartz_device_manager_core_finalize;
object_class->constructed = gdk_quartz_device_manager_core_constructed; object_class->constructed = gdk_quartz_device_manager_core_constructed;
object_class->set_property = gdk_device_manager_set_property;
object_class->get_property = gdk_device_manager_get_property;
g_object_class_install_property (object_class,
PROP_DISPLAY,
g_param_spec_object ("display",
P_("Display"),
P_("Display for the device manager"),
GDK_TYPE_DISPLAY,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
} }
static GdkDevice * static GdkDevice *
create_core_pointer (GdkDeviceManager *device_manager, create_core_pointer (GdkQuartzDeviceManagerCore *device_manager,
GdkDisplay *display) GdkDisplay *display)
{ {
return g_object_new (GDK_TYPE_QUARTZ_DEVICE_CORE, return g_object_new (GDK_TYPE_QUARTZ_DEVICE_CORE,
"name", "Core Pointer", "name", "Core Pointer",
@ -112,8 +64,8 @@ create_core_pointer (GdkDeviceManager *device_manager,
} }
static GdkDevice * static GdkDevice *
create_core_keyboard (GdkDeviceManager *device_manager, create_core_keyboard (GdkQuartzDeviceManagerCore *device_manager,
GdkDisplay *display) GdkDisplay *display)
{ {
return g_object_new (GDK_TYPE_QUARTZ_DEVICE_CORE, return g_object_new (GDK_TYPE_QUARTZ_DEVICE_CORE,
"name", "Core Keyboard", "name", "Core Keyboard",
@ -151,8 +103,9 @@ gdk_quartz_device_manager_core_constructed (GObject *object)
GdkDisplay *display; GdkDisplay *display;
GdkSeat *seat; GdkSeat *seat;
display = _gdk_display;
device_manager = GDK_QUARTZ_DEVICE_MANAGER_CORE (object); device_manager = GDK_QUARTZ_DEVICE_MANAGER_CORE (object);
display = device_manager->display;
device_manager->core_pointer = create_core_pointer (GDK_DEVICE_MANAGER (device_manager), display); device_manager->core_pointer = create_core_pointer (GDK_DEVICE_MANAGER (device_manager), display);
device_manager->core_keyboard = create_core_keyboard (GDK_DEVICE_MANAGER (device_manager), display); device_manager->core_keyboard = create_core_keyboard (GDK_DEVICE_MANAGER (device_manager), display);

3
gdk/quartz/gdkdevicemanager-core-quartz.h
View File

@ -28,14 +28,13 @@ G_BEGIN_DECLS
struct _GdkQuartzDeviceManagerCore struct _GdkQuartzDeviceManagerCore
{ {
GObject parent_object; GObject parent_object;
GdkDisplay *display;
GdkDevice *core_pointer; GdkDevice *core_pointer;
GdkDevice *core_keyboard; GdkDevice *core_keyboard;
}; };
struct _GdkQuartzDeviceManagerCoreClass struct _GdkQuartzDeviceManagerCoreClass
{ {
GdkDeviceManagerClass parent_class; GObjectClass parent_class;
}; };
G_END_DECLS G_END_DECLS