diff options
| author | Alexander Valavanis <valavanisalex@gmail.com> | 2018-11-25 00:17:57 +0000 |
|---|---|---|
| committer | Alexander Valavanis <valavanisalex@gmail.com> | 2018-11-25 00:17:57 +0000 |
| commit | d67cdd84c7e7e1fb97ca6fdc79b6ad447868df9c (patch) | |
| tree | 17a633f9a8c7172b2841abfa597eebc8428a21d9 /src/widgets | |
| parent | Fix type in CLI description (diff) | |
| download | inkscape-d67cdd84c7e7e1fb97ca6fdc79b6ad447868df9c.tar.gz inkscape-d67cdd84c7e7e1fb97ca6fdc79b6ad447868df9c.zip | |
widgets/gimp/ruler: Replace deprecated g_type_class_add_private
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/gimp/ruler.cpp | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/src/widgets/gimp/ruler.cpp b/src/widgets/gimp/ruler.cpp index a0dd19dc5..470cf44f0 100644 --- a/src/widgets/gimp/ruler.cpp +++ b/src/widgets/gimp/ruler.cpp @@ -85,7 +85,7 @@ public: }; #define SP_RULER_GET_PRIVATE(ruler) \ - G_TYPE_INSTANCE_GET_PRIVATE (ruler, SP_TYPE_RULER, SPRulerPrivate) + reinterpret_cast<SPRulerPrivate *>(sp_ruler_get_instance_private (ruler)) struct SPRulerMetric @@ -149,7 +149,7 @@ static PangoLayout * sp_ruler_get_layout (GtkWidget *widget, const gchar *text); -G_DEFINE_TYPE (SPRuler, sp_ruler, GTK_TYPE_WIDGET) +G_DEFINE_TYPE_WITH_PRIVATE (SPRuler, sp_ruler, GTK_TYPE_WIDGET) #define parent_class sp_ruler_parent_class @@ -179,9 +179,6 @@ sp_ruler_class_init (SPRulerClass *klass) widget_class->draw = sp_ruler_draw; widget_class->motion_notify_event = sp_ruler_motion_notify; - g_type_class_add_private (object_class, sizeof (SPRulerPrivate)); - - g_object_class_install_property (object_class, PROP_ORIENTATION, g_param_spec_enum ("orientation", @@ -522,7 +519,8 @@ sp_ruler_unrealize(GtkWidget *widget) static void sp_ruler_map (GtkWidget *widget) { - SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget); + SPRuler *ruler = SP_RULER (widget); + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); GTK_WIDGET_CLASS (sp_ruler_parent_class)->map (widget); @@ -533,7 +531,8 @@ sp_ruler_map (GtkWidget *widget) static void sp_ruler_unmap (GtkWidget *widget) { - SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget); + SPRuler *ruler = SP_RULER (widget); + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); if (priv->input_window) gdk_window_hide (priv->input_window); @@ -572,10 +571,11 @@ static void sp_ruler_size_request (GtkWidget *widget, GtkRequisition *requisition) { - SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget); - PangoLayout *layout; - PangoRectangle ink_rect; - gint size; + SPRuler *ruler = SP_RULER (widget); + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); + PangoLayout *layout; + PangoRectangle ink_rect; + gint size; layout = sp_ruler_get_layout (widget, "0123456789"); pango_layout_get_pixel_extents (layout, &ink_rect, nullptr); @@ -607,7 +607,8 @@ sp_ruler_size_request (GtkWidget *widget, static void sp_ruler_style_updated (GtkWidget *widget) { - SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget); + SPRuler *ruler = SP_RULER (widget); + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); GTK_WIDGET_CLASS (sp_ruler_parent_class)->style_updated (widget); @@ -1407,7 +1408,8 @@ static PangoLayout* sp_ruler_create_layout (GtkWidget *widget, const gchar *text) { - SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget); + SPRuler *ruler = SP_RULER (widget); + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); PangoLayout *layout; PangoAttrList *attrs; PangoAttribute *attr; @@ -1431,7 +1433,8 @@ static PangoLayout * sp_ruler_get_layout (GtkWidget *widget, const gchar *text) { - SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget); + SPRuler *ruler = SP_RULER (widget); + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); if (priv->layout) { |