Wed Oct 25 20:47:41 2000 Tim Janik <timj@gtk.org> * gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init): urg, removed implementation of gtk_marshal_VOID__INT_INT_INT_INT. if people do that, couldn't they at least give it a non-standard name? * gtk/gtktextlayout.c: arg! yet another implementation of gtk_marshal_VOID__INT_INT_INT_INT(), is this a conspiracy? * gtk/gtktextbuffer.c: gotcha! captured a vagabonding gtk_marshal_VOID__INT_POINTER_INT() implementation, braught it back home. now i know this _is_ a conspiracy. * gtk/gtkwidget.c (gtk_widget_class_init): marshaller fixups for ::state-changed. * gtk/gtkaccelgroup.c (gtk_accel_group_create_remove): (gtk_accel_group_create_add): marshaller signature fixups. * gtk/gtklistitem.c (gtk_list_item_class_init): signal creation fixups, pass in GTK_TYPE_SCROLL_TYPE instead of GTK_TYPE_ENUM. * gtk/gtkobject.[hc]: removed GTK_CONNECTED flag, it's not valid anymore. Tue Oct 24 23:59:21 2000 Tim Janik <timj@gtk.org> * docs/reference/Makefile.am: disabled SUBDIRS for the moment, since due to the signal system changes, it wouldn't build currently. to be fixed soon. * docs/Changes-2.0.txt: GtkSignal/GSignal updates. * gtk/gtkwidget.c: ::direction_changed takes an enum as argument, so it needs gtk_marshal_VOID__ENUM() instead of gtk_marshal_NONE__UINT(). * gdk/gdk*.c: adapted type registration functions. * gtk/gtkbindings.c: * gtk/gtkaccelgroup.c: operate on GSignalQuery, GtkSignalQuery is gone. * gtk/gtkenums.h: define GtkSignalRunType in terms of GSignalType. * gtk/gtkobject.c: (gtk_object_destroy): (gtk_object_shutdown): fixed recursion guards. basically we have to catch the case where any of GObject.shutdown() or gtk_object_destroy() is called during ::destroy, and avoid recursion there. * gtk/gtktypeutils.c: * gtk/maketypes.awk: awk-script hackup to provide gtk_type_init() with boxed_copy/boxed_free. this needs a more general solution based on a publically installed code-generator utility. * gtk/gtktypeutils.[hc]: compat aliased GTK_TYPE_BOXED to G_TYPE_BOXED, glib's gobject has support for that now. define GtkSignalMarshaller in terms of GSignalCMarshaller. Mon Oct 23 09:36:42 2000 Tim Janik <timj@gtk.org> * gtk/gtksignal.[hc]: * gtk/gtkmarshal.[hc]: * gtk/Makefile.am: generate marshallers with glib-genmarshal and don't compile gtkmarshal.c on its own anymore, just include it in gtksignal.c. removed #include <gtkmarshal.h>s all over the place, gtksignal.h takes care of that. * *.c: marshaller name fixups. * gtk/gtkmarshal.list: added a comment briefing the format. Sun Oct 22 23:14:39 2000 Tim Janik <timj@gtk.org> * gtk/gtksignal.[hc]: nuked old implementation. we mostly have compatibility macros here now. more specifically, most of the API is preserved (yes, _most_, nonwithstanding the following exceptions listed, the API is stil lHUGE ;) things that got removed completely: GtkSignalQuery, gtk_signal_query(), gtk_signal_n_emissions(), gtk_signal_n_emissions_by_name(), gtk_signal_handlers_destroy(), gtk_signal_set_funcs(), gtk_signal_handler_pending_by_id(), gtk_signal_add_emission_hook(), gtk_signal_add_emission_hook_full(), gtk_signal_remove_emission_hook(). non-functional functions variants: gtk_signal_add_emission_hook(), gtk_signal_remove_emission_hook(). the GtkCallbackMarshal argument to gtk_signal_connect_full() is not supported anymore. (gtk_signal_compat_matched): new internal function to aid implementation of the compatibility macros, it provides functionality to block/unblock/disconnect handlers based on func/data. * gtk/gtkenums.h: define GtkSignalRunType in terms of GSignalType, * *.c: adaptions to new type registration API signatures. Fri Oct 20 15:26:33 2000 Tim Janik <timj@gtk.org> * gtk/gtktypeutils.[hc]: removed G_TYPE_GTK_POINTER cludge.
		
			
				
	
	
		
			269 lines
		
	
	
		
			6.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			269 lines
		
	
	
		
			6.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/* gtkcellrenderer.c
 | 
						|
 * Copyright (C) 2000  Red Hat, Inc. Jonathan Blandford
 | 
						|
 *
 | 
						|
 * This library is free software; you can redistribute it and/or
 | 
						|
 * modify it under the terms of the GNU Library General Public
 | 
						|
 * License as published by the Free Software Foundation; either
 | 
						|
 * version 2 of the License, or (at your option) any later version.
 | 
						|
 *
 | 
						|
 * This library is distributed in the hope that it will be useful,
 | 
						|
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | 
						|
 * Library General Public License for more details.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU Library General Public
 | 
						|
 * License along with this library; if not, write to the
 | 
						|
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 | 
						|
 * Boston, MA 02111-1307, USA.
 | 
						|
 */
 | 
						|
 | 
						|
