[gtk] cell renderer accel: Make final
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk] cell renderer accel: Make final
- Date: Mon, 27 May 2019 00:03:27 +0000 (UTC)
commit 0b65c4476d2fc72043b72fa9c145579e47f1824c
Author: Matthias Clasen <mclasen redhat com>
Date: Sun May 26 19:47:04 2019 -0400
cell renderer accel: Make final
gtk/gtkcellrendereraccel.c | 32 ++++++++++++++++++++++++++++++++
gtk/gtkcellrendereraccel.h | 36 +-----------------------------------
2 files changed, 33 insertions(+), 35 deletions(-)
---
diff --git a/gtk/gtkcellrendereraccel.c b/gtk/gtkcellrendereraccel.c
index 14a669b431..de2a6e161e 100644
--- a/gtk/gtkcellrendereraccel.c
+++ b/gtk/gtkcellrendereraccel.c
@@ -87,6 +87,38 @@ enum {
static guint signals[LAST_SIGNAL] = { 0 };
+typedef struct _GtkCellRendererAccelPrivate GtkCellRendererAccelPrivate;
+typedef struct _GtkCellRendererAccelClass GtkCellRendererAccelClass;
+
+struct _GtkCellRendererAccel
+{
+ GtkCellRendererText parent;
+
+ /*< private >*/
+ GtkCellRendererAccelPrivate *priv;
+};
+
+struct _GtkCellRendererAccelClass
+{
+ GtkCellRendererTextClass parent_class;
+
+ void (* accel_edited) (GtkCellRendererAccel *accel,
+ const gchar *path_string,
+ guint accel_key,
+ GdkModifierType accel_mods,
+ guint hardware_keycode);
+
+ void (* accel_cleared) (GtkCellRendererAccel *accel,
+ const gchar *path_string);
+
+ /* Padding for future expansion */
+ void (*_gtk_reserved0) (void);
+ void (*_gtk_reserved1) (void);
+ void (*_gtk_reserved2) (void);
+ void (*_gtk_reserved3) (void);
+ void (*_gtk_reserved4) (void);
+};
+
struct _GtkCellRendererAccelPrivate
{
GtkWidget *sizing_label;
diff --git a/gtk/gtkcellrendereraccel.h b/gtk/gtkcellrendereraccel.h
index 6d7b42007b..ea7e4d997c 100644
--- a/gtk/gtkcellrendereraccel.h
+++ b/gtk/gtkcellrendereraccel.h
@@ -28,14 +28,9 @@ G_BEGIN_DECLS
#define GTK_TYPE_CELL_RENDERER_ACCEL (gtk_cell_renderer_accel_get_type ())
#define GTK_CELL_RENDERER_ACCEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccel))
-#define GTK_CELL_RENDERER_ACCEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccelClass))
#define GTK_IS_CELL_RENDERER_ACCEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
GTK_TYPE_CELL_RENDERER_ACCEL))
-#define GTK_IS_CELL_RENDERER_ACCEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
GTK_TYPE_CELL_RENDERER_ACCEL))
-#define GTK_CELL_RENDERER_ACCEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccelClass))
-typedef struct _GtkCellRendererAccel GtkCellRendererAccel;
-typedef struct _GtkCellRendererAccelPrivate GtkCellRendererAccelPrivate;
-typedef struct _GtkCellRendererAccelClass GtkCellRendererAccelClass;
+typedef struct _GtkCellRendererAccel GtkCellRendererAccel;
/**
* GtkCellRendererAccelMode:
@@ -54,35 +49,6 @@ typedef enum
} GtkCellRendererAccelMode;
-struct _GtkCellRendererAccel
-{
- GtkCellRendererText parent;
-
- /*< private >*/
- GtkCellRendererAccelPrivate *priv;
-};
-
-struct _GtkCellRendererAccelClass
-{
- GtkCellRendererTextClass parent_class;
-
- void (* accel_edited) (GtkCellRendererAccel *accel,
- const gchar *path_string,
- guint accel_key,
- GdkModifierType accel_mods,
- guint hardware_keycode);
-
- void (* accel_cleared) (GtkCellRendererAccel *accel,
- const gchar *path_string);
-
- /* Padding for future expansion */
- void (*_gtk_reserved0) (void);
- void (*_gtk_reserved1) (void);
- void (*_gtk_reserved2) (void);
- void (*_gtk_reserved3) (void);
- void (*_gtk_reserved4) (void);
-};
-
GDK_AVAILABLE_IN_ALL
GType gtk_cell_renderer_accel_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_ALL
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]