aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui/minicard/e-reflow.c
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@helixcode.com>2000-04-09 06:18:26 +0800
committerChris Lahey <clahey@src.gnome.org>2000-04-09 06:18:26 +0800
commita09c52cdf9328ff9ddb64f727a06fe5d92d37b46 (patch)
tree4493d993c17b8bc6c792e24345e7bbe7e14ce84e /addressbook/gui/minicard/e-reflow.c
parent58e7df4e0376d1248ced78659d27d61adc1434b9 (diff)
downloadgsoc2013-evolution-a09c52cdf9328ff9ddb64f727a06fe5d92d37b46.tar
gsoc2013-evolution-a09c52cdf9328ff9ddb64f727a06fe5d92d37b46.tar.gz
gsoc2013-evolution-a09c52cdf9328ff9ddb64f727a06fe5d92d37b46.tar.bz2
gsoc2013-evolution-a09c52cdf9328ff9ddb64f727a06fe5d92d37b46.tar.lz
gsoc2013-evolution-a09c52cdf9328ff9ddb64f727a06fe5d92d37b46.tar.xz
gsoc2013-evolution-a09c52cdf9328ff9ddb64f727a06fe5d92d37b46.tar.zst
gsoc2013-evolution-a09c52cdf9328ff9ddb64f727a06fe5d92d37b46.zip
CVS move mistake. Fixed the correct changes in the correct places.
2000-04-08 Christopher James Lahey <clahey@helixcode.com> * addressbook/gui/minicard/.cvsignore, addressbook/gui/minicard/Makefile.am, addressbook/gui/minicard/e-minicard-view.c, addressbook/gui/minicard/e-minicard-view.h, addressbook/gui/minicard/e-minicard.c, addressbook/gui/minicard/e-minicard.h, addressbook/gui/minicard/e-reflow-sorted.c, addressbook/gui/minicard/e-reflow-sorted.h, addressbook/gui/minicard/e-reflow.c, addressbook/gui/minicard/e-reflow.h, addressbook/gui/minicard/test-minicard-view.c, addressbook/gui/minicard/test-reflow.c, widgets/e-minicard/.cvsignore, widgets/e-minicard/Makefile.am, widgets/e-minicard/e-minicard-label.c, widgets/e-minicard/e-minicard-label.h, widgets/e-minicard/e-minicard-view.c, widgets/e-minicard/e-minicard-view.h, widgets/e-minicard/e-minicard.c, widgets/e-minicard/e-minicard.h, widgets/e-minicard/e-reflow-sorted.c, widgets/e-minicard/e-reflow-sorted.h, widgets/e-minicard/e-reflow.c, widgets/e-minicard/e-reflow.h, widgets/e-minicard/test-minicard-label.c, widgets/e-minicard/test-minicard-view.c, widgets/e-minicard/test-minicard.c, widgets/e-minicard/test-reflow.c: CVS move mistake. Fixed the correct changes in the correct places. svn path=/trunk/; revision=2344
Diffstat (limited to 'addressbook/gui/minicard/e-reflow.c')
-rw-r--r--addressbook/gui/minicard/e-reflow.c36
1 files changed, 28 insertions, 8 deletions
diff --git a/addressbook/gui/minicard/e-reflow.c b/addressbook/gui/minicard/e-reflow.c
index 4af46bd4a4..0ff8c0f4ea 100644
--- a/addressbook/gui/minicard/e-reflow.c
+++ b/addressbook/gui/minicard/e-reflow.c
@@ -26,10 +26,11 @@
#include "e-canvas-utils.h"
#include "e-canvas.h"
#include "e-util.h"
-static void e_reflow_init (EReflow *card);
+static void e_reflow_init (EReflow *reflow);
static void e_reflow_class_init (EReflowClass *klass);
static void e_reflow_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
static void e_reflow_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
+static void e_reflow_destroy (GtkObject *object);
static gboolean e_reflow_event (GnomeCanvasItem *item, GdkEvent *event);
static void e_reflow_realize (GnomeCanvasItem *item);
static void e_reflow_unrealize (GnomeCanvasItem *item);
@@ -38,6 +39,7 @@ static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
static void e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gint flags);
static double e_reflow_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, GnomeCanvasItem **actual_item);
static void e_reflow_reflow (GnomeCanvasItem *item, int flags);
+static void e_reflow_real_add_item(EReflow *e_reflow, GnomeCanvasItem *item);
static void e_reflow_resize_children (GnomeCanvasItem *item);
@@ -97,10 +99,12 @@ e_reflow_class_init (EReflowClass *klass)
GTK_ARG_READABLE, ARG_WIDTH);
gtk_object_add_arg_type ("EReflow::height", GTK_TYPE_DOUBLE,
GTK_ARG_READWRITE, ARG_HEIGHT);
+
+ klass->add_item = e_reflow_real_add_item;
- object_class->set_arg = e_reflow_set_arg;
- object_class->get_arg = e_reflow_get_arg;
- /* object_class->destroy = e_reflow_destroy; */
+ object_class->set_arg = e_reflow_set_arg;
+ object_class->get_arg = e_reflow_get_arg;
+ object_class->destroy = e_reflow_destroy;
/* GnomeCanvasItem method overrides */
item_class->event = e_reflow_event;
@@ -114,7 +118,6 @@ e_reflow_class_init (EReflowClass *klass)
static void
e_reflow_init (EReflow *reflow)
{
- /* reflow->card = NULL;*/
reflow->items = NULL;
reflow->columns = NULL;
reflow->column_width = 150;
@@ -181,6 +184,14 @@ e_reflow_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
}
static void
+e_reflow_destroy (GtkObject *object)
+{
+ EReflow *reflow = E_REFLOW(object);
+
+ g_list_free(reflow->items);
+}
+
+static void
e_reflow_realize (GnomeCanvasItem *item)
{
EReflow *e_reflow;
@@ -228,9 +239,11 @@ e_reflow_unrealize (GnomeCanvasItem *item)
gdk_cursor_destroy (e_reflow->arrow_cursor);
gdk_cursor_destroy (e_reflow->default_cursor);
+ e_reflow->arrow_cursor = NULL;
+ e_reflow->default_cursor = NULL;
- g_list_free (e_reflow->items);
g_list_free (e_reflow->columns);
+ e_reflow->columns = NULL;
if (GNOME_CANVAS_ITEM_CLASS(parent_class)->unrealize)
(* GNOME_CANVAS_ITEM_CLASS(parent_class)->unrealize) (item);
@@ -428,8 +441,8 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
return 0;
}
-void
-e_reflow_add_item(EReflow *e_reflow, GnomeCanvasItem *item)
+static void
+e_reflow_real_add_item(EReflow *e_reflow, GnomeCanvasItem *item)
{
e_reflow->items = g_list_append(e_reflow->items, item);
if ( GTK_OBJECT_FLAGS( e_reflow ) & GNOME_CANVAS_ITEM_REALIZED ) {
@@ -747,3 +760,10 @@ e_reflow_reflow( GnomeCanvasItem *item, int flags )
e_canvas_item_request_parent_reflow(item);
}
}
+
+void
+e_reflow_add_item(EReflow *e_reflow, GnomeCanvasItem *item)
+{
+ if (E_REFLOW_CLASS(GTK_OBJECT(e_reflow)->klass)->add_item)
+ (E_REFLOW_CLASS(GTK_OBJECT(e_reflow)->klass)->add_item) (e_reflow, item);
+}