callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename some stuff:

Browse Source 
2001-01-04  Havoc Pennington  <hp@redhat.com>

        Rename some stuff:

	s/gtk_tree_view_column_set_size/gtk_tree_view_column_set_width/g;

	s/GtkModelSimple/GtkTreeModelSimple/g;
	s/GTK_MODEL_SIMPLE/GTK_TREE_MODEL_SIMPLE/g;
	s/gtk_model_simple/gtk_tree_model_simple/g;
	s/gtkmodelsimple/gtktreemodelsimple/g;

	s/gtk_tree_view_column_set_header_active/gtk_tree_view_column_set_header_clickable/g;

	s/GtkTreeViewColumnType/GtkTreeViewColumnSizing/g;
	s/column_set_col_type/column_set_sizing/g;

	s/GtkTreeSelectionType/GtkTreeSelectionMode/g;
	s/gtk_tree_selection_set_type/gtk_tree_selection_set_mode/g;

	s/GtkCellRendererType/GtkCellRendererState/g;

	* gtk/gtkcellrenderertoggle.c: remove _ macro, include gtkintl.h
	(gtk_cell_renderer_toggle_class_init): change "state" property to
	"active", to match GtkToggleButton
	(gtk_cell_renderer_toggle_get_active): new function, bug
	40269
	(gtk_cell_renderer_toggle_set_active): new function
	(gtk_cell_renderer_toggle_set_property): route changes to toggle
	state through gtk_cell_renderer_set_active
This commit is contained in:
Havoc Pennington 2001-01-04 21:33:24 +00:00 committed by Havoc Pennington
parent ef069fa0a0
commit c020b3b4f8
21 changed files with 348 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ChangeLog
View File

@ -1,3 +1,33 @@
2001-01-04 Havoc Pennington <hp@redhat.com>
Rename some stuff:
s/gtk_tree_view_column_set_size/gtk_tree_view_column_set_width/g;
s/GtkModelSimple/GtkTreeModelSimple/g;
s/GTK_MODEL_SIMPLE/GTK_TREE_MODEL_SIMPLE/g;
s/gtk_model_simple/gtk_tree_model_simple/g;
s/gtkmodelsimple/gtktreemodelsimple/g;
s/gtk_tree_view_column_set_header_active/gtk_tree_view_column_set_header_clickable/g;
s/GtkTreeViewColumnType/GtkTreeViewColumnSizing/g;
s/column_set_col_type/column_set_sizing/g;
s/GtkTreeSelectionType/GtkTreeSelectionMode/g;
s/gtk_tree_selection_set_type/gtk_tree_selection_set_mode/g;
s/GtkCellRendererType/GtkCellRendererState/g;
* gtk/gtkcellrenderertoggle.c: remove _ macro, include gtkintl.h
(gtk_cell_renderer_toggle_class_init): change "state" property to
"active", to match GtkToggleButton
(gtk_cell_renderer_toggle_get_active): new function, bug
40269
(gtk_cell_renderer_toggle_set_active): new function
(gtk_cell_renderer_toggle_set_property): route changes to toggle
state through gtk_cell_renderer_set_active
Thu Jan 4 15:46:18 2001 Jonathan Blandford <jrb@redhat.com> Thu Jan 4 15:46:18 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkmodelsimple.c: Changed a bunch of boxed types to pointers * gtk/gtkmodelsimple.c: Changed a bunch of boxed types to pointers

30
ChangeLog.pre-2-0
View File

@ -1,3 +1,33 @@
2001-01-04 Havoc Pennington <hp@redhat.com>
Rename some stuff:
s/gtk_tree_view_column_set_size/gtk_tree_view_column_set_width/g;
s/GtkModelSimple/GtkTreeModelSimple/g;
s/GTK_MODEL_SIMPLE/GTK_TREE_MODEL_SIMPLE/g;
s/gtk_model_simple/gtk_tree_model_simple/g;
s/gtkmodelsimple/gtktreemodelsimple/g;
s/gtk_tree_view_column_set_header_active/gtk_tree_view_column_set_header_clickable/g;
s/GtkTreeViewColumnType/GtkTreeViewColumnSizing/g;
s/column_set_col_type/column_set_sizing/g;
s/GtkTreeSelectionType/GtkTreeSelectionMode/g;
s/gtk_tree_selection_set_type/gtk_tree_selection_set_mode/g;
s/GtkCellRendererType/GtkCellRendererState/g;
* gtk/gtkcellrenderertoggle.c: remove _ macro, include gtkintl.h
(gtk_cell_renderer_toggle_class_init): change "state" property to
"active", to match GtkToggleButton
(gtk_cell_renderer_toggle_get_active): new function, bug
40269
(gtk_cell_renderer_toggle_set_active): new function
(gtk_cell_renderer_toggle_set_property): route changes to toggle
state through gtk_cell_renderer_set_active
Thu Jan 4 15:46:18 2001 Jonathan Blandford <jrb@redhat.com> Thu Jan 4 15:46:18 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkmodelsimple.c: Changed a bunch of boxed types to pointers * gtk/gtkmodelsimple.c: Changed a bunch of boxed types to pointers

30
ChangeLog.pre-2-10
View File

@ -1,3 +1,33 @@
2001-01-04 Havoc Pennington <hp@redhat.com>
Rename some stuff:
s/gtk_tree_view_column_set_size/gtk_tree_view_column_set_width/g;
s/GtkModelSimple/GtkTreeModelSimple/g;
s/GTK_MODEL_SIMPLE/GTK_TREE_MODEL_SIMPLE/g;
s/gtk_model_simple/gtk_tree_model_simple/g;
s/gtkmodelsimple/gtktreemodelsimple/g;
s/gtk_tree_view_column_set_header_active/gtk_tree_view_column_set_header_clickable/g;
s/GtkTreeViewColumnType/GtkTreeViewColumnSizing/g;
s/column_set_col_type/column_set_sizing/g;
s/GtkTreeSelectionType/GtkTreeSelectionMode/g;
s/gtk_tree_selection_set_type/gtk_tree_selection_set_mode/g;
s/GtkCellRendererType/GtkCellRendererState/g;
* gtk/gtkcellrenderertoggle.c: remove _ macro, include gtkintl.h
(gtk_cell_renderer_toggle_class_init): change "state" property to
"active", to match GtkToggleButton
(gtk_cell_renderer_toggle_get_active): new function, bug
40269
(gtk_cell_renderer_toggle_set_active): new function
(gtk_cell_renderer_toggle_set_property): route changes to toggle
state through gtk_cell_renderer_set_active
Thu Jan 4 15:46:18 2001 Jonathan Blandford <jrb@redhat.com> Thu Jan 4 15:46:18 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkmodelsimple.c: Changed a bunch of boxed types to pointers * gtk/gtkmodelsimple.c: Changed a bunch of boxed types to pointers

30
ChangeLog.pre-2-2
View File