#include "gtkcellrenderer.h"
 | 
						|
 | 
						|
#ifndef _
 | 
						|
#define _(x) x
 | 
						|
#endif
 | 
						|
 | 
						|
static void gtk_cell_renderer_init       (GtkCellRenderer      *cell);
 | 
						|
static void gtk_cell_renderer_class_init (GtkCellRendererClass *class);
 | 
						|
static void gtk_cell_renderer_get_param  (GObject              *object,
 | 
						|
					  guint                 param_id,
 | 
						|
					  GValue               *value,
 | 
						|
					  GParamSpec           *pspec,
 | 
						|
					  const gchar          *trailer);
 | 
						|
static void gtk_cell_renderer_set_param  (GObject              *object,
 | 
						|
					  guint                 param_id,
 | 
						|
					  GValue               *value,
 | 
						|
					  GParamSpec           *pspec,
 | 
						|
					  const gchar          *trailer);
 | 
						|
 | 
						|
 | 
						|
enum {
 | 
						|
  PROP_ZERO,
 | 
						|
  PROP_XALIGN,
 | 
						|
  PROP_YALIGN,
 | 
						|
  PROP_XPAD,
 | 
						|
  PROP_YPAD
 | 
						|
};
 | 
						|
 | 
						|
 | 
						|
GtkType
 | 
						|
gtk_cell_renderer_get_type (void)
 | 
						|
{
 | 
						|
  static GtkType cell_type = 0;
 | 
						|
 | 
						|
  if (!cell_type)
 | 
						|
    {
 | 
						|
      static const GTypeInfo cell_info =
 | 
						|
      {
 | 
						|
        sizeof (GtkCellRendererClass),
 | 
						|
	NULL,		/* base_init */
 | 
						|
	NULL,		/* base_finalize */
 | 
						|
        (GClassInitFunc) gtk_cell_renderer_class_init,
 | 
						|
	NULL,		/* class_finalize */
 | 
						|
	NULL,		/* class_data */
 | 
						|
        sizeof (GtkCellRenderer),
 | 
						|
	0,
 | 
						|
        (GInstanceInitFunc) gtk_cell_renderer_init,
 | 
						|
      };
 | 
						|
 | 
						|
      cell_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkCellRenderer", &cell_info, 0);
 | 
						|
    }
 | 
						|
 | 
						|
  return cell_type;
 | 
						|
}
 | 
						|
 | 
						|
static void
 | 
						|
gtk_cell_renderer_init (GtkCellRenderer *cell)
 | 
						|
{
 | 
						|
  cell->xpad = 0;
 | 
						|
  cell->ypad = 0;
 | 
						|
  cell->xalign = 0.5;
 | 
						|
  cell->yalign = 0.5;
 | 
						|
}
 | 
						|
 | 
						|
static void
 | 
						|
