Commit fd97c498 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

replaced some deprecated gdk functions.

2001-07-25  Sven Neumann  <sven@gimp.org>

	* app/gximage.c: replaced some deprecated gdk functions.

	* app/widgets/gimpcontainergridview.c
	* app/widgets/gimpcontainermenuimpl.c
	* app/widgets/gimpcursor.c
	* app/widgets/gimpdialogfactory.c
	* app/widgets/gimpdnd.c
	* app/widgets/gimpdock.c
	* app/widgets/gimpdockbook.c
	* app/widgets/gimphistogramview.c
	* app/widgets/gimplistitem.c
	* app/widgets/gimpmenuitem.c
	* app/widgets/gimpnavigationpreview.c
	* app/widgets/gimppreview.c
	* app/widgets/gimpwidgets-utils.c: more work on porting to GObject.
parent e0d1c871
2001-07-25 Sven Neumann <sven@gimp.org>
* app/gximage.c: replaced some deprecated gdk functions.
* app/widgets/gimpcontainergridview.c
* app/widgets/gimpcontainermenuimpl.c
* app/widgets/gimpcursor.c
* app/widgets/gimpdialogfactory.c
* app/widgets/gimpdnd.c
* app/widgets/gimpdock.c
* app/widgets/gimpdockbook.c
* app/widgets/gimphistogramview.c
* app/widgets/gimplistitem.c
* app/widgets/gimpmenuitem.c
* app/widgets/gimpnavigationpreview.c
* app/widgets/gimppreview.c
* app/widgets/gimpwidgets-utils.c: more work on porting to GObject.
2001-07-25 Michael Natterer <mitch@gimp.org>
* app/gui/dialogs-constructors.c
......
......@@ -67,7 +67,7 @@ delete_gximage (GXImage *gximage)
{
g_free (gximage->data);
if (gximage->gc)
gdk_gc_destroy (gximage->gc);
gdk_gc_unref (gximage->gc);
g_free (gximage);
}
......
......@@ -67,7 +67,7 @@ delete_gximage (GXImage *gximage)
{
g_free (gximage->data);
if (gximage->gc)
gdk_gc_destroy (gximage->gc);
gdk_gc_unref (gximage->gc);
g_free (gximage);
}
......
......@@ -257,17 +257,17 @@ gimp_container_grid_view_insert_item (GimpContainerView *view,
gtk_widget_show (preview);
gtk_signal_connect (GTK_OBJECT (preview), "clicked",
GTK_SIGNAL_FUNC (gimp_container_grid_view_item_selected),
view);
g_signal_connect (G_OBJECT (preview), "clicked",
G_CALLBACK (gimp_container_grid_view_item_selected),
view);
gtk_signal_connect (GTK_OBJECT (preview), "double_clicked",
GTK_SIGNAL_FUNC (gimp_container_grid_view_item_activated),
view);
g_signal_connect (G_OBJECT (preview), "double_clicked",
G_CALLBACK (gimp_container_grid_view_item_activated),
view);
gtk_signal_connect (GTK_OBJECT (preview), "context",
GTK_SIGNAL_FUNC (gimp_container_grid_view_item_context),
view);
g_signal_connect (G_OBJECT (preview), "context",
G_CALLBACK (gimp_container_grid_view_item_context),
view);
return (gpointer) preview;
}
......@@ -285,10 +285,9 @@ gimp_container_grid_view_remove_item (GimpContainerView *view,
if (preview)
{
if (gtk_object_get_data (GTK_OBJECT (view),
"last_selected_item") == preview)
if (g_object_get_data (G_OBJECT (view), "last_selected_item") == preview)
{
gtk_object_set_data (GTK_OBJECT (view), "last_selected_item", NULL);
g_object_set_data (G_OBJECT (view), "last_selected_item", NULL);
}
gtk_container_remove (GTK_CONTAINER (grid_view->wrap_box), preview);
......@@ -326,7 +325,7 @@ gimp_container_grid_view_clear_items (GimpContainerView *view)
grid_view = GIMP_CONTAINER_GRID_VIEW (view);
gtk_object_set_data (GTK_OBJECT (view), "last_selected_item", NULL);
g_object_set_data (G_OBJECT (view), "last_selected_item", NULL);
while (GTK_WRAP_BOX (grid_view->wrap_box)->children)
gtk_container_remove (GTK_CONTAINER (grid_view->wrap_box),
......@@ -394,7 +393,7 @@ gimp_container_grid_view_highlight_item (GimpContainerView *view,
grid_view = GIMP_CONTAINER_GRID_VIEW (view);
preview = gtk_object_get_data (GTK_OBJECT (view), "last_selected_item");
preview = g_object_get_data (G_OBJECT (view), "last_selected_item");
if (preview)
gimp_preview_set_border_color (preview, &white_color);
......@@ -454,5 +453,5 @@ gimp_container_grid_view_highlight_item (GimpContainerView *view,
gtk_label_set_text (GTK_LABEL (grid_view->name_label), _("(None)"));
}
gtk_object_set_data (GTK_OBJECT (view), "last_selected_item", preview);
g_object_set_data (G_OBJECT (view), "last_selected_item", preview);
}
......@@ -181,9 +181,9 @@ gimp_container_menu_impl_insert_item (GimpContainerMenu *menu,
gimp_menu_item_set_name_func (GIMP_MENU_ITEM (menu_item),
menu->get_name_func);
gtk_signal_connect (GTK_OBJECT (menu_item), "activate",
GTK_SIGNAL_FUNC (gimp_container_menu_impl_item_selected),
menu);
g_signal_connect (G_OBJECT (menu_item), "activate",
G_CALLBACK (gimp_container_menu_impl_item_selected),
menu);
gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menu_item, index);
gtk_widget_show (menu_item);
......
......@@ -548,7 +548,7 @@ gimp_cursor_new (GimpCursorType cursor_type,
if (gc == NULL)
gc = gdk_gc_new (bmcursor->bitmap);
gdk_window_get_size (bmcursor->bitmap, &width, &height);
gdk_drawable_get_size (bmcursor->bitmap, &width, &height);
/* new bitmap and mask for on-the-fly cursor creation */
......@@ -560,43 +560,43 @@ gimp_cursor_new (GimpCursorType cursor_type,
/* first draw the bitmap completely ... */
gdk_draw_pixmap (bitmap, gc, bmcursor->bitmap,
0, 0, 0, 0, width, height);
gdk_draw_drawable (bitmap, gc, bmcursor->bitmap,
0, 0, 0, 0, width, height);
if (bmmodifier)
{
gdk_gc_set_clip_mask (gc, bmmodifier->bitmap);
gdk_draw_pixmap (bitmap, gc, bmmodifier->bitmap,
0, 0, 0, 0, width, height);
gdk_draw_drawable (bitmap, gc, bmmodifier->bitmap,
0, 0, 0, 0, width, height);
gdk_gc_set_clip_mask (gc, NULL);
}
if (bmtool)
{
gdk_gc_set_clip_mask (gc, bmtool->bitmap);
gdk_draw_pixmap (bitmap, gc, bmtool->bitmap,
0, 0, 0, 0, width, height);
gdk_draw_drawable (bitmap, gc, bmtool->bitmap,
0, 0, 0, 0, width, height);
gdk_gc_set_clip_mask (gc, NULL);
}
/* ... then the mask */
gdk_draw_pixmap (mask, gc, bmcursor->mask,
0, 0, 0, 0, width, height);
gdk_draw_drawable (mask, gc, bmcursor->mask,
0, 0, 0, 0, width, height);
if (bmmodifier)
{
gdk_gc_set_clip_mask (gc, bmmodifier->mask);
gdk_draw_pixmap (mask, gc, bmmodifier->mask,
0, 0, 0, 0, width, height);
gdk_draw_drawable (mask, gc, bmmodifier->mask,
0, 0, 0, 0, width, height);
gdk_gc_set_clip_mask (gc, NULL);
}
if (bmtool)
{
gdk_gc_set_clip_mask (gc, bmtool->mask);
gdk_draw_pixmap (mask, gc, bmtool->mask,
0, 0, 0, 0, width, height);
gdk_draw_drawable (mask, gc, bmtool->mask,
0, 0, 0, 0, width, height);
gdk_gc_set_clip_mask (gc, NULL);
}
......@@ -609,8 +609,8 @@ gimp_cursor_new (GimpCursorType cursor_type,
bmcursor->x_hot,
bmcursor->y_hot);
gdk_bitmap_unref (bitmap);
gdk_bitmap_unref (mask);
gdk_drawable_unref (bitmap);
gdk_drawable_unref (mask);
return cursor;
}
......@@ -730,10 +730,9 @@ gimp_dialog_factory_add_dialog (GimpDialogFactory *factory,
factory->open_dialogs = g_list_prepend (factory->open_dialogs, dialog);
gtk_signal_connect_object_while_alive
(GTK_OBJECT (dialog), "destroy",
GTK_SIGNAL_FUNC (gimp_dialog_factory_remove_dialog),
GTK_OBJECT (factory));
g_signal_connect_object (G_OBJECT (dialog), "destroy",
G_CALLBACK (gimp_dialog_factory_remove_dialog),
factory, G_CONNECT_SWAPPED);
}
void
......@@ -757,8 +756,8 @@ gimp_dialog_factory_remove_dialog (GimpDialogFactory *factory,
factory->open_dialogs = g_list_remove (factory->open_dialogs, dialog);
dialog_factory = gtk_object_get_data (GTK_OBJECT (dialog),
"gimp-dialog-factory");
dialog_factory = g_object_get_data (G_OBJECT (dialog),
"gimp-dialog-factory");
if (! dialog_factory)
{
......@@ -991,8 +990,8 @@ gimp_dialog_factories_save_foreach (gchar *name,
dockable = (GimpDockable *) pages->data;
entry = gtk_object_get_data (GTK_OBJECT (dockable),
"gimp-dialog-factory-entry");
entry = g_object_get_data (G_OBJECT (dockable),
"gimp-dialog-factory-entry");
if (entry)
fprintf (fp, "\"%s\"%s",
......@@ -1225,9 +1224,9 @@ gimp_dialog_factories_hide_foreach (gchar *name,
visibility = GIMP_DIALOG_VISIBILITY_INVISIBLE;
}
gtk_object_set_data (GTK_OBJECT (list->data),
"gimp-dialog-visibility",
GINT_TO_POINTER (visibility));
g_object_set_data (G_OBJECT (list->data),
"gimp-dialog-visibility",
GINT_TO_POINTER (visibility));
}
}
}
......@@ -1246,8 +1245,8 @@ gimp_dialog_factories_show_foreach (gchar *name,
GimpDialogVisibilityState visibility;
visibility =
GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (list->data),
"gimp-dialog-visibility"));
GPOINTER_TO_INT (g_object_get_data (G_OBJECT (list->data),
"gimp-dialog-visibility"));
if (! GTK_WIDGET_VISIBLE (list->data) &&
visibility == GIMP_DIALOG_VISIBILITY_VISIBLE)
......
This diff is collapsed.
......@@ -426,8 +426,8 @@ gimp_dock_separator_drag_drop (GtkWidget *widget,
{
GimpDockable *src_dockable;
src_dockable = (GimpDockable *) gtk_object_get_data (GTK_OBJECT (source),
"gimp-dockable");
src_dockable = (GimpDockable *) g_object_get_data (G_OBJECT (source),
"gimp-dockable");
if (src_dockable)
{
......@@ -435,8 +435,8 @@ gimp_dock_separator_drag_drop (GtkWidget *widget,
GList *children;
gint index;
gtk_object_set_data (GTK_OBJECT (src_dockable),
"gimp-dock-drag-widget", NULL);
g_object_set_data (G_OBJECT (src_dockable),
"gimp-dock-drag-widget", NULL);
children = gtk_container_children (GTK_CONTAINER (widget->parent));
index = g_list_index (children, widget) / 2;
......@@ -445,12 +445,12 @@ gimp_dock_separator_drag_drop (GtkWidget *widget,
gimp_dock_add_book (dock, GIMP_DOCKBOOK (dockbook), index);
gtk_object_ref (GTK_OBJECT (src_dockable));
g_object_ref (G_OBJECT (src_dockable));
gimp_dockbook_remove (src_dockable->dockbook, src_dockable);
gimp_dockbook_add (GIMP_DOCKBOOK (dockbook), src_dockable, -1);
gtk_object_unref (GTK_OBJECT (src_dockable));
g_object_unref (G_OBJECT (src_dockable));
return TRUE;
}
......
......@@ -438,14 +438,14 @@ gimp_dockbook_tab_button_press (GtkWidget *widget,
"/Auto Follow Active Image");
notebook_menu = GTK_NOTEBOOK (dockbook)->menu;
gtk_object_ref (GTK_OBJECT (notebook_menu));
g_object_ref (G_OBJECT (notebook_menu));
gtk_menu_detach (GTK_MENU (notebook_menu));
GTK_NOTEBOOK (dockbook)->menu = notebook_menu;
gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_widget), notebook_menu);
gtk_object_unref (GTK_OBJECT (notebook_menu));
g_object_unref (G_OBJECT (notebook_menu));
gdk_window_get_origin (widget->window, &origin_x, &origin_y);
......@@ -461,7 +461,7 @@ gimp_dockbook_tab_button_press (GtkWidget *widget,
/* an item factory callback may destroy the dockbook, so reference
* if for gimp_dockbook_menu_end()
*/
gtk_object_ref (GTK_OBJECT (dockbook));
g_object_ref (G_OBJECT (dockbook));
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM (toggle_widget),
......@@ -533,9 +533,9 @@ gimp_dockbook_tab_drag_begin (GtkWidget *widget,
gtk_widget_show (window);
gtk_object_set_data_full (GTK_OBJECT (dockable), "gimp-dock-drag-widget",
window,
(GtkDestroyNotify) gtk_widget_destroy);
g_object_set_data_full (G_OBJECT (dockable), "gimp-dock-drag-widget",
window,
(GDestroyNotify) gtk_widget_destroy);
gtk_drag_set_icon_widget (context, window,
-8, -8);
......@@ -569,12 +569,12 @@ gimp_dockbook_tab_drag_end (GtkWidget *widget,
gimp_dock_add_book (GIMP_DOCK (dock), GIMP_DOCKBOOK (dockbook), 0);
gtk_object_ref (GTK_OBJECT (dockable));
g_object_ref (G_OBJECT (dockable));
gimp_dockbook_remove (dockable->dockbook, dockable);
gimp_dockbook_add (GIMP_DOCKBOOK (dockbook), dockable, 0);
gtk_object_unref (GTK_OBJECT (dockable));
g_object_unref (G_OBJECT (dockable));
gtk_widget_show (dock);
}
......
......@@ -215,10 +215,10 @@ histogram_widget_events (HistogramWidget *histogram,
gdk_pointer_ungrab (bevent->time);
gtk_signal_emit (GTK_OBJECT(histogram),
histogram_widget_signals[RANGE_CHANGED],
MIN (histogram->start, histogram->end),
MAX (histogram->start, histogram->end));
g_signal_emit (G_OBJECT(histogram),
histogram_widget_signals[RANGE_CHANGED],
MIN (histogram->start, histogram->end),
MAX (histogram->start, histogram->end));
break;
case GDK_MOTION_NOTIFY:
......@@ -250,9 +250,9 @@ histogram_widget_new (gint width,
gtk_drawing_area_size (GTK_DRAWING_AREA (histogram), width + 2, height + 2);
gtk_widget_set_events (GTK_WIDGET (histogram), HISTOGRAM_MASK);
gtk_signal_connect (GTK_OBJECT (histogram), "event",
GTK_SIGNAL_FUNC (histogram_widget_events),
histogram);
g_signal_connect (G_OBJECT (histogram), "event",
G_CALLBACK (histogram_widget_events),
histogram);
return histogram;
}
......@@ -273,10 +273,10 @@ histogram_widget_update (HistogramWidget *histogram_widget,
gtk_widget_draw (GTK_WIDGET (histogram_widget), NULL);
/* Give a range callback */
gtk_signal_emit (GTK_OBJECT (histogram_widget),
histogram_widget_signals[RANGE_CHANGED],
MIN (histogram_widget->start, histogram_widget->end),
MAX (histogram_widget->start, histogram_widget->end));
g_signal_emit (G_OBJECT (histogram_widget),
histogram_widget_signals[RANGE_CHANGED],
MIN (histogram_widget->start, histogram_widget->end),
MAX (histogram_widget->start, histogram_widget->end));
}
void
......@@ -300,10 +300,10 @@ histogram_widget_channel (HistogramWidget *histogram,
histogram_widget_draw (histogram, ALL);
/* Give a range callback */
gtk_signal_emit (GTK_OBJECT (histogram),
histogram_widget_signals[RANGE_CHANGED],
MIN (histogram->start, histogram->end),
MAX (histogram->start, histogram->end));
g_signal_emit (G_OBJECT (histogram),
histogram_widget_signals[RANGE_CHANGED],
MIN (histogram->start, histogram->end),
MAX (histogram->start, histogram->end));
}
GimpHistogram *
......
......@@ -320,8 +320,8 @@ gimp_list_item_set_viewable (GimpListItem *list_item,
g_return_if_fail (list_item != NULL);
g_return_if_fail (GIMP_IS_LIST_ITEM (list_item));
gtk_signal_emit (GTK_OBJECT (list_item), list_item_signals[SET_VIEWABLE],
viewable);
g_signal_emit (G_OBJECT (list_item), list_item_signals[SET_VIEWABLE], 0,
viewable);
}
static void
......@@ -341,10 +341,9 @@ gimp_list_item_real_set_viewable (GimpListItem *list_item,
gimp_list_item_name_changed (viewable, list_item);
gtk_signal_connect_while_alive (GTK_OBJECT (viewable), "name_changed",
GTK_SIGNAL_FUNC (gimp_list_item_name_changed),
list_item,
GTK_OBJECT (list_item));
g_signal_connect_object (G_OBJECT (viewable), "name_changed",
G_CALLBACK (gimp_list_item_name_changed),
list_item, 0);
gimp_gtk_drag_source_set_by_type (GTK_WIDGET (list_item),
GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
......@@ -366,7 +365,7 @@ gimp_list_item_set_preview_size (GimpListItem *list_item,
list_item->preview_size = preview_size;
gtk_signal_emit (GTK_OBJECT (list_item), list_item_signals[SET_PREVIEW_SIZE]);
g_signal_emit (G_OBJECT (list_item), list_item_signals[SET_PREVIEW_SIZE], 0);
}
static void
......
......@@ -144,8 +144,8 @@ static void
gimp_menu_item_set_viewable (GimpMenuItem *menu_item,
GimpViewable *viewable)
{
gtk_signal_emit (GTK_OBJECT (menu_item), menu_item_signals[SET_VIEWABLE],
viewable);
g_signal_emit (GTK_OBJECT (menu_item), menu_item_signals[SET_VIEWABLE], 0,
viewable);
}
static void
......@@ -165,10 +165,9 @@ gimp_menu_item_real_set_viewable (GimpMenuItem *menu_item,
gimp_menu_item_name_changed (viewable, menu_item);
gtk_signal_connect_while_alive (GTK_OBJECT (viewable), "name_changed",
GTK_SIGNAL_FUNC (gimp_menu_item_name_changed),
menu_item,
GTK_OBJECT (menu_item));
g_signal_connect_object (G_OBJECT (viewable), "name_changed",
G_CALLBACK (gimp_menu_item_name_changed),
menu_item, 0);
gimp_gtk_drag_source_set_by_type (GTK_WIDGET (menu_item),
GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
......
......@@ -242,8 +242,8 @@ gimp_navigation_preview_move_to (GimpNavigationPreview *nav_preview,
x = RINT (tx / ratiox);
y = RINT (ty / ratioy);
gtk_signal_emit (GTK_OBJECT (preview), preview_signals[MARKER_CHANGED],
x, y);
g_signal_emit (GTK_OBJECT (preview), preview_signals[MARKER_CHANGED], 0,
x, y);
}
static void
......
......@@ -242,8 +242,8 @@ gimp_navigation_preview_move_to (GimpNavigationPreview *nav_preview,
x = RINT (tx / ratiox);
y = RINT (ty / ratioy);
gtk_signal_emit (GTK_OBJECT (preview), preview_signals[MARKER_CHANGED],
x, y);
g_signal_emit (GTK_OBJECT (preview), preview_signals[MARKER_CHANGED], 0,
x, y);
}
static void
......
......@@ -421,17 +421,17 @@ gimp_preview_set_viewable (GimpPreview *preview,
G_TYPE_FROM_INSTANCE (preview->viewable));
}
gtk_signal_disconnect_by_func (GTK_OBJECT (preview->viewable),
GTK_SIGNAL_FUNC (gtk_widget_destroyed),
&preview->viewable);
g_signal_handlers_disconnect_by_func (G_OBJECT (preview->viewable),
G_CALLBACK (gtk_widget_destroyed),
&preview->viewable);
gtk_signal_disconnect_by_func (GTK_OBJECT (preview->viewable),
GTK_SIGNAL_FUNC (gimp_preview_paint),
preview);
g_signal_handlers_disconnect_by_func (G_OBJECT (preview->viewable),
G_CALLBACK (gimp_preview_paint),
preview);
gtk_signal_disconnect_by_func (GTK_OBJECT (preview->viewable),
GTK_SIGNAL_FUNC (gimp_preview_size_changed),
preview);
g_signal_handlers_disconnect_by_func (G_OBJECT (preview->viewable),
G_CALLBACK (gimp_preview_size_changed),
preview);
}
......@@ -451,19 +451,19 @@ gimp_preview_set_viewable (GimpPreview *preview,
NULL);
}
gtk_signal_connect (GTK_OBJECT (preview->viewable), "destroy",
GTK_SIGNAL_FUNC (gtk_widget_destroyed),
&preview->viewable);
g_signal_connect (G_OBJECT (preview->viewable), "destroy",
G_CALLBACK (gtk_widget_destroyed),
&preview->viewable);
gtk_signal_connect_object (GTK_OBJECT (preview->viewable),
"invalidate_preview",
GTK_SIGNAL_FUNC (gimp_preview_paint),
GTK_OBJECT (preview));
g_signal_connect_swapped (G_OBJECT (preview->viewable),
"invalidate_preview",
G_CALLBACK (gimp_preview_paint),
preview);
gtk_signal_connect_object (GTK_OBJECT (preview->viewable),
"size_changed",
GTK_SIGNAL_FUNC (gimp_preview_size_changed),
GTK_OBJECT (preview));
g_signal_connect_swapped (G_OBJECT (preview->viewable),
"size_changed",
G_CALLBACK (gimp_preview_size_changed),
preview);
if (preview->size != -1)
{
......@@ -563,7 +563,7 @@ gimp_preview_set_border_color (GimpPreview *preview,
void
gimp_preview_render (GimpPreview *preview)
{
gtk_signal_emit (GTK_OBJECT (preview), preview_signals[RENDER]);
g_signal_emit (G_OBJECT (preview), preview_signals[RENDER], 0);
}
static gint
......@@ -595,7 +595,7 @@ gimp_preview_button_press_event (GtkWidget *widget,
}
else if (bevent->button == 3)
{
gtk_signal_emit (GTK_OBJECT (widget), preview_signals[CONTEXT]);
g_signal_emit (G_OBJECT (widget), preview_signals[CONTEXT], 0);
}
else
{
......@@ -606,7 +606,7 @@ gimp_preview_button_press_event (GtkWidget *widget,
{
if (bevent->button == 1)
{
gtk_signal_emit (GTK_OBJECT (widget), preview_signals[DOUBLE_CLICKED]);
g_signal_emit (G_OBJECT (widget), preview_signals[DOUBLE_CLICKED], 0);
}
}
......@@ -643,13 +643,13 @@ gimp_preview_button_release_event (GtkWidget *widget,
if (preview->press_state &
(GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK))
{
gtk_signal_emit (GTK_OBJECT (widget),
preview_signals[EXTENDED_CLICKED],
preview->press_state);
g_signal_emit (G_OBJECT (widget),
preview_signals[EXTENDED_CLICKED], 0,
preview->press_state);
}
else
{
gtk_signal_emit (GTK_OBJECT (widget), preview_signals[CLICKED]);
g_signal_emit (G_OBJECT (widget), preview_signals[CLICKED], 0);
}
}
}
......@@ -728,8 +728,8 @@ gimp_preview_get_size (GimpPreview *preview,
g_return_if_fail (width != NULL);
g_return_if_fail (height != NULL);
gtk_signal_emit (GTK_OBJECT (preview), preview_signals[GET_SIZE],
size, width, height);
g_signal_emit (G_OBJECT (preview), preview_signals[GET_SIZE], 0,
size, width, height);
}
static void
......@@ -747,8 +747,8 @@ gimp_preview_needs_popup (GimpPreview *preview)
{
gboolean needs_popup = FALSE;
gtk_signal_emit (GTK_OBJECT (preview), preview_signals[NEEDS_POPUP],
&needs_popup);
g_signal_emit (G_OBJECT (preview), preview_signals[NEEDS_POPUP], 0,
&needs_popup);
return needs_popup;
}
......@@ -764,8 +764,8 @@ gimp_preview_create_popup (GimpPreview *preview)
{
GtkWidget *popup_preview = NULL;
gtk_signal_emit (GTK_OBJECT (preview), preview_signals[CREATE_POPUP],
&popup_preview);