[eog] EogPrintPreview: Convert to G_DEFINE_TYPE_WITH_PRIVATE
- From: Felix Riemann <friemann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [eog] EogPrintPreview: Convert to G_DEFINE_TYPE_WITH_PRIVATE
- Date: Fri, 4 Oct 2013 13:27:16 +0000 (UTC)
commit ffc41379a0a3581672e40ae7da418188f99adce8
Author: Felix Riemann <friemann gnome org>
Date: Fri Oct 4 13:50:18 2013 +0200
EogPrintPreview: Convert to G_DEFINE_TYPE_WITH_PRIVATE
src/eog-print-preview.c | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/src/eog-print-preview.c b/src/eog-print-preview.c
index 190cc20..900e8ff 100644
--- a/src/eog-print-preview.c
+++ b/src/eog-print-preview.c
@@ -26,11 +26,6 @@
#include "eog-image.h"
#include "eog-print-preview.h"
-#define EOG_PRINT_PREVIEW_GET_PRIVATE(object) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((object), EOG_TYPE_PRINT_PREVIEW, EogPrintPreviewPrivate))
-
-G_DEFINE_TYPE (EogPrintPreview, eog_print_preview, GTK_TYPE_ASPECT_FRAME)
-
struct _EogPrintPreviewPrivate {
GtkWidget *area;
GdkPixbuf *image;
@@ -96,6 +91,8 @@ enum {
PROP_PAGE_BOTTOM_MARGIN
};
+G_DEFINE_TYPE_WITH_PRIVATE (EogPrintPreview, eog_print_preview, GTK_TYPE_ASPECT_FRAME)
+
static void eog_print_preview_draw (EogPrintPreview *preview, cairo_t *cr);
static void eog_print_preview_finalize (GObject *object);
static void update_relative_sizes (EogPrintPreview *preview);
@@ -402,8 +399,6 @@ eog_print_preview_class_init (EogPrintPreviewClass *klass)
G_SIGNAL_RUN_FIRST, 0, NULL, NULL,
g_cclosure_marshal_VOID__VOID, G_TYPE_NONE,
0, NULL);
-
- g_type_class_add_private (klass, sizeof (EogPrintPreviewPrivate));
}
static void
@@ -437,7 +432,7 @@ eog_print_preview_init (EogPrintPreview *preview)
EogPrintPreviewPrivate *priv;
gfloat ratio;
- priv = preview->priv = EOG_PRINT_PREVIEW_GET_PRIVATE (preview);
+ priv = preview->priv = eog_print_preview_get_instance_private (preview);
priv->area = GTK_WIDGET (gtk_drawing_area_new ());
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]