@ -1,3 +1,33 @@
2001-01-04 Havoc Pennington <hp@redhat.com>
Rename some stuff:
s/gtk_tree_view_column_set_size/gtk_tree_view_column_set_width/g;
s/GtkModelSimple/GtkTreeModelSimple/g;
s/GTK_MODEL_SIMPLE/GTK_TREE_MODEL_SIMPLE/g;
s/gtk_model_simple/gtk_tree_model_simple/g;
s/gtkmodelsimple/gtktreemodelsimple/g;
s/gtk_tree_view_column_set_header_active/gtk_tree_view_column_set_header_clickable/g;
s/GtkTreeViewColumnType/GtkTreeViewColumnSizing/g;
s/column_set_col_type/column_set_sizing/g;
s/GtkTreeSelectionType/GtkTreeSelectionMode/g;
s/gtk_tree_selection_set_type/gtk_tree_selection_set_mode/g;
s/GtkCellRendererType/GtkCellRendererState/g;
* gtk/gtkcellrenderertoggle.c: remove _ macro, include gtkintl.h
(gtk_cell_renderer_toggle_class_init): change "state" property to
"active", to match GtkToggleButton
(gtk_cell_renderer_toggle_get_active): new function, bug
40269
(gtk_cell_renderer_toggle_set_active): new function
(gtk_cell_renderer_toggle_set_property): route changes to toggle
state through gtk_cell_renderer_set_active
Thu Jan 4 15:46:18 2001 Jonathan Blandford <jrb@redhat.com> Thu Jan 4 15:46:18 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkmodelsimple.c: Changed a bunch of boxed types to pointers * gtk/gtkmodelsimple.c: Changed a bunch of boxed types to pointers

30
ChangeLog.pre-2-4
View File

@ -1,3 +1,33 @@
2001-01-04 Havoc Pennington <hp@redhat.com>
Rename some stuff:
s/gtk_tree_view_column_set_size/gtk_tree_view_column_set_width/g;
s/GtkModelSimple/GtkTreeModelSimple/g;
s/GTK_MODEL_SIMPLE/GTK_TREE_MODEL_SIMPLE/g;
s/gtk_model_simple/gtk_tree_model_simple/g;
s/gtkmodelsimple/gtktreemodelsimple/g;
s/gtk_tree_view_column_set_header_active/gtk_tree_view_column_set_header_clickable/g;
s/GtkTreeViewColumnType/GtkTreeViewColumnSizing/g;
s/column_set_col_type/column_set_sizing/g;
s/GtkTreeSelectionType/GtkTreeSelectionMode/g;
s/gtk_tree_selection_set_type/gtk_tree_selection_set_mode/g;
s/GtkCellRendererType/GtkCellRendererState/g;
* gtk/gtkcellrenderertoggle.c: remove _ macro, include gtkintl.h
(gtk_cell_renderer_toggle_class_init): change "state" property to
"active", to match GtkToggleButton
(gtk_cell_renderer_toggle_get_active): new function, bug
40269
(gtk_cell_renderer_toggle_set_active): new function
(gtk_cell_renderer_toggle_set_property): route changes to toggle
state through gtk_cell_renderer_set_active
Thu Jan 4 15:46:18 2001 Jonathan Blandford <jrb@redhat.com> Thu Jan 4 15:46:18 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkmodelsimple.c: Changed a bunch of boxed types to pointers * gtk/gtkmodelsimple.c: Changed a bunch of boxed types to pointers

30
ChangeLog.pre-2-6
View File

@ -1,3 +1,33 @@
2001-01-04 Havoc Pennington <hp@redhat.com>
Rename some stuff:
s/gtk_tree_view_column_set_size/gtk_tree_view_column_set_width/g;
s/GtkModelSimple/GtkTreeModelSimple/g;
s/GTK_MODEL_SIMPLE/GTK_TREE_MODEL_SIMPLE/g;
s/gtk_model_simple/gtk_tree_model_simple/g;
s/gtkmodelsimple/gtktreemodelsimple/g;
s/gtk_tree_view_column_set_header_active/gtk_tree_view_column_set_header_clickable/g;
s/GtkTreeViewColumnType/GtkTreeViewColumnSizing/g;
s/column_set_col_type/column_set_sizing/g;
s/GtkTreeSelectionType/GtkTreeSelectionMode/g;
s/gtk_tree_selection_set_type/gtk_tree_selection_set_mode/g;
s/GtkCellRendererType/GtkCellRendererState/g;
* gtk/gtkcellrenderertoggle.c: remove _ macro, include gtkintl.h
(gtk_cell_renderer_toggle_class_init): change "state" property to
"active", to match GtkToggleButton
(gtk_cell_renderer_toggle_get_active): new function, bug
40269
(gtk_cell_renderer_toggle_set_active): new function
(gtk_cell_renderer_toggle_set_property): route changes to toggle
state through gtk_cell_renderer_set_active
Thu Jan 4 15:46:18 2001 Jonathan Blandford <jrb@redhat.com> Thu Jan 4 15:46:18 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkmodelsimple.c: Changed a bunch of boxed types to pointers * gtk/gtkmodelsimple.c: Changed a bunch of boxed types to pointers

30
ChangeLog.pre-2-8
View File

@ -1,3 +1,33 @@
2001-01-04 Havoc Pennington <hp@redhat.com>
Rename some stuff:
s/gtk_tree_view_column_set_size/gtk_tree_view_column_set_width/g;
s/GtkModelSimple/GtkTreeModelSimple/g;
s/GTK_MODEL_SIMPLE/GTK_TREE_MODEL_SIMPLE/g;
s/gtk_model_simple/gtk_tree_model_simple/g;
s/gtkmodelsimple/gtktreemodelsimple/g;
s/gtk_tree_view_column_set_header_active/gtk_tree_view_column_set_header_clickable/g;
s/GtkTreeViewColumnType/GtkTreeViewColumnSizing/g;
s/column_set_col_type/column_set_sizing/g;
s/GtkTreeSelectionType/GtkTreeSelectionMode/g;
s/gtk_tree_selection_set_type/gtk_tree_selection_set_mode/g;
s/GtkCellRendererType/GtkCellRendererState/g;
* gtk/gtkcellrenderertoggle.c: remove _ macro, include gtkintl.h
(gtk_cell_renderer_toggle_class_init): change "state" property to
"active", to match GtkToggleButton
(gtk_cell_renderer_toggle_get_active): new function, bug
40269
(gtk_cell_renderer_toggle_set_active): new function
(gtk_cell_renderer_toggle_set_property): route changes to toggle
state through gtk_cell_renderer_set_active
Thu Jan 4 15:46:18 2001 Jonathan Blandford <jrb@redhat.com> Thu Jan 4 15:46:18 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkmodelsimple.c: Changed a bunch of boxed types to pointers * gtk/gtkmodelsimple.c: Changed a bunch of boxed types to pointers

4
gtk/Makefile.am
View File

