forked from AuroraMiddleware/gtk
85c05a86c0
Mon Dec 8 10:54:44 2003 Owen Taylor <otaylor@redhat.com>
* === Released 2.3.1 ===
* NEWS: Updates for 2.3.1
* configure.in: Version 2.3.1, interface age 0, binary age 301.
* gtk/gtkmenuitem.c (gtk_menu_item_can_activate_accel):
Rename from gtk_menu_item_real_can_activate_accel() to
match GTK+ convention, improve comment.
* gtk/gtkwidget.c: Document gtk_widget_can_activate_accel(),
can ::can-activate-accel signal.
* gtk/gtkwidget.c (closure_accel_activate): Fix spelling
in comment.
* gtk/gtkmenu.c (gtk_menu_real_can_activate_accel): Clean
up comment.
* gtk/gtkcellview{,menuitem}.[ch]: Move GET_PRIVATE() macros
into the .c file.
Mon Dec 8 12:09:21 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkicontheme.c (find_builtin_icon): Fix a
missing 'else'. (#128816, Jorn Baayen)
149 lines
4.2 KiB
C
149 lines
4.2 KiB
C
/* gtkcellviewmenuitem.c
|
|
* Copyright (C) 2003 Kristian Rietveld <kris@gtk.org>
|
|
*
|
|
* 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 "gtkcellviewmenuitem.h"
|
|
#include "gtkcellview.h"
|
|
|
|
struct _GtkCellViewMenuItemPrivate
|
|
{
|
|
GtkWidget *cell_view;
|
|
};
|
|
|
|
static void gtk_cell_view_menu_item_init (GtkCellViewMenuItem *item);
|
|
static void gtk_cell_view_menu_item_class_init (GtkCellViewMenuItemClass *klass);
|
|
|
|
|
|
#define GTK_CELL_VIEW_MENU_ITEM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_CELL_VIEW_MENU_ITEM, GtkCellViewMenuItemPrivate))
|
|
|
|
GType
|
|
gtk_cell_view_menu_item_get_type (void)
|
|
{
|
|
static GType cell_view_menu_item_type = 0;
|
|
|
|
if (!cell_view_menu_item_type)
|
|
{
|
|
static const GTypeInfo cell_view_menu_item_info =
|
|
{
|
|
sizeof (GtkCellViewMenuItemClass),
|
|
NULL,
|
|
NULL,
|
|
(GClassInitFunc) gtk_cell_view_menu_item_class_init,
|
|
NULL,
|
|
NULL,
|
|
sizeof (GtkCellViewMenuItem),
|
|
0,
|
|
(GInstanceInitFunc) gtk_cell_view_menu_item_init
|
|
};
|
|
|
|
cell_view_menu_item_type =
|
|
g_type_register_static (GTK_TYPE_MENU_ITEM, "GtkCellViewMenuItem",
|
|
&cell_view_menu_item_info, 0);
|
|
}
|
|
|
|
return cell_view_menu_item_type;
|
|
}
|
|
|
|
static void
|
|
gtk_cell_view_menu_item_class_init (GtkCellViewMenuItemClass *klass)
|
|
{
|
|
g_type_class_add_private ((GObjectClass *)klass,
|
|
sizeof (GtkCellViewMenuItemPrivate));
|
|
}
|
|
|
|
static void
|
|
gtk_cell_view_menu_item_init (GtkCellViewMenuItem *item)
|
|
{
|
|
item->priv = GTK_CELL_VIEW_MENU_ITEM_GET_PRIVATE (item);
|
|
}
|
|
|
|
GtkWidget *
|
|
gtk_cell_view_menu_item_new (void)
|
|
{
|
|
GtkCellViewMenuItem *item;
|
|
|
|
item = g_object_new (GTK_TYPE_CELL_VIEW_MENU_ITEM, NULL);
|
|
|
|
item->priv->cell_view = gtk_cell_view_new ();
|
|
gtk_container_add (GTK_CONTAINER (item), item->priv->cell_view);
|
|
gtk_widget_show (item->priv->cell_view);
|
|
|
|
return GTK_WIDGET (item);
|
|
}
|
|
|
|
GtkWidget *
|
|
gtk_cell_view_menu_item_new_with_pixbuf (GdkPixbuf *pixbuf)
|
|
{
|
|
GtkCellViewMenuItem *item;
|
|
|
|
item = g_object_new (GTK_TYPE_CELL_VIEW_MENU_ITEM, NULL);
|
|
|
|
item->priv->cell_view = gtk_cell_view_new_with_pixbuf (pixbuf);
|
|
gtk_container_add (GTK_CONTAINER (item), item->priv->cell_view);
|
|
gtk_widget_show (item->priv->cell_view);
|
|
|
|
return GTK_WIDGET (item);
|
|
}
|
|
|
|
GtkWidget *
|
|
gtk_cell_view_menu_item_new_with_text (const gchar *text)
|
|
{
|
|
GtkCellViewMenuItem *item;
|
|
|
|
item = g_object_new (GTK_TYPE_CELL_VIEW_MENU_ITEM, NULL);
|
|
|
|
item->priv->cell_view = gtk_cell_view_new_with_text (text);
|
|
gtk_container_add (GTK_CONTAINER (item), item->priv->cell_view);
|
|
gtk_widget_show (item->priv->cell_view);
|
|
|
|
return GTK_WIDGET (item);
|
|
}
|
|
|
|
GtkWidget *
|
|
gtk_cell_view_menu_item_new_with_markup (const gchar *markup)
|
|
{
|
|
GtkCellViewMenuItem *item;
|
|
|
|
item = g_object_new (GTK_TYPE_CELL_VIEW_MENU_ITEM, NULL);
|
|
|
|
item->priv->cell_view = gtk_cell_view_new_with_markup (markup);
|
|
gtk_container_add (GTK_CONTAINER (item), item->priv->cell_view);
|
|
gtk_widget_show (item->priv->cell_view);
|
|
|
|
return GTK_WIDGET (item);
|
|
}
|
|
|
|
GtkWidget *
|
|
gtk_cell_view_menu_item_new_from_model (GtkTreeModel *model,
|
|
GtkTreePath *path)
|
|
{
|
|
GtkCellViewMenuItem *item;
|
|
|
|
item = g_object_new (GTK_TYPE_CELL_VIEW_MENU_ITEM, NULL);
|
|
|
|
item->priv->cell_view = gtk_cell_view_new ();
|
|
gtk_container_add (GTK_CONTAINER (item), item->priv->cell_view);
|
|
|
|
gtk_cell_view_set_model (GTK_CELL_VIEW (item->priv->cell_view), model);
|
|
gtk_cell_view_set_displayed_row (GTK_CELL_VIEW (item->priv->cell_view), path);
|
|
|
|
gtk_widget_show (item->priv->cell_view);
|
|
|
|
return GTK_WIDGET (item);
|
|
}
|