[eog] EogThumbNav: Convert to G_DEFINE_TYPE_WITH_PRIVATE
- From: Felix Riemann <friemann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [eog] EogThumbNav: Convert to G_DEFINE_TYPE_WITH_PRIVATE
- Date: Fri, 4 Oct 2013 13:27:01 +0000 (UTC)
commit dba0bd4c7bae69ae7911cd34425ee0ee89223767
Author: Felix Riemann <friemann gnome org>
Date: Fri Oct 4 13:48:48 2013 +0200
EogThumbNav: Convert to G_DEFINE_TYPE_WITH_PRIVATE
src/eog-thumb-nav.c | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/src/eog-thumb-nav.c b/src/eog-thumb-nav.c
index f5e1335..1c9473b 100644
--- a/src/eog-thumb-nav.c
+++ b/src/eog-thumb-nav.c
@@ -33,11 +33,6 @@
#include <math.h>
#include <string.h>
-#define EOG_THUMB_NAV_GET_PRIVATE(object) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((object), EOG_TYPE_THUMB_NAV, EogThumbNavPrivate))
-
-G_DEFINE_TYPE (EogThumbNav, eog_thumb_nav, GTK_TYPE_BOX);
-
#define EOG_THUMB_NAV_SCROLL_INC 20
#define EOG_THUMB_NAV_SCROLL_MOVE 20
#define EOG_THUMB_NAV_SCROLL_TIMEOUT 20
@@ -65,6 +60,8 @@ struct _EogThumbNavPrivate {
GtkAdjustment *adj;
};
+G_DEFINE_TYPE_WITH_PRIVATE (EogThumbNav, eog_thumb_nav, GTK_TYPE_BOX);
+
static gboolean
eog_thumb_nav_scroll_event (GtkWidget *widget, GdkEventScroll *event, gpointer user_data)
{
@@ -123,7 +120,7 @@ eog_thumb_nav_adj_changed (GtkAdjustment *adj, gpointer user_data)
gboolean ltr;
nav = EOG_THUMB_NAV (user_data);
- priv = EOG_THUMB_NAV_GET_PRIVATE (nav);
+ priv = eog_thumb_nav_get_instance_private (nav);
ltr = gtk_widget_get_direction (priv->sw) == GTK_TEXT_DIR_LTR;
gtk_widget_set_sensitive (ltr ? priv->button_right : priv->button_left,
@@ -140,7 +137,7 @@ eog_thumb_nav_adj_value_changed (GtkAdjustment *adj, gpointer user_data)
gboolean ltr;
nav = EOG_THUMB_NAV (user_data);
- priv = EOG_THUMB_NAV_GET_PRIVATE (nav);
+ priv = eog_thumb_nav_get_instance_private (nav);
ltr = gtk_widget_get_direction (priv->sw) == GTK_TEXT_DIR_LTR;
gtk_widget_set_sensitive (ltr ? priv->button_left : priv->button_right,
@@ -335,8 +332,6 @@ eog_thumb_nav_class_init (EogThumbNavClass *class)
EOG_THUMB_NAV_MODE_MULTIPLE_ROWS,
EOG_THUMB_NAV_MODE_ONE_ROW,
(G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
- g_type_class_add_private (g_object_class, sizeof (EogThumbNavPrivate));
}
static void
@@ -348,7 +343,7 @@ eog_thumb_nav_init (EogThumbNav *nav)
gtk_orientable_set_orientation (GTK_ORIENTABLE (nav),
GTK_ORIENTATION_HORIZONTAL);
- nav->priv = EOG_THUMB_NAV_GET_PRIVATE (nav);
+ nav->priv = eog_thumb_nav_get_instance_private (nav);
priv = nav->priv;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]