@ -125,7 +125,6 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
gtkmenushell.h \ gtkmenushell.h \
gtkmessagedialog.h \ gtkmessagedialog.h \
gtkmisc.h \ gtkmisc.h \
gtkmodelsimple.h \
gtknotebook.h \ gtknotebook.h \
gtkoldeditable.h \ gtkoldeditable.h \
gtkobject.h \ gtkobject.h \
@ -174,6 +173,7 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
gtktree.h \ gtktree.h \
gtktreeitem.h \ gtktreeitem.h \
gtktreemodel.h \ gtktreemodel.h \
gtktreemodelsimple.h \
gtktreemodelsort.h \ gtktreemodelsort.h \
gtktreeselection.h \ gtktreeselection.h \
gtktreestore.h \ gtktreestore.h \
@ -282,7 +282,6 @@ gtk_c_sources = @STRIP_BEGIN@ \
gtkmenushell.c \ gtkmenushell.c \
gtkmessagedialog.c \ gtkmessagedialog.c \
gtkmisc.c \ gtkmisc.c \
gtkmodelsimple.c \
gtknotebook.c \ gtknotebook.c \
gtkobject.c \ gtkobject.c \
gtkoldeditable.c \ gtkoldeditable.c \
@ -337,6 +336,7 @@ gtk_c_sources = @STRIP_BEGIN@ \
gtktreeitem.c \ gtktreeitem.c \
gtktreedatalist.c \ gtktreedatalist.c \
gtktreemodel.c \ gtktreemodel.c \
gtktreemodelsimple.c \
gtktreemodelsort.c \ gtktreemodelsort.c \
gtktreeselection.c \ gtktreeselection.c \
gtktreestore.c \ gtktreestore.c \

2
gtk/gtk.h
View File

@ -101,7 +101,6 @@
#include <gtk/gtkmenushell.h> #include <gtk/gtkmenushell.h>
#include <gtk/gtkmessagedialog.h> #include <gtk/gtkmessagedialog.h>
#include <gtk/gtkmisc.h> #include <gtk/gtkmisc.h>
#include <gtk/gtkmodelsimple.h>
#include <gtk/gtknotebook.h> #include <gtk/gtknotebook.h>
#include <gtk/gtkobject.h> #include <gtk/gtkobject.h>
#include <gtk/gtkoldeditable.h> #include <gtk/gtkoldeditable.h>
@ -141,6 +140,7 @@
#include <gtk/gtktree.h> #include <gtk/gtktree.h>
#include <gtk/gtktreeitem.h> #include <gtk/gtktreeitem.h>
#include <gtk/gtktreemodel.h> #include <gtk/gtktreemodel.h>
#include <gtk/gtktreemodelsimple.h>
#include <gtk/gtktreemodelsort.h> #include <gtk/gtktreemodelsort.h>
#include <gtk/gtktreeselection.h> #include <gtk/gtktreeselection.h>
#include <gtk/gtktreestore.h> #include <gtk/gtktreestore.h>

6
gtk/gtkcellrenderer.h
View File