gtk_cell_renderer_class_init (GtkCellRendererClass *class)
 | 
						|
{
 | 
						|
  GObjectClass *object_class = G_OBJECT_CLASS (class);
 | 
						|
 | 
						|
  object_class->get_param = gtk_cell_renderer_get_param;
 | 
						|
  object_class->set_param = gtk_cell_renderer_set_param;
 | 
						|
 | 
						|
  class->render = NULL;
 | 
						|
  class->get_size = NULL;
 | 
						|
 | 
						|
 | 
						|
  g_object_class_install_param (object_class,
 | 
						|
				PROP_XALIGN,
 | 
						|
				g_param_spec_float ("xalign",
 | 
						|
						    _("xalign"),
 | 
						|
						    _("The x-align."),
 | 
						|
						    0.0,
 | 
						|
						    1.0,
 | 
						|
						    0.0,
 | 
						|
						    G_PARAM_READABLE |
 | 
						|
						    G_PARAM_WRITABLE));
 | 
						|
 | 
						|
  g_object_class_install_param (object_class,
 | 
						|
				PROP_YALIGN,
 | 
						|
				g_param_spec_float ("yalign",
 | 
						|
						    _("yalign"),
 | 
						|
						    _("The y-align."),
 | 
						|
						    0.0,
 | 
						|
						    1.0,
 | 
						|
						    0.5,
 | 
						|
						    G_PARAM_READABLE |
 | 
						|
						    G_PARAM_WRITABLE));
 | 
						|
 | 
						|
  g_object_class_install_param (object_class,
 | 
						|
				PROP_XPAD,
 | 
						|
				g_param_spec_uint ("xpad",
 | 
						|
						   _("xpad"),
 | 
						|
						   _("The xpad."),
 | 
						|
						   0,
 | 
						|
						   100,
 | 
						|
						   2,
 | 
						|
						   G_PARAM_READABLE |
 | 
						|
						   G_PARAM_WRITABLE));
 | 
						|
 | 
						|
  g_object_class_install_param (object_class,
 | 
						|
				PROP_YPAD,
 | 
						|
				g_param_spec_uint ("ypad",
 | 
						|
						   _("ypad"),
 | 
						|
						   _("The ypad."),
 | 
						|
						   0,
 | 
						|
						   100,
 | 
						|
						   2,
 | 
						|
						   G_PARAM_READABLE |
 | 
						|
						   G_PARAM_WRITABLE));
 | 
						|
}
 | 
						|
 | 
						|
static void
 | 
						|
gtk_cell_renderer_get_param (GObject     *object,
 | 
						|
			     guint        param_id,
 | 
						|
			     GValue      *value,
 | 
						|
			     GParamSpec  *pspec,
 | 
						|
			     const gchar *trailer)
 | 
						|
{
 | 
						|
  GtkCellRenderer *cell = GTK_CELL_RENDERER (object);
 | 
						|
 | 
						|
  switch (param_id)
 | 
						|
    {
 | 
						|
    case PROP_XALIGN:
 | 
						|
      g_value_init (value, G_TYPE_FLOAT);
 | 
						|
      g_value_set_float (value, cell->xalign);
 | 
						|
      break;
 | 
						|
    case PROP_YALIGN:
 | 
						|
      g_value_init (value, G_TYPE_FLOAT);
 | 
						|
      g_value_set_float (value, cell->yalign);
 | 
						|
      break;
 | 
						|
    case PROP_XPAD:
 | 
						|
      g_value_init (value, G_TYPE_INT);
 | 
						|
      g_value_set_float (value, cell->xpad);
 | 
						|
      break;
 | 
						|
    case PROP_YPAD:
 | 
						|
      g_value_init (value, G_TYPE_INT);
 | 
						|
      g_value_set_float (value, cell->ypad);
 | 
						|
      break;
 | 
						|
    default:
 | 
						|
      break;
 | 
						|
    }
 | 
						|
 | 
						|
}
 | 
						|
 | 
						|
static void
 | 
						|
