gucharmap r1718 - trunk/gucharmap

[chpe svn gnome org]

Author: chpe
Date: Fri Mar 21 11:01:33 2008
New Revision: 1718
URL: http://svn.gnome.org/viewvc/gucharmap?rev=1718&view=rev

Log:
Use gobject instance private data.


Modified:
   trunk/gucharmap/gucharmap-chapters-view.c
   trunk/gucharmap/gucharmap-chapters-view.h
   trunk/gucharmap/gucharmap-private.h
   trunk/gucharmap/gucharmap-types.h

Modified: trunk/gucharmap/gucharmap-chapters-view.c
==============================================================================
--- trunk/gucharmap/gucharmap-chapters-view.c	(original)
+++ trunk/gucharmap/gucharmap-chapters-view.c	Fri Mar 21 11:01:33 2008
@@ -24,6 +24,11 @@
 #include "gucharmap-private.h"
 #include "unicode-blocks.h"
 
+struct _GucharmapChaptersViewPrivate {
+  GtkTreeViewColumn *column;
+  GucharmapChaptersModel *model;
+};
+
 static void
 select_iter (GucharmapChaptersView *view,
              GtkTreeIter *iter)
@@ -44,13 +49,16 @@
 static void
 gucharmap_chapters_view_init (GucharmapChaptersView *view)
 {
+  GucharmapChaptersViewPrivate *priv;
   GtkTreeView *tree_view = GTK_TREE_VIEW (view);
   GtkCellRenderer *cell;
   GtkTreeViewColumn *column;
   GtkTreeSelection *selection;
 
+  priv = view->priv = G_TYPE_INSTANCE_GET_PRIVATE (view, GUCHARMAP_TYPE_CHAPTERS_VIEW, GucharmapChaptersViewPrivate);
+
   cell = gtk_cell_renderer_text_new ();
-  column = view->column = gtk_tree_view_column_new ();
+  column = priv->column = gtk_tree_view_column_new ();
   gtk_tree_view_column_pack_start (column, cell, FALSE);
   gtk_tree_view_column_add_attribute (column, cell, "text", CHAPTERS_LABEL_COL);
   gtk_tree_view_append_column (tree_view, column);
@@ -62,6 +70,7 @@
 static void
 gucharmap_chapters_view_class_init (GucharmapChaptersViewClass *klass)
 {
+  g_type_class_add_private (klass, sizeof (GucharmapChaptersViewPrivate));
 }
 
 G_DEFINE_TYPE (GucharmapChaptersView, gucharmap_chapters_view, GTK_TYPE_TREE_VIEW)
@@ -75,21 +84,24 @@
 GucharmapChaptersModel *
 gucharmap_chapters_view_get_model (GucharmapChaptersView *view)
 {
-  return view->model;
+  GucharmapChaptersViewPrivate *priv = view->priv;
+
+  return priv->model;
 }
 
 void
 gucharmap_chapters_view_set_model (GucharmapChaptersView *view,
                                    GucharmapChaptersModel *model)
 {
+  GucharmapChaptersViewPrivate *priv = view->priv;
   GtkTreeView *tree_view = GTK_TREE_VIEW (view);
 
-  view->model = model;
+  priv->model = model;
   gtk_tree_view_set_model (tree_view, GTK_TREE_MODEL (model));
   if (!model)
     return;
 
-  gtk_tree_view_column_set_title (view->column, gucharmap_chapters_model_get_title (model));
+  gtk_tree_view_column_set_title (priv->column, gucharmap_chapters_model_get_title (model));
 }
 
 /**
@@ -176,9 +188,10 @@
 gucharmap_chapters_view_set_selected (GucharmapChaptersView *view,
                                       const char        *name)
 {
+  GucharmapChaptersViewPrivate *priv = view->priv;
   GtkTreeIter iter;
 
-  if (!gucharmap_chapters_model_id_to_iter (view->model, name, &iter))
+  if (!gucharmap_chapters_model_id_to_iter (priv->model, name, &iter))
     return FALSE;
 
   select_iter (view, &iter);
@@ -196,6 +209,7 @@
 gucharmap_chapters_view_select_character (GucharmapChaptersView *view,
                                           gunichar           wc)
 {
+  GucharmapChaptersViewPrivate *priv = view->priv;
   GtkTreeIter iter;
 
   g_return_val_if_fail (GUCHARMAP_IS_CHAPTERS_VIEW (view), FALSE);
@@ -203,7 +217,7 @@
   if (wc > UNICHAR_MAX)
     return FALSE;
 
-  if (!gucharmap_chapters_model_character_to_iter (view->model, wc, &iter))
+  if (!gucharmap_chapters_model_character_to_iter (priv->model, wc, &iter))
     return FALSE;
 
   select_iter (view, &iter);
@@ -224,6 +238,7 @@
 GucharmapCodepointList * 
 gucharmap_chapters_view_get_codepoint_list (GucharmapChaptersView *view)
 {
+  GucharmapChaptersViewPrivate *priv = view->priv;
   GtkTreeSelection *selection;
   GtkTreeIter iter;
   
@@ -233,7 +248,7 @@
   if (!gtk_tree_selection_get_selected (selection, NULL, &iter))
     return NULL;
 
-  return gucharmap_chapters_model_get_codepoint_list (view->model, &iter);
+  return gucharmap_chapters_model_get_codepoint_list (priv->model, &iter);
 }
 
 /**
@@ -246,9 +261,11 @@
 G_CONST_RETURN GucharmapCodepointList * 
 gucharmap_chapters_view_get_book_codepoint_list (GucharmapChaptersView *view)
 {
+  GucharmapChaptersViewPrivate *priv = view->priv;
+
   g_return_val_if_fail (GUCHARMAP_IS_CHAPTERS_VIEW (view), NULL);
 
-  return gucharmap_chapters_model_get_book_codepoint_list (view->model);
+  return gucharmap_chapters_model_get_book_codepoint_list (priv->model);
 }
 
 gboolean

Modified: trunk/gucharmap/gucharmap-chapters-view.h
==============================================================================
--- trunk/gucharmap/gucharmap-chapters-view.h	(original)
+++ trunk/gucharmap/gucharmap-chapters-view.h	Fri Mar 21 11:01:33 2008
@@ -33,11 +33,28 @@
 
 #define GUCHARMAP_TYPE_CHAPTERS_VIEW             (gucharmap_chapters_view_get_type ())
 #define GUCHARMAP_CHAPTERS_VIEW(o)               (G_TYPE_CHECK_INSTANCE_CAST ((o), GUCHARMAP_TYPE_CHAPTERS_VIEW, GucharmapChaptersView))
-#define GUCHARMAP_CHAPTERS_VIEW_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GUCHARMAP_TYPE_CHAPTERS_VIEW, GucharmapChaptersViewClass))
+#define GUCHARMAP_CHAPTERS_VIEW_CLASS(k)         (G_TYPE_CHECK_CLASS_CAST((k), GUCHARMAP_TYPE_CHAPTERS_VIEW, GucharmapChaptersViewClass))
 #define GUCHARMAP_IS_CHAPTERS_VIEW(o)            (G_TYPE_CHECK_INSTANCE_TYPE ((o), GUCHARMAP_TYPE_CHAPTERS_VIEW))
 #define GUCHARMAP_IS_CHAPTERS_VIEW_CLASS(k)      (G_TYPE_CHECK_CLASS_TYPE ((k), GUCHARMAP_TYPE_CHAPTERS_VIEW))
 #define GUCHARMAP_CHAPTERS_VIEW_GET_CLASS(o)     (G_TYPE_INSTANCE_GET_CLASS ((o), GUCHARMAP_TYPE_CHAPTERS_VIEW, GucharmapChaptersViewClass))
 
+typedef struct _GucharmapChaptersView         GucharmapChaptersView;
+typedef struct _GucharmapChaptersViewPrivate  GucharmapChaptersViewPrivate;
+typedef struct _GucharmapChaptersViewClass    GucharmapChaptersViewClass;
+
+struct _GucharmapChaptersView
+{
+  GtkTreeView parent_instance;
+
+  /*< private >*/
+  GucharmapChaptersViewPrivate *priv;
+};
+
+struct _GucharmapChaptersViewClass
+{
+  GtkTreeViewClass parent_class;
+};
+
 GType       gucharmap_chapters_view_get_type (void);
 
 GtkWidget * gucharmap_chapters_view_new      (void);