@ -30,10 +30,10 @@ extern "C" {
typedef enum typedef enum
{ {
GTK_CELL_RENDERER_SELECTED = 1 << 0, GTK_CELL_RENDERER_SELECTED = 1 << 0,
GTK_CELL_RENDERER_PRELIT = 1 << 1, GTK_CELL_RENDERER_PRELIT = 1 << 1,
GTK_CELL_RENDERER_INSENSITIVE = 1 << 2 GTK_CELL_RENDERER_INSENSITIVE = 1 << 2
} GtkCellRendererType; } GtkCellRendererState;
#define GTK_TYPE_CELL_RENDERER (gtk_cell_renderer_get_type ()) #define GTK_TYPE_CELL_RENDERER (gtk_cell_renderer_get_type ())
#define GTK_CELL_RENDERER(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_CELL_RENDERER, GtkCellRenderer)) #define GTK_CELL_RENDERER(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_CELL_RENDERER, GtkCellRenderer))

53
gtk/gtkcellrenderertoggle.c
View File

@ -20,11 +20,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <gtk/gtkcellrenderertoggle.h> #include <gtk/gtkcellrenderertoggle.h>
#include <gtk/gtksignal.h> #include <gtk/gtksignal.h>
#include "gtkintl.h"
#ifndef _
#define _(x) x
#endif
static void gtk_cell_renderer_toggle_get_property (GObject *object, static void gtk_cell_renderer_toggle_get_property (GObject *object,
guint param_id, guint param_id,
@ -65,7 +61,7 @@ enum {
enum { enum {
PROP_ZERO, PROP_ZERO,
PROP_STATE, PROP_ACTIVE,
PROP_RADIO PROP_RADIO
}; };
@ -104,7 +100,7 @@ gtk_cell_renderer_toggle_get_type (void)
static void static void
gtk_cell_renderer_toggle_init (GtkCellRendererToggle *celltoggle) gtk_cell_renderer_toggle_init (GtkCellRendererToggle *celltoggle)
{ {
celltoggle->state = FALSE; celltoggle->active = FALSE;
celltoggle->radio = FALSE; celltoggle->radio = FALSE;
GTK_CELL_RENDERER (celltoggle)->xpad = 2; GTK_CELL_RENDERER (celltoggle)->xpad = 2;
GTK_CELL_RENDERER (celltoggle)->ypad = 2; GTK_CELL_RENDERER (celltoggle)->ypad = 2;
@ -124,10 +120,10 @@ gtk_cell_renderer_toggle_class_init (GtkCellRendererToggleClass *class)
cell_class->event = gtk_cell_renderer_toggle_event; cell_class->event = gtk_cell_renderer_toggle_event;
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_STATE, PROP_ACTIVE,
g_param_spec_boolean ("state", g_param_spec_boolean ("active",
_("Toggle state"), _("Toggle state"),
_("The toggle-state of the button."), _("The toggle state of the button"),
FALSE, FALSE,
G_PARAM_READABLE | G_PARAM_READABLE |
G_PARAM_WRITABLE)); G_PARAM_WRITABLE));
@ -136,7 +132,7 @@ gtk_cell_renderer_toggle_class_init (GtkCellRendererToggleClass *class)
PROP_RADIO, PROP_RADIO,
g_param_spec_boolean ("radio", g_param_spec_boolean ("radio",
_("Radio state"), _("Radio state"),
_("Draw the toggle button as a radio button."), _("Draw the toggle button as a radio button"),
FALSE, FALSE,
G_PARAM_READABLE | G_PARAM_READABLE |
G_PARAM_WRITABLE)); G_PARAM_WRITABLE));
@ -163,8 +159,8 @@ gtk_cell_renderer_toggle_get_property (GObject *object,
switch (param_id) switch (param_id)
{ {
case PROP_STATE: case PROP_ACTIVE:
g_value_set_boolean (value, celltoggle->state); g_value_set_boolean (value, celltoggle->active);
break; break;
case PROP_RADIO: case PROP_RADIO:
g_value_set_boolean (value, celltoggle->radio); g_value_set_boolean (value, celltoggle->radio);
@ -187,8 +183,8 @@ gtk_cell_renderer_toggle_set_property (GObject *object,
switch (param_id) switch (param_id)
{ {
case PROP_STATE: case PROP_ACTIVE:
celltoggle->state = g_value_get_boolean (value); gtk_cell_renderer_toggle_set_active (celltoggle, g_value_get_boolean (value));
break; break;
case PROP_RADIO: case PROP_RADIO:
celltoggle->radio = g_value_get_boolean (value); celltoggle->radio = g_value_get_boolean (value);
@ -252,7 +248,7 @@ gtk_cell_renderer_toggle_render (GtkCellRenderer *cell,
cell_area->x + real_xoffset, cell_area->x + real_xoffset,
cell_area->y + real_yoffset, cell_area->y + real_yoffset,
width, height); width, height);
if (celltoggle->state) if (celltoggle->active)
{ {
gdk_draw_line (window, gdk_draw_line (window,
widget->style->black_gc, widget->style->black_gc,
@ -278,7 +274,7 @@ gtk_cell_renderer_toggle_render (GtkCellRenderer *cell,
width, width,
height, height,
0, 360*64); 0, 360*64);
if (celltoggle->state) if (celltoggle->active)
{ {
gdk_draw_arc (window, gdk_draw_arc (window,
widget->style->black_gc, widget->style->black_gc,
@ -317,3 +313,26 @@ gtk_cell_renderer_toggle_set_radio (GtkCellRendererToggle *toggle,
toggle->radio = radio; toggle->radio = radio;
} }
gboolean
gtk_cell_renderer_toggle_get_active (GtkCellRendererToggle *toggle)
{
g_return_val_if_fail (GTK_IS_CELL_RENDERER_TOGGLE (toggle), FALSE);
return toggle->active;
}
void
gtk_cell_renderer_toggle_set_active (GtkCellRendererToggle *toggle,
gboolean setting)
{
g_return_if_fail (GTK_IS_CELL_RENDERER_TOGGLE (toggle));
setting = !! setting;
if (toggle->active != setting)
{
toggle->active = setting;
g_object_notify (G_OBJECT (toggle), "active");
}
}

5
gtk/gtkcellrenderertoggle.h
View File

@ -41,7 +41,7 @@ struct _GtkCellRendererToggle
GtkCellRenderer parent; GtkCellRenderer parent;
/*< private >*/ /*< private >*/
guint state : 1; guint active : 1;
guint radio : 1; guint radio : 1;
}; };
@ -59,6 +59,9 @@ GtkCellRenderer *gtk_cell_renderer_toggle_new (void);
void gtk_cell_renderer_toggle_set_radio (GtkCellRendererToggle *toggle, void gtk_cell_renderer_toggle_set_radio (GtkCellRendererToggle *toggle,
gboolean radio); gboolean radio);
gboolean gtk_cell_renderer_toggle_get_active (GtkCellRendererToggle *toggle);
void gtk_cell_renderer_toggle_set_active (GtkCellRendererToggle *toggle,
gboolean setting);
#ifdef __cplusplus #ifdef __cplusplus
} }

80
gtk/gtkmodelsimple.c → gtk/gtktreemodelsimple.c
View File

@ -1,4 +1,4 @@
/* gtkmodelsimple.c /* gtktreemodelsimple.c
* Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford <jrb@redhat.com> * Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford <jrb@redhat.com>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#include "gtkmodelsimple.h" #include "gtktreemodelsimple.h"
#include "gtksignal.h" #include "gtksignal.h"
enum { enum {
CHANGED, CHANGED,
@ -41,9 +41,9 @@ enum {
LAST_SIGNAL LAST_SIGNAL
}; };
static void gtk_model_simple_init (GtkModelSimple *model_simple); static void gtk_tree_model_simple_init (GtkTreeModelSimple *model_simple);
static void gtk_model_simple_class_init (GtkModelSimpleClass *class); static void gtk_tree_model_simple_class_init (GtkTreeModelSimpleClass *class);
static void gtk_model_simple_tree_model_init (GtkTreeModelIface *iface); static void gtk_tree_model_simple_tree_model_init (GtkTreeModelIface *iface);
static gint gtk_real_model_simple_get_n_columns (GtkTreeModel *tree_model); static gint gtk_real_model_simple_get_n_columns (GtkTreeModel *tree_model);
static GType gtk_real_model_simple_get_column_type (GtkTreeModel *tree_model, static GType gtk_real_model_simple_get_column_type (GtkTreeModel *tree_model,
gint index); gint index);
@ -82,7 +82,7 @@ static guint model_simple_signals[LAST_SIGNAL] = { 0 };
GtkType GtkType
gtk_model_simple_get_type (void) gtk_tree_model_simple_get_type (void)
{ {
static GtkType model_simple_type = 0; static GtkType model_simple_type = 0;
@ -90,25 +90,25 @@ gtk_model_simple_get_type (void)
{ {
static const GTypeInfo model_simple_info = static const GTypeInfo model_simple_info =
{ {
sizeof (GtkModelSimpleClass), sizeof (GtkTreeModelSimpleClass),
NULL, /* base_init */ NULL, /* base_init */
NULL, /* base_finalize */ NULL, /* base_finalize */
(GClassInitFunc) gtk_model_simple_class_init, (GClassInitFunc) gtk_tree_model_simple_class_init,
NULL, /* class_finalize */ NULL, /* class_finalize */
NULL, /* class_data */ NULL, /* class_data */
sizeof (GtkModelSimple), sizeof (GtkTreeModelSimple),
0, 0,
(GInstanceInitFunc) gtk_model_simple_init (GInstanceInitFunc) gtk_tree_model_simple_init
}; };
static const GInterfaceInfo tree_model_info = static const GInterfaceInfo tree_model_info =
{ {
(GInterfaceInitFunc) gtk_model_simple_tree_model_init, (GInterfaceInitFunc) gtk_tree_model_simple_tree_model_init,
NULL, NULL,
NULL NULL
}; };
model_simple_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkModelSimple", &model_simple_info, 0); model_simple_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkTreeModelSimple", &model_simple_info, 0);
g_type_add_interface_static (model_simple_type, g_type_add_interface_static (model_simple_type,
GTK_TYPE_TREE_MODEL, GTK_TYPE_TREE_MODEL,
&tree_model_info); &tree_model_info);
@ -117,18 +117,18 @@ gtk_model_simple_get_type (void)
return model_simple_type; return model_simple_type;
} }
GtkModelSimple * GtkTreeModelSimple *
gtk_model_simple_new (void) gtk_tree_model_simple_new (void)
{ {
GtkModelSimple *retval; GtkTreeModelSimple *retval;
retval = GTK_MODEL_SIMPLE (gtk_type_new (GTK_TYPE_MODEL_SIMPLE)); retval = GTK_TREE_MODEL_SIMPLE (gtk_type_new (GTK_TYPE_MODEL_SIMPLE));
return retval; return retval;
} }
static void static void
gtk_model_simple_class_init (GtkModelSimpleClass *class) gtk_tree_model_simple_class_init (GtkTreeModelSimpleClass *class)
{ {
GtkObjectClass *object_class; GtkObjectClass *object_class;
@ -138,7 +138,7 @@ gtk_model_simple_class_init (GtkModelSimpleClass *class)
gtk_signal_new ("changed", gtk_signal_new ("changed",
GTK_RUN_FIRST, GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkModelSimpleClass, changed), GTK_SIGNAL_OFFSET (GtkTreeModelSimpleClass, changed),
gtk_marshal_VOID__BOXED_BOXED, gtk_marshal_VOID__BOXED_BOXED,
G_TYPE_NONE, 2, G_TYPE_NONE, 2,
G_TYPE_POINTER, G_TYPE_POINTER,
@ -147,7 +147,7 @@ gtk_model_simple_class_init (GtkModelSimpleClass *class)
gtk_signal_new ("inserted", gtk_signal_new ("inserted",
GTK_RUN_FIRST, GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkModelSimpleClass, inserted), GTK_SIGNAL_OFFSET (GtkTreeModelSimpleClass, inserted),
gtk_marshal_VOID__BOXED_BOXED, gtk_marshal_VOID__BOXED_BOXED,
G_TYPE_NONE, 2, G_TYPE_NONE, 2,
G_TYPE_POINTER, G_TYPE_POINTER,
@ -156,7 +156,7 @@ gtk_model_simple_class_init (GtkModelSimpleClass *class)
gtk_signal_new ("child_toggled", gtk_signal_new ("child_toggled",
GTK_RUN_FIRST, GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkModelSimpleClass, child_toggled), GTK_SIGNAL_OFFSET (GtkTreeModelSimpleClass, child_toggled),
gtk_marshal_VOID__BOXED_BOXED, gtk_marshal_VOID__BOXED_BOXED,
G_TYPE_NONE, 2, G_TYPE_NONE, 2,
G_TYPE_POINTER, G_TYPE_POINTER,
@ -165,7 +165,7 @@ gtk_model_simple_class_init (GtkModelSimpleClass *class)
gtk_signal_new ("deleted", gtk_signal_new ("deleted",
GTK_RUN_FIRST, GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkModelSimpleClass, deleted), GTK_SIGNAL_OFFSET (GtkTreeModelSimpleClass, deleted),
gtk_marshal_VOID__BOXED, gtk_marshal_VOID__BOXED,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
G_TYPE_POINTER); G_TYPE_POINTER);
@ -174,14 +174,14 @@ gtk_model_simple_class_init (GtkModelSimpleClass *class)
gtk_signal_new ("get_n_columns", gtk_signal_new ("get_n_columns",
GTK_RUN_LAST, GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkModelSimpleClass, get_n_columns), GTK_SIGNAL_OFFSET (GtkTreeModelSimpleClass, get_n_columns),
gtk_marshal_INT__VOID, gtk_marshal_INT__VOID,
G_TYPE_INT, 0); G_TYPE_INT, 0);
model_simple_signals[GET_COLUMN_TYPE] = model_simple_signals[GET_COLUMN_TYPE] =
gtk_signal_new ("get_column_type", gtk_signal_new ("get_column_type",
GTK_RUN_LAST, GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkModelSimpleClass, get_column_type), GTK_SIGNAL_OFFSET (GtkTreeModelSimpleClass, get_column_type),
gtk_marshal_INT__INT, gtk_marshal_INT__INT,
G_TYPE_INT, 1, G_TYPE_INT, 1,
G_TYPE_INT); G_TYPE_INT);
@ -189,7 +189,7 @@ gtk_model_simple_class_init (GtkModelSimpleClass *class)
gtk_signal_new ("get_iter", gtk_signal_new ("get_iter",
GTK_RUN_LAST, GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkModelSimpleClass, get_iter), GTK_SIGNAL_OFFSET (GtkTreeModelSimpleClass, get_iter),
gtk_marshal_BOOLEAN__BOXED_BOXED, gtk_marshal_BOOLEAN__BOXED_BOXED,
G_TYPE_BOOLEAN, 2, G_TYPE_BOOLEAN, 2,
G_TYPE_POINTER, G_TYPE_POINTER,
@ -198,7 +198,7 @@ gtk_model_simple_class_init (GtkModelSimpleClass *class)
gtk_signal_new ("get_path", gtk_signal_new ("get_path",
GTK_RUN_LAST, GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkModelSimpleClass, get_path), GTK_SIGNAL_OFFSET (GtkTreeModelSimpleClass, get_path),
gtk_marshal_BOXED__BOXED, gtk_marshal_BOXED__BOXED,
G_TYPE_POINTER, 1, G_TYPE_POINTER, 1,
G_TYPE_POINTER); G_TYPE_POINTER);
@ -206,7 +206,7 @@ gtk_model_simple_class_init (GtkModelSimpleClass *class)
gtk_signal_new ("get_value", gtk_signal_new ("get_value",
GTK_RUN_LAST, GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkModelSimpleClass, get_value), GTK_SIGNAL_OFFSET (GtkTreeModelSimpleClass, get_value),
gtk_marshal_VOID__BOXED_INT_POINTER, gtk_marshal_VOID__BOXED_INT_POINTER,
G_TYPE_NONE, 3, G_TYPE_NONE, 3,
G_TYPE_POINTER, G_TYPE_POINTER,
@ -216,7 +216,7 @@ gtk_model_simple_class_init (GtkModelSimpleClass *class)
gtk_signal_new ("iter_next", gtk_signal_new ("iter_next",
GTK_RUN_LAST, GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkModelSimpleClass, iter_next), GTK_SIGNAL_OFFSET (GtkTreeModelSimpleClass, iter_next),
gtk_marshal_BOOLEAN__BOXED, gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN, 1,
G_TYPE_POINTER); G_TYPE_POINTER);
@ -224,7 +224,7 @@ gtk_model_simple_class_init (GtkModelSimpleClass *class)
gtk_signal_new ("iter_children", gtk_signal_new ("iter_children",
GTK_RUN_LAST, GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkModelSimpleClass, iter_children), GTK_SIGNAL_OFFSET (GtkTreeModelSimpleClass, iter_children),
gtk_marshal_BOOLEAN__BOXED_BOXED, gtk_marshal_BOOLEAN__BOXED_BOXED,
G_TYPE_BOOLEAN, 2, G_TYPE_BOOLEAN, 2,
G_TYPE_POINTER, G_TYPE_POINTER,
@ -233,7 +233,7 @@ gtk_model_simple_class_init (GtkModelSimpleClass *class)
gtk_signal_new ("iter_has_child", gtk_signal_new ("iter_has_child",
GTK_RUN_LAST, GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkModelSimpleClass, iter_has_child), GTK_SIGNAL_OFFSET (GtkTreeModelSimpleClass, iter_has_child),
gtk_marshal_BOOLEAN__BOXED, gtk_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN, 1,
G_TYPE_POINTER); G_TYPE_POINTER);
@ -241,7 +241,7 @@ gtk_model_simple_class_init (GtkModelSimpleClass *class)
gtk_signal_new ("iter_n_children", gtk_signal_new ("iter_n_children",
GTK_RUN_LAST, GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkModelSimpleClass, iter_n_children), GTK_SIGNAL_OFFSET (GtkTreeModelSimpleClass, iter_n_children),
gtk_marshal_INT__BOXED, gtk_marshal_INT__BOXED,
G_TYPE_INT, 1, G_TYPE_INT, 1,
G_TYPE_POINTER); G_TYPE_POINTER);
@ -249,7 +249,7 @@ gtk_model_simple_class_init (GtkModelSimpleClass *class)
gtk_signal_new ("iter_nth_child", gtk_signal_new ("iter_nth_child",
GTK_RUN_LAST, GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkModelSimpleClass, iter_nth_child), GTK_SIGNAL_OFFSET (GtkTreeModelSimpleClass, iter_nth_child),
gtk_marshal_BOOLEAN__BOXED_BOXED_INT, gtk_marshal_BOOLEAN__BOXED_BOXED_INT,
GTK_TYPE_BOOL, 3, GTK_TYPE_BOOL, 3,
G_TYPE_POINTER, G_TYPE_POINTER,
@ -259,7 +259,7 @@ gtk_model_simple_class_init (GtkModelSimpleClass *class)
gtk_signal_new ("iter_parent", gtk_signal_new ("iter_parent",
GTK_RUN_LAST, GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkModelSimpleClass, iter_parent), GTK_SIGNAL_OFFSET (GtkTreeModelSimpleClass, iter_parent),
gtk_marshal_BOOLEAN__BOXED_BOXED, gtk_marshal_BOOLEAN__BOXED_BOXED,
G_TYPE_BOOLEAN, 2, G_TYPE_BOOLEAN, 2,
G_TYPE_POINTER, G_TYPE_POINTER,
@ -268,7 +268,7 @@ gtk_model_simple_class_init (GtkModelSimpleClass *class)
gtk_signal_new ("ref_iter", gtk_signal_new ("ref_iter",
GTK_RUN_LAST, GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkModelSimpleClass, ref_iter), GTK_SIGNAL_OFFSET (GtkTreeModelSimpleClass, ref_iter),
gtk_marshal_NONE__BOXED, gtk_marshal_NONE__BOXED,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
G_TYPE_POINTER); G_TYPE_POINTER);
@ -276,14 +276,14 @@ gtk_model_simple_class_init (GtkModelSimpleClass *class)
gtk_signal_new ("unref_iter", gtk_signal_new ("unref_iter",
GTK_RUN_LAST, GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkModelSimpleClass, unref_iter), GTK_SIGNAL_OFFSET (GtkTreeModelSimpleClass, unref_iter),
gtk_marshal_NONE__BOXED, gtk_marshal_NONE__BOXED,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
G_TYPE_POINTER); G_TYPE_POINTER);
} }
static void static void
gtk_model_simple_tree_model_init (GtkTreeModelIface *iface) gtk_tree_model_simple_tree_model_init (GtkTreeModelIface *iface)
{ {
iface->get_n_columns = gtk_real_model_simple_get_n_columns; iface->get_n_columns = gtk_real_model_simple_get_n_columns;
iface->get_column_type = gtk_real_model_simple_get_column_type; iface->get_column_type = gtk_real_model_simple_get_column_type;
@ -302,7 +302,7 @@ gtk_model_simple_tree_model_init (GtkTreeModelIface *iface)
static void static void
gtk_model_simple_init (GtkModelSimple *model_simple) gtk_tree_model_simple_init (GtkTreeModelSimple *model_simple)
{ {
model_simple->stamp = 1; model_simple->stamp = 1;
} }
@ -446,7 +446,7 @@ gtk_real_model_simple_unref_iter (GtkTreeModel *tree_model,
/* Public functions */ /* Public functions */
void void
gtk_model_simple_changed (GtkModelSimple *simple, gtk_tree_model_simple_changed (GtkTreeModelSimple *simple,
GtkTreePath *path, GtkTreePath *path,
GtkTreeIter *iter) GtkTreeIter *iter)
{ {
@ -458,7 +458,7 @@ gtk_model_simple_changed (GtkModelSimple *simple,
} }
void void
gtk_model_simple_inserted (GtkModelSimple *simple, gtk_tree_model_simple_inserted (GtkTreeModelSimple *simple,
GtkTreePath *path, GtkTreePath *path,
GtkTreeIter *iter) GtkTreeIter *iter)
{ {
@ -470,7 +470,7 @@ gtk_model_simple_inserted (GtkModelSimple *simple,
} }
void void
gtk_model_simple_child_toggled (GtkModelSimple *simple, gtk_tree_model_simple_child_toggled (GtkTreeModelSimple *simple,
GtkTreePath *path, GtkTreePath *path,
GtkTreeIter *iter) GtkTreeIter *iter)
{ {
@ -482,7 +482,7 @@ gtk_model_simple_child_toggled (GtkModelSimple *simple,
} }
void void
gtk_model_simple_iter_deleted (GtkModelSimple *simple, gtk_tree_model_simple_iter_deleted (GtkTreeModelSimple *simple,
GtkTreePath *path, GtkTreePath *path,
GtkTreeIter *iter) GtkTreeIter *iter)
{ {

52
gtk/gtkmodelsimple.h → gtk/gtktreemodelsimple.h
View File

@ -1,4 +1,4 @@
/* gtkmodelsimple.h /* gtktreemodelsimple.h
* Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford <jrb@redhat.com> * Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford <jrb@redhat.com>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -17,8 +17,8 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef __GTK_MODEL_SIMPLE_H__ #ifndef __GTK_TREE_MODEL_SIMPLE_H__
#define __GTK_MODEL_SIMPLE_H__ #define __GTK_TREE_MODEL_SIMPLE_H__
#include <gtk/gtktreemodel.h> #include <gtk/gtktreemodel.h>
@ -27,23 +27,23 @@ extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#define GTK_TYPE_MODEL_SIMPLE (gtk_model_simple_get_type ()) #define GTK_TYPE_MODEL_SIMPLE (gtk_tree_model_simple_get_type ())
#define GTK_MODEL_SIMPLE(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_MODEL_SIMPLE, GtkModelSimple)) #define GTK_TREE_MODEL_SIMPLE(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_MODEL_SIMPLE, GtkTreeModelSimple))
#define GTK_MODEL_SIMPLE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_MODEL_SIMPLE, GtkModelSimpleClass)) #define GTK_TREE_MODEL_SIMPLE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_MODEL_SIMPLE, GtkTreeModelSimpleClass))
#define GTK_IS_MODEL_SIMPLE(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_MODEL_SIMPLE)) #define GTK_IS_MODEL_SIMPLE(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_MODEL_SIMPLE))
#define GTK_IS_MODEL_SIMPLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_MODEL_SIMPLE)) #define GTK_IS_MODEL_SIMPLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_MODEL_SIMPLE))
typedef struct _GtkModelSimple GtkModelSimple; typedef struct _GtkTreeModelSimple GtkTreeModelSimple;
typedef struct _GtkModelSimpleClass GtkModelSimpleClass; typedef struct _GtkTreeModelSimpleClass GtkTreeModelSimpleClass;
struct _GtkModelSimple struct _GtkTreeModelSimple
{ {
GtkObject parent; GtkObject parent;
gint stamp; gint stamp;
}; };
struct _GtkModelSimpleClass struct _GtkTreeModelSimpleClass
{ {
GtkObjectClass parent_class; GtkObjectClass parent_class;
@ -96,22 +96,20 @@ struct _GtkModelSimpleClass
GtkTreePath *path); GtkTreePath *path);
}; };
GtkType gtk_tree_model_simple_get_type (void);
GtkType gtk_model_simple_get_type (void); GtkTreeModelSimple *gtk_tree_model_simple_new (void);
GtkModelSimple *gtk_model_simple_new (void); void gtk_tree_model_simple_changed (GtkTreeModelSimple *simple,
void gtk_model_simple_changed (GtkModelSimple *simple, GtkTreePath *path,
GtkTreePath *path, GtkTreeIter *iter);
GtkTreeIter *iter); void gtk_tree_model_simple_inserted (GtkTreeModelSimple *simple,
void gtk_model_simple_inserted (GtkModelSimple *simple, GtkTreePath *path,
GtkTreePath *path, GtkTreeIter *iter);
GtkTreeIter *iter); void gtk_tree_model_simple_child_toggled (GtkTreeModelSimple *simple,
void gtk_model_simple_child_toggled (GtkModelSimple *simple, GtkTreePath *path,
GtkTreePath *path, GtkTreeIter *iter);
GtkTreeIter *iter); void gtk_tree_model_simple_deleted (GtkTreeModelSimple *simple,
void gtk_model_simple_deleted (GtkModelSimple *simple, GtkTreePath *path,
GtkTreePath *path, GtkTreeIter *iter);
GtkTreeIter *iter);
#ifdef __cplusplus #ifdef __cplusplus
@ -119,4 +117,4 @@ void gtk_model_simple_deleted (GtkModelSimple *simple,
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __GTK_MODEL_SIMPLE_H__ */ #endif /* __GTK_TREE_MODEL_SIMPLE_H__ */

6
gtk/gtktreeselection.c
View File

@ -154,7 +154,7 @@ _gtk_tree_selection_set_tree_view (GtkTreeSelection *selection,
/* FIXME explain what the anchor is */ /* FIXME explain what the anchor is */
/** /**
* gtk_tree_selection_set_type: * gtk_tree_selection_set_mode:
* @selection: A #GtkTreeSelection. * @selection: A #GtkTreeSelection.
* @type: The selection type. * @type: The selection type.
* *
@ -163,8 +163,8 @@ _gtk_tree_selection_set_tree_view (GtkTreeSelection *selection,
* the anchor is kept selected, if it was previously selected. * the anchor is kept selected, if it was previously selected.
**/ **/
void void
gtk_tree_selection_set_type (GtkTreeSelection *selection, gtk_tree_selection_set_mode (GtkTreeSelection *selection,
GtkTreeSelectionType type) GtkTreeSelectionMode type)
{ {
g_return_if_fail (selection != NULL); g_return_if_fail (selection != NULL);
g_return_if_fail (GTK_IS_TREE_SELECTION (selection)); g_return_if_fail (GTK_IS_TREE_SELECTION (selection));

8
gtk/gtktreeselection.h
View File

@ -38,7 +38,7 @@ typedef enum
{ {
GTK_TREE_SELECTION_SINGLE, GTK_TREE_SELECTION_SINGLE,
GTK_TREE_SELECTION_MULTI GTK_TREE_SELECTION_MULTI
} GtkTreeSelectionType; } GtkTreeSelectionMode;
typedef gboolean (* GtkTreeSelectionFunc) (GtkTreeSelection *selection, typedef gboolean (* GtkTreeSelectionFunc) (GtkTreeSelection *selection,
GtkTreeModel *model, GtkTreeModel *model,
@ -55,7 +55,7 @@ struct _GtkTreeSelection
/*< private >*/ /*< private >*/
GtkTreeView *tree_view; GtkTreeView *tree_view;
GtkTreeSelectionType type; GtkTreeSelectionMode type;
GtkTreeSelectionFunc user_func; GtkTreeSelectionFunc user_func;
gpointer user_data; gpointer user_data;
}; };
@ -70,8 +70,8 @@ struct _GtkTreeSelectionClass
GtkType gtk_tree_selection_get_type (void); GtkType gtk_tree_selection_get_type (void);
void gtk_tree_selection_set_type (GtkTreeSelection *selection, void gtk_tree_selection_set_mode (GtkTreeSelection *selection,
GtkTreeSelectionType type); GtkTreeSelectionMode type);
void gtk_tree_selection_set_select_function (GtkTreeSelection *selection, void gtk_tree_selection_set_select_function (GtkTreeSelection *selection,
GtkTreeSelectionFunc func, GtkTreeSelectionFunc func,
gpointer data); gpointer data);

6
gtk/gtktreeview.c
View File

@ -943,7 +943,7 @@ gtk_tree_view_motion (GtkWidget *widget,
new_width = gtk_tree_view_new_column_width (GTK_TREE_VIEW (widget), tree_view->priv->drag_pos, &x); new_width = gtk_tree_view_new_column_width (GTK_TREE_VIEW (widget), tree_view->priv->drag_pos, &x);
if (x != tree_view->priv->x_drag) if (x != tree_view->priv->x_drag)
{ {
gtk_tree_view_column_set_size (gtk_tree_view_get_column (GTK_TREE_VIEW (widget), tree_view->priv->drag_pos), new_width); gtk_tree_view_column_set_width (gtk_tree_view_get_column (GTK_TREE_VIEW (widget), tree_view->priv->drag_pos), new_width);
} }
/* FIXME: Do we need to scroll */ /* FIXME: Do we need to scroll */
@ -1306,7 +1306,7 @@ gtk_tree_view_button_release (GtkWidget *widget,
gdk_pointer_ungrab (event->time); gdk_pointer_ungrab (event->time);
width = gtk_tree_view_new_column_width (GTK_TREE_VIEW (widget), i, &x); width = gtk_tree_view_new_column_width (GTK_TREE_VIEW (widget), i, &x);
gtk_tree_view_column_set_size (gtk_tree_view_get_column (GTK_TREE_VIEW (widget), i), width); gtk_tree_view_column_set_width (gtk_tree_view_get_column (GTK_TREE_VIEW (widget), i), width);
return FALSE; return FALSE;
} }
@ -3290,7 +3290,7 @@ gtk_tree_view_set_headers_active (GtkTreeView *tree_view,
g_return_if_fail (tree_view->priv->model != NULL); g_return_if_fail (tree_view->priv->model != NULL);
for (list = tree_view->priv->columns; list; list = list->next) for (list = tree_view->priv->columns; list; list = list->next)
gtk_tree_view_column_set_header_active (GTK_TREE_VIEW_COLUMN (list->data), active); gtk_tree_view_column_set_header_clickable (GTK_TREE_VIEW_COLUMN (list->data), active);
} }
/** /**

16
gtk/gtktreeviewcolumn.c
View File

@ -401,15 +401,15 @@ gtk_tree_view_column_get_visible (GtkTreeViewColumn *tree_column)
} }
/** /**
* gtk_tree_view_column_set_col_type: * gtk_tree_view_column_set_sizing:
* @tree_column: A #GtkTreeViewColumn. * @tree_column: A #GtkTreeViewColumn.
* @type: The #GtkTreeViewColumnType. * @type: The #GtkTreeViewColumnSizing.
* *
* Sets the growth behavior of @tree_column to @type. * Sets the growth behavior of @tree_column to @type.
**/ **/
void void
gtk_tree_view_column_set_col_type (GtkTreeViewColumn *tree_column, gtk_tree_view_column_set_sizing (GtkTreeViewColumn *tree_column,
GtkTreeViewColumnType type) GtkTreeViewColumnSizing type)
{ {
g_return_if_fail (tree_column != NULL); g_return_if_fail (tree_column != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column)); g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
@ -473,7 +473,7 @@ gtk_tree_view_column_get_size (GtkTreeViewColumn *tree_column)
} }
/** /**
* gtk_tree_view_column_set_size: * gtk_tree_view_column_set_width:
* @tree_column: A #GtkTreeViewColumn. * @tree_column: A #GtkTreeViewColumn.
* @size: The size to set the @tree_column to. * @size: The size to set the @tree_column to.
* *
@ -482,7 +482,7 @@ gtk_tree_view_column_get_size (GtkTreeViewColumn *tree_column)
* size of the column is based on the calculated width of the column. * size of the column is based on the calculated width of the column.
**/ **/
void void
gtk_tree_view_column_set_size (GtkTreeViewColumn *tree_column, gtk_tree_view_column_set_width (GtkTreeViewColumn *tree_column,
gint size) gint size)
{ {
g_return_if_fail (tree_column != NULL); g_return_if_fail (tree_column != NULL);
@ -681,7 +681,7 @@ gtk_tree_view_column_get_title (GtkTreeViewColumn *tree_column)
} }
/** /**
* gtk_tree_view_column_set_header_active: * gtk_tree_view_column_set_header_clickable:
* @tree_column: A #GtkTreeViewColumn. * @tree_column: A #GtkTreeViewColumn.
* @active: TRUE if the header is active. * @active: TRUE if the header is active.
* *
@ -689,7 +689,7 @@ gtk_tree_view_column_get_title (GtkTreeViewColumn *tree_column)
* then it can take keyboard focus, and can be clicked. * then it can take keyboard focus, and can be clicked.
**/ **/
void void
gtk_tree_view_column_set_header_active (GtkTreeViewColumn *tree_column, gtk_tree_view_column_set_header_clickable (GtkTreeViewColumn *tree_column,
gboolean active) gboolean active)
{ {
g_return_if_fail (tree_column != NULL); g_return_if_fail (tree_column != NULL);

13
gtk/gtktreeviewcolumn.h
View File

@ -39,7 +39,7 @@ typedef enum
GTK_TREE_VIEW_COLUMN_RESIZEABLE, GTK_TREE_VIEW_COLUMN_RESIZEABLE,
GTK_TREE_VIEW_COLUMN_AUTOSIZE, GTK_TREE_VIEW_COLUMN_AUTOSIZE,
GTK_TREE_VIEW_COLUMN_FIXED GTK_TREE_VIEW_COLUMN_FIXED
} GtkTreeViewColumnType; } GtkTreeViewColumnSizing;
typedef struct _GtkTreeViewColumn GtkTreeViewColumn; typedef struct _GtkTreeViewColumn GtkTreeViewColumn;
typedef struct _GtkTreeViewColumnClass GtkTreeViewColumnClass; typedef struct _GtkTreeViewColumnClass GtkTreeViewColumnClass;
@ -59,6 +59,7 @@ struct _GtkTreeViewColumn
GtkJustification justification; GtkJustification justification;
gint id; gint id;
/* FIXME change this field to "width" bug 40061 */
gint size; gint size;
gint min_width; gint min_width;
gint max_width; gint max_width;
@ -68,7 +69,7 @@ struct _GtkTreeViewColumn
gchar *title; gchar *title;
GtkCellRenderer *cell; GtkCellRenderer *cell;
GSList *attributes; GSList *attributes;
GtkTreeViewColumnType column_type; GtkTreeViewColumnSizing column_type;
guint visible : 1; guint visible : 1;
guint button_active : 1; guint button_active : 1;
guint dirty : 1; guint dirty : 1;
@ -100,11 +101,11 @@ void gtk_tree_view_column_set_cell_data (GtkTreeViewColumn
void gtk_tree_view_column_set_visible (GtkTreeViewColumn *tree_column, void gtk_tree_view_column_set_visible (GtkTreeViewColumn *tree_column,
gboolean visible); gboolean visible);
gboolean gtk_tree_view_column_get_visible (GtkTreeViewColumn *tree_column); gboolean gtk_tree_view_column_get_visible (GtkTreeViewColumn *tree_column);
void gtk_tree_view_column_set_col_type (GtkTreeViewColumn *tree_column, void gtk_tree_view_column_set_sizing (GtkTreeViewColumn *tree_column,
GtkTreeViewColumnType type); GtkTreeViewColumnSizing type);
gint gtk_tree_view_column_get_col_type (GtkTreeViewColumn *tree_column); gint gtk_tree_view_column_get_col_type (GtkTreeViewColumn *tree_column);
gint gtk_tree_view_column_get_size (GtkTreeViewColumn *tree_column); gint gtk_tree_view_column_get_size (GtkTreeViewColumn *tree_column);
void gtk_tree_view_column_set_size (GtkTreeViewColumn *tree_column, void gtk_tree_view_column_set_width (GtkTreeViewColumn *tree_column,
gint size); gint size);
void gtk_tree_view_column_set_min_width (GtkTreeViewColumn *tree_column, void gtk_tree_view_column_set_min_width (GtkTreeViewColumn *tree_column,
gint min_width); gint min_width);
@ -121,7 +122,7 @@ void gtk_tree_view_column_clicked (GtkTreeViewColumn
void gtk_tree_view_column_set_title (GtkTreeViewColumn *tree_column, void gtk_tree_view_column_set_title (GtkTreeViewColumn *tree_column,
gchar *title); gchar *title);
gchar *gtk_tree_view_column_get_title (GtkTreeViewColumn *tree_column); gchar *gtk_tree_view_column_get_title (GtkTreeViewColumn *tree_column);
void gtk_tree_view_column_set_header_active (GtkTreeViewColumn *tree_column, void gtk_tree_view_column_set_header_clickable (GtkTreeViewColumn *tree_column,
gboolean active); gboolean active);
void gtk_tree_view_column_set_widget (GtkTreeViewColumn *tree_column, void gtk_tree_view_column_set_widget (GtkTreeViewColumn *tree_column,
GtkWidget *widget); GtkWidget *widget);

2
gtk/treestoretest.c
View File

@ -238,7 +238,7 @@ make_window (gboolean use_sort)
} }
selection = GTK_OBJECT (gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view))); selection = GTK_OBJECT (gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)));
gtk_tree_selection_set_type (GTK_TREE_SELECTION (selection), GTK_TREE_SELECTION_SINGLE); gtk_tree_selection_set_mode (GTK_TREE_SELECTION (selection), GTK_TREE_SELECTION_SINGLE);
/* Put them together */ /* Put them together */
gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view); gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);

2
tests/treestoretest.c
View File

@ -238,7 +238,7 @@ make_window (gboolean use_sort)
} }
selection = GTK_OBJECT (gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view))); selection = GTK_OBJECT (gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)));
gtk_tree_selection_set_type (GTK_TREE_SELECTION (selection), GTK_TREE_SELECTION_SINGLE); gtk_tree_selection_set_mode (GTK_TREE_SELECTION (selection), GTK_TREE_SELECTION_SINGLE);
/* Put them together */ /* Put them together */
gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view); gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);