gtk_cell_renderer_set_param (GObject     *object,
 | 
						|
			     guint        param_id,
 | 
						|
			     GValue      *value,
 | 
						|
			     GParamSpec  *pspec,
 | 
						|
			     const gchar *trailer)
 | 
						|
{
 | 
						|
  GtkCellRenderer *cell = GTK_CELL_RENDERER (object);
 | 
						|
 | 
						|
  switch (param_id)
 | 
						|
    {
 | 
						|
    case PROP_XALIGN:
 | 
						|
      cell->xalign = g_value_get_float (value);
 | 
						|
      break;
 | 
						|
    case PROP_YALIGN:
 | 
						|
      cell->yalign = g_value_get_float (value);
 | 
						|
      break;
 | 
						|
    case PROP_XPAD:
 | 
						|
      cell->xpad = g_value_get_int (value);
 | 
						|
      break;
 | 
						|
    case PROP_YPAD:
 | 
						|
      cell->ypad = g_value_get_int (value);
 | 
						|
      break;
 | 
						|
    default:
 | 
						|
      break;
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
void
 | 
						|
gtk_cell_renderer_get_size (GtkCellRenderer *cell,
 | 
						|
			    GtkWidget *widget,
 | 
						|
			    gint      *width,
 | 
						|
			    gint      *height)
 | 
						|
{
 | 
						|
  /* It's actually okay to pass in a NULL cell, as we run into that
 | 
						|
   * a lot */
 | 
						|
  if (cell == NULL)
 | 
						|
    return;
 | 
						|
  g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
 | 
						|
  g_return_if_fail (GTK_CELL_RENDERER_GET_CLASS (cell)->get_size != NULL);
 | 
						|
 | 
						|
  GTK_CELL_RENDERER_GET_CLASS (cell)->get_size (cell, widget, width, height);
 | 
						|
}
 | 
						|
 | 
						|
void
 | 
						|
gtk_cell_renderer_render (GtkCellRenderer *cell,
 | 
						|
			  GdkWindow       *window,
 | 
						|
			  GtkWidget       *widget,
 | 
						|
			  GdkRectangle    *background_area,
 | 
						|
			  GdkRectangle    *cell_area,
 | 
						|
			  GdkRectangle    *expose_area,
 | 
						|
			  guint            flags)
 | 
						|
{
 | 
						|
  /* It's actually okay to pass in a NULL cell, as we run into that
 | 
						|
   * a lot */
 | 
						|
  if (cell == NULL)
 | 
						|
    return;
 | 
						|
  g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
 | 
						|
  g_return_if_fail (GTK_CELL_RENDERER_GET_CLASS (cell)->render != NULL);
 | 
						|
 | 
						|
  GTK_CELL_RENDERER_GET_CLASS (cell)->render (cell,
 | 
						|
					      window,
 | 
						|
					      widget,
 | 
						|
					      background_area,
 | 
						|
					      cell_area,
 | 
						|
					      expose_area,
 | 
						|
					      flags);
 | 
						|
}
 | 
						|
 | 
						|
gint
 | 
						|
gtk_cell_renderer_event (GtkCellRenderer *cell,
 | 
						|
			 GdkEvent        *event,
 | 
						|
			 GtkWidget       *widget,
 | 
						|
			 gchar           *path,
 | 
						|
			 GdkRectangle    *background_area,
 | 
						|
			 GdkRectangle    *cell_area,
 | 
						|
			 guint            flags)
 | 
						|
{
 | 
						|
  /* It's actually okay to pass in a NULL cell, as we run into that
 | 
						|
   * a lot */
 | 
						|
  if (cell == NULL)
 | 
						|
    return FALSE;
 | 
						|
  g_return_val_if_fail (GTK_IS_CELL_RENDERER (cell), FALSE);
 | 
						|
  if (GTK_CELL_RENDERER_GET_CLASS (cell)->event == NULL)
 | 
						|
    return FALSE;
 | 
						|
 | 
						|
  return GTK_CELL_RENDERER_GET_CLASS (cell)->event (cell,
 | 
						|
						    event,
 | 
						|
						    widget,
 | 
						|
						    path,
 | 
						|
						    background_area,
 | 
						|
						    cell_area,
 | 
						|
						    flags);
 | 
						|
}
 | 
						|
 |