mirror of
https://github.com/brl/mutter.git
synced 2024-12-25 12:32:05 +00:00
input-device-tool: Use macros for subclassing boilerplate
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3387>
This commit is contained in:
parent
acb2c4b6be
commit
0c46978188
@ -26,15 +26,13 @@
|
|||||||
#include "clutter/clutter-input-device-tool.h"
|
#include "clutter/clutter-input-device-tool.h"
|
||||||
#include "clutter/clutter-private.h"
|
#include "clutter/clutter-private.h"
|
||||||
|
|
||||||
typedef struct _ClutterInputDeviceToolPrivate ClutterInputDeviceToolPrivate;
|
typedef struct _ClutterInputDeviceToolPrivate
|
||||||
|
|
||||||
struct _ClutterInputDeviceToolPrivate
|
|
||||||
{
|
{
|
||||||
ClutterInputDeviceToolType type;
|
ClutterInputDeviceToolType type;
|
||||||
guint64 serial;
|
guint64 serial;
|
||||||
guint64 id;
|
guint64 id;
|
||||||
ClutterInputAxisFlags axes;
|
ClutterInputAxisFlags axes;
|
||||||
};
|
} ClutterInputDeviceToolPrivate;
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
|
@ -33,18 +33,6 @@
|
|||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
#define CLUTTER_TYPE_INPUT_DEVICE_TOOL (clutter_input_device_tool_get_type ())
|
#define CLUTTER_TYPE_INPUT_DEVICE_TOOL (clutter_input_device_tool_get_type ())
|
||||||
#define CLUTTER_INPUT_DEVICE_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_INPUT_DEVICE_TOOL, ClutterInputDeviceTool))
|
|
||||||
#define CLUTTER_IS_INPUT_DEVICE_TOOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_INPUT_DEVICE_TOOL))
|
|
||||||
#define CLUTTER_INPUT_DEVICE_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_INPUT_DEVICE_TOOL, ClutterInputDeviceToolClass))
|
|
||||||
#define CLUTTER_IS_INPUT_DEVICE_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_INPUT_DEVICE_TOOL))
|
|
||||||
#define CLUTTER_INPUT_DEVICE_TOOL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_INPUT_DEVICE_TOOL, ClutterInputDeviceToolClass))
|
|
||||||
|
|
||||||
typedef struct _ClutterInputDeviceToolClass ClutterInputDeviceToolClass;
|
|
||||||
|
|
||||||
struct _ClutterInputDeviceTool
|
|
||||||
{
|
|
||||||
GObject parent_instance;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct _ClutterInputDeviceToolClass
|
struct _ClutterInputDeviceToolClass
|
||||||
{
|
{
|
||||||
@ -52,7 +40,10 @@ struct _ClutterInputDeviceToolClass
|
|||||||
};
|
};
|
||||||
|
|
||||||
CLUTTER_EXPORT
|
CLUTTER_EXPORT
|
||||||
GType clutter_input_device_tool_get_type (void) G_GNUC_CONST;
|
G_DECLARE_DERIVABLE_TYPE (ClutterInputDeviceTool,
|
||||||
|
clutter_input_device_tool,
|
||||||
|
CLUTTER, INPUT_DEVICE_TOOL,
|
||||||
|
GObject)
|
||||||
|
|
||||||
CLUTTER_EXPORT
|
CLUTTER_EXPORT
|
||||||
guint64 clutter_input_device_tool_get_serial (ClutterInputDeviceTool *tool);
|
guint64 clutter_input_device_tool_get_serial (ClutterInputDeviceTool *tool);
|
||||||
|
Loading…
Reference in New Issue
Block a user