Modified: trunk/gucharmap/gucharmap-private.h
==============================================================================
--- trunk/gucharmap/gucharmap-private.h	(original)
+++ trunk/gucharmap/gucharmap-private.h	Fri Mar 21 11:01:33 2008
@@ -65,21 +65,6 @@
 };
 
 
-struct _GucharmapChaptersView
-{
-  GtkTreeView parent_instance;
-
-  /*< private >*/
-  GtkTreeViewColumn *column;
-  GucharmapChaptersModel *model;
-};
-
-struct _GucharmapChaptersViewClass
-{
-  GtkTreeViewClass parent_class;
-};
-
-
 struct _GucharmapChartablePrivate {
   /* scrollable implementation */
   GtkAdjustment *vadjustment;

Modified: trunk/gucharmap/gucharmap-types.h
==============================================================================
--- trunk/gucharmap/gucharmap-types.h	(original)
+++ trunk/gucharmap/gucharmap-types.h	Fri Mar 21 11:01:33 2008
@@ -33,9 +33,6 @@
 typedef struct _GucharmapCodepointList GucharmapCodepointList;
 typedef struct _GucharmapCodepointListClass GucharmapCodepointListClass;
 
-typedef struct _GucharmapChaptersView GucharmapChaptersView;
-typedef struct _GucharmapChaptersViewClass GucharmapChaptersViewClass;
-
 typedef struct _GucharmapChaptersModel GucharmapChaptersModel;
 typedef struct _GucharmapChaptersModelClass GucharmapChaptersModelClass;