Commit b6b4e13f authored by Havoc Pennington's avatar Havoc Pennington Committed by Havoc Pennington

fix warnings

2001-03-23  Havoc Pennington  <hp@redhat.com>

	* gtk/testgtk.c: fix warnings

	* gtk/gtktoolbar.c (gtk_toolbar_insert_element): fix return value

	* gtk/gtktextview.c: fix warnings

	* gtk/gtktext.c (find_cursor_at_line): fix warning

	* gtk/gtkselection.c (gtk_selection_notify): fix warning

	* gtk/gtkitemfactory.c (gtk_item_factory_menu_pos): fix signature
	of this function

	* gtk/gtkimmulticontext.c (gtk_im_multicontext_append_menuitems):
	fix warning

	* gtk/gtkhandlebox.c (gtk_handle_box_style_set): fix warning

	* gtk/gtkfontsel.c: fix warning

	* gtk/gtkcolorsel.c: fix warnings
parent dc0cd67d
2001-03-23 Havoc Pennington <hp@redhat.com>
* gtk/testgtk.c: fix warnings
* gtk/gtktoolbar.c (gtk_toolbar_insert_element): fix return value
* gtk/gtktextview.c: fix warnings
* gtk/gtktext.c (find_cursor_at_line): fix warning
* gtk/gtkselection.c (gtk_selection_notify): fix warning
* gtk/gtkitemfactory.c (gtk_item_factory_menu_pos): fix signature
of this function
* gtk/gtkimmulticontext.c (gtk_im_multicontext_append_menuitems):
fix warning
* gtk/gtkhandlebox.c (gtk_handle_box_style_set): fix warning
* gtk/gtkfontsel.c: fix warning
* gtk/gtkcolorsel.c: fix warnings
2001-03-23 Havoc Pennington <hp@redhat.com>
* gtk/gtkhandlebox.c: Apply property patch from Lee Mallabone
......
2001-03-23 Havoc Pennington <hp@redhat.com>
* gtk/testgtk.c: fix warnings
* gtk/gtktoolbar.c (gtk_toolbar_insert_element): fix return value
* gtk/gtktextview.c: fix warnings
* gtk/gtktext.c (find_cursor_at_line): fix warning
* gtk/gtkselection.c (gtk_selection_notify): fix warning
* gtk/gtkitemfactory.c (gtk_item_factory_menu_pos): fix signature
of this function
* gtk/gtkimmulticontext.c (gtk_im_multicontext_append_menuitems):
fix warning
* gtk/gtkhandlebox.c (gtk_handle_box_style_set): fix warning
* gtk/gtkfontsel.c: fix warning
* gtk/gtkcolorsel.c: fix warnings
2001-03-23 Havoc Pennington <hp@redhat.com>
* gtk/gtkhandlebox.c: Apply property patch from Lee Mallabone
......
2001-03-23 Havoc Pennington <hp@redhat.com>
* gtk/testgtk.c: fix warnings
* gtk/gtktoolbar.c (gtk_toolbar_insert_element): fix return value
* gtk/gtktextview.c: fix warnings
* gtk/gtktext.c (find_cursor_at_line): fix warning
* gtk/gtkselection.c (gtk_selection_notify): fix warning
* gtk/gtkitemfactory.c (gtk_item_factory_menu_pos): fix signature
of this function
* gtk/gtkimmulticontext.c (gtk_im_multicontext_append_menuitems):
fix warning
* gtk/gtkhandlebox.c (gtk_handle_box_style_set): fix warning
* gtk/gtkfontsel.c: fix warning
* gtk/gtkcolorsel.c: fix warnings
2001-03-23 Havoc Pennington <hp@redhat.com>
* gtk/gtkhandlebox.c: Apply property patch from Lee Mallabone
......
2001-03-23 Havoc Pennington <hp@redhat.com>
* gtk/testgtk.c: fix warnings
* gtk/gtktoolbar.c (gtk_toolbar_insert_element): fix return value
* gtk/gtktextview.c: fix warnings
* gtk/gtktext.c (find_cursor_at_line): fix warning
* gtk/gtkselection.c (gtk_selection_notify): fix warning
* gtk/gtkitemfactory.c (gtk_item_factory_menu_pos): fix signature
of this function
* gtk/gtkimmulticontext.c (gtk_im_multicontext_append_menuitems):
fix warning
* gtk/gtkhandlebox.c (gtk_handle_box_style_set): fix warning
* gtk/gtkfontsel.c: fix warning
* gtk/gtkcolorsel.c: fix warnings
2001-03-23 Havoc Pennington <hp@redhat.com>
* gtk/gtkhandlebox.c: Apply property patch from Lee Mallabone
......
2001-03-23 Havoc Pennington <hp@redhat.com>
* gtk/testgtk.c: fix warnings
* gtk/gtktoolbar.c (gtk_toolbar_insert_element): fix return value
* gtk/gtktextview.c: fix warnings
* gtk/gtktext.c (find_cursor_at_line): fix warning
* gtk/gtkselection.c (gtk_selection_notify): fix warning
* gtk/gtkitemfactory.c (gtk_item_factory_menu_pos): fix signature
of this function
* gtk/gtkimmulticontext.c (gtk_im_multicontext_append_menuitems):
fix warning
* gtk/gtkhandlebox.c (gtk_handle_box_style_set): fix warning
* gtk/gtkfontsel.c: fix warning
* gtk/gtkcolorsel.c: fix warnings
2001-03-23 Havoc Pennington <hp@redhat.com>
* gtk/gtkhandlebox.c: Apply property patch from Lee Mallabone
......
2001-03-23 Havoc Pennington <hp@redhat.com>
* gtk/testgtk.c: fix warnings
* gtk/gtktoolbar.c (gtk_toolbar_insert_element): fix return value
* gtk/gtktextview.c: fix warnings
* gtk/gtktext.c (find_cursor_at_line): fix warning
* gtk/gtkselection.c (gtk_selection_notify): fix warning
* gtk/gtkitemfactory.c (gtk_item_factory_menu_pos): fix signature
of this function
* gtk/gtkimmulticontext.c (gtk_im_multicontext_append_menuitems):
fix warning
* gtk/gtkhandlebox.c (gtk_handle_box_style_set): fix warning
* gtk/gtkfontsel.c: fix warning
* gtk/gtkcolorsel.c: fix warnings
2001-03-23 Havoc Pennington <hp@redhat.com>
* gtk/gtkhandlebox.c: Apply property patch from Lee Mallabone
......
2001-03-23 Havoc Pennington <hp@redhat.com>
* gtk/testgtk.c: fix warnings
* gtk/gtktoolbar.c (gtk_toolbar_insert_element): fix return value
* gtk/gtktextview.c: fix warnings
* gtk/gtktext.c (find_cursor_at_line): fix warning
* gtk/gtkselection.c (gtk_selection_notify): fix warning
* gtk/gtkitemfactory.c (gtk_item_factory_menu_pos): fix signature
of this function
* gtk/gtkimmulticontext.c (gtk_im_multicontext_append_menuitems):
fix warning
* gtk/gtkhandlebox.c (gtk_handle_box_style_set): fix warning
* gtk/gtkfontsel.c: fix warning
* gtk/gtkcolorsel.c: fix warnings
2001-03-23 Havoc Pennington <hp@redhat.com>
* gtk/gtkhandlebox.c: Apply property patch from Lee Mallabone
......
......@@ -811,8 +811,10 @@ palette_new (GtkColorSelection *colorsel)
gtk_object_set_data (GTK_OBJECT (retval), "color_set", GINT_TO_POINTER (0));
gtk_widget_set_events (retval, GDK_BUTTON_PRESS_MASK | GDK_EXPOSURE_MASK);
gtk_signal_connect (GTK_OBJECT (retval), "expose_event", palette_expose, colorsel);
gtk_signal_connect (GTK_OBJECT (retval), "button_press_event", palette_press, colorsel);
gtk_signal_connect (GTK_OBJECT (retval), "expose_event",
GTK_SIGNAL_FUNC (palette_expose), colorsel);
gtk_signal_connect (GTK_OBJECT (retval), "button_press_event",
GTK_SIGNAL_FUNC (palette_press), colorsel);
gtk_drag_dest_set (retval,
GTK_DEST_DEFAULT_HIGHLIGHT |
......@@ -821,9 +823,12 @@ palette_new (GtkColorSelection *colorsel)
targets, 1,
GDK_ACTION_COPY);
gtk_signal_connect (GTK_OBJECT (retval), "drag_end", palette_drag_end, NULL);
gtk_signal_connect (GTK_OBJECT (retval), "drag_data_received", palette_drop_handle, colorsel);
gtk_signal_connect (GTK_OBJECT (retval), "key_press_event", GTK_SIGNAL_FUNC (palette_activate), colorsel);
gtk_signal_connect (GTK_OBJECT (retval), "drag_end",
GTK_SIGNAL_FUNC (palette_drag_end), NULL);
gtk_signal_connect (GTK_OBJECT (retval), "drag_data_received",
GTK_SIGNAL_FUNC (palette_drop_handle), colorsel);
gtk_signal_connect (GTK_OBJECT (retval), "key_press_event",
GTK_SIGNAL_FUNC (palette_activate), colorsel);
return retval;
}
......@@ -911,8 +916,10 @@ mouse_release (GtkWidget *button,
ColorSelectionPrivate *priv;
priv = colorsel->private_data;
gtk_signal_disconnect_by_func (GTK_OBJECT (button), mouse_motion, data);
gtk_signal_disconnect_by_func (GTK_OBJECT (button), mouse_release, data);
gtk_signal_disconnect_by_func (GTK_OBJECT (button),
GTK_SIGNAL_FUNC (mouse_motion), data);
gtk_signal_disconnect_by_func (GTK_OBJECT (button),
GTK_SIGNAL_FUNC (mouse_release), data);
grab_color_at_mouse (button, event->x_root, event->y_root, data);
gdk_pointer_ungrab (0);
......@@ -928,9 +935,15 @@ mouse_press (GtkWidget *button,
ColorSelectionPrivate *priv;
priv = colorsel->private_data;
gtk_signal_connect (GTK_OBJECT (button), "motion_notify_event", mouse_motion, data);
gtk_signal_connect (GTK_OBJECT (button), "button_release_event", mouse_release, data);
gtk_signal_disconnect_by_func (GTK_OBJECT (button), mouse_press, data);
gtk_signal_connect (GTK_OBJECT (button), "motion_notify_event",
GTK_SIGNAL_FUNC (mouse_motion),
data);
gtk_signal_connect (GTK_OBJECT (button), "button_release_event",
GTK_SIGNAL_FUNC (mouse_release),
data);
gtk_signal_disconnect_by_func (GTK_OBJECT (button),
GTK_SIGNAL_FUNC (mouse_press),
data);
}
/* when the button is clicked */
......@@ -953,7 +966,8 @@ get_screen_color (GtkWidget *button)
if (priv->moving_dropper == FALSE)
{
priv->moving_dropper = TRUE;
gtk_signal_connect (GTK_OBJECT (button), "button_press_event", mouse_press, colorsel);
gtk_signal_connect (GTK_OBJECT (button), "button_press_event",
GTK_SIGNAL_FUNC (mouse_press), colorsel);
gdk_pointer_grab (button->window,
FALSE,
......@@ -1141,8 +1155,11 @@ make_label_spinbutton (GtkColorSelection *colorsel,
}
gtk_object_set_data (GTK_OBJECT (adjust), "COLORSEL", colorsel);
*spinbutton = gtk_spin_button_new (adjust, 10.0, 0);
gtk_signal_connect (GTK_OBJECT (*spinbutton), "focus_in_event", widget_focus_in, colorsel);
gtk_signal_connect (GTK_OBJECT (adjust), "value_changed", adjustment_changed, GINT_TO_POINTER (channel_type));
gtk_signal_connect (GTK_OBJECT (*spinbutton), "focus_in_event",
GTK_SIGNAL_FUNC (widget_focus_in), colorsel);
gtk_signal_connect (GTK_OBJECT (adjust), "value_changed",
GTK_SIGNAL_FUNC (adjustment_changed),
GINT_TO_POINTER (channel_type));
label = gtk_label_new (text);
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach_defaults (GTK_TABLE (table), label, i, i+1, j, j+1);
......@@ -1347,7 +1364,8 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
vbox = gtk_vbox_new (FALSE, 4);
priv->triangle_colorsel = gtk_hsv_new ();
gtk_signal_connect (GTK_OBJECT (priv->triangle_colorsel), "changed", hsv_changed, colorsel);
gtk_signal_connect (GTK_OBJECT (priv->triangle_colorsel), "changed",
GTK_SIGNAL_FUNC (hsv_changed), colorsel);
gtk_hsv_set_metrics (GTK_HSV (priv->triangle_colorsel), 174, 15);
gtk_box_pack_start (GTK_BOX (top_hbox), vbox, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), priv->triangle_colorsel, FALSE, FALSE, 0);
......@@ -1363,10 +1381,12 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
button = gtk_button_new ();
gtk_signal_connect (GTK_OBJECT (button), "focus_in_event", widget_focus_in, colorsel);
gtk_signal_connect (GTK_OBJECT (button), "focus_in_event",
GTK_SIGNAL_FUNC (widget_focus_in), colorsel);
gtk_widget_set_events (button, GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
gtk_object_set_data (GTK_OBJECT (button), "COLORSEL", colorsel);
gtk_signal_connect (GTK_OBJECT (button), "clicked", get_screen_color, NULL);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (get_screen_color), NULL);
dropper_pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, gtk_widget_get_colormap (button), &mask, NULL, picker);
dropper_image = gtk_pixmap_new (dropper_pixmap, mask);
gdk_pixmap_unref (dropper_pixmap);
......@@ -1397,19 +1417,24 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
gtk_object_set_data (GTK_OBJECT (adjust), "COLORSEL", colorsel);
priv->opacity_slider = gtk_hscale_new (adjust);
gtk_scale_set_draw_value (GTK_SCALE (priv->opacity_slider), FALSE);
gtk_signal_connect (GTK_OBJECT(adjust), "value_changed", adjustment_changed, GINT_TO_POINTER (COLORSEL_OPACITY));
gtk_signal_connect (GTK_OBJECT(adjust), "value_changed",
GTK_SIGNAL_FUNC (adjustment_changed),
GINT_TO_POINTER (COLORSEL_OPACITY));
gtk_table_attach_defaults (GTK_TABLE (table), priv->opacity_slider, 1, 7, 4, 5);
priv->opacity_entry = gtk_entry_new ();
gtk_widget_set_usize (priv->opacity_entry, 40, 0);
gtk_signal_connect (GTK_OBJECT (priv->opacity_entry), "focus_in_event", widget_focus_in, colorsel);
gtk_signal_connect (GTK_OBJECT (priv->opacity_entry), "activate", opacity_entry_changed, colorsel);
gtk_signal_connect (GTK_OBJECT (priv->opacity_entry), "focus_in_event",
GTK_SIGNAL_FUNC (widget_focus_in), colorsel);
gtk_signal_connect (GTK_OBJECT (priv->opacity_entry), "activate",
GTK_SIGNAL_FUNC (opacity_entry_changed), colorsel);
gtk_table_attach_defaults (GTK_TABLE (table), priv->opacity_entry, 7, 8, 4, 5);
label = gtk_label_new (_("Hex Value:"));
gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 5, 6);
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
priv->hex_entry = gtk_entry_new ();
gtk_signal_connect (GTK_OBJECT (priv->hex_entry), "activate", hex_changed, colorsel);
gtk_signal_connect (GTK_OBJECT (priv->hex_entry), "activate",
GTK_SIGNAL_FUNC (hex_changed), colorsel);
gtk_widget_set_usize (priv->hex_entry, 75, -1);
gtk_table_set_col_spacing (GTK_TABLE (table), 3, 15);
gtk_table_attach_defaults (GTK_TABLE (table), priv->hex_entry, 1, 5, 5, 6);
......@@ -1432,7 +1457,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
gtk_container_add (GTK_CONTAINER (priv->palette_frame), vbox);
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
button = gtk_button_new_with_label (_("Set Color"));
gtk_signal_connect (GTK_OBJECT (button), "clicked", add_button_pressed, colorsel);
gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (add_button_pressed), colorsel);
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
......
......@@ -430,7 +430,7 @@ gtk_font_selection_select_font (GtkWidget *w,
g_free (fontsel->font_desc->family_name);
fontsel->font_desc->family_name = g_strdup (family_name);
gtk_entry_set_text (fontsel->font_entry, family_name);
gtk_entry_set_text (GTK_ENTRY (fontsel->font_entry), family_name);
gtk_font_selection_show_available_styles (fontsel);
gtk_font_selection_select_best_style (fontsel, TRUE);
......
......@@ -475,7 +475,6 @@ gtk_handle_box_style_set (GtkWidget *widget,
GtkStyle *previous_style)
{
GtkHandleBox *hb;
GdkRectangle new_area;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_HANDLE_BOX (widget));
......
......@@ -353,7 +353,7 @@ gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context,
gtk_object_set_data (GTK_OBJECT (menuitem), "gtk-context-id",
(char *)contexts[i]->context_id);
gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
activate_cb, context);
GTK_SIGNAL_FUNC (activate_cb), context);
gtk_widget_show (menuitem);
gtk_menu_shell_append (menushell, menuitem);
......
......@@ -1503,6 +1503,7 @@ static void
gtk_item_factory_menu_pos (GtkMenu *menu,
gint *x,
gint *y,
gboolean *push_in,
gpointer func_data)
{
MenuPos *mpos = func_data;
......
......@@ -1365,7 +1365,9 @@ gtk_selection_notify (GtkWidget *widget,
if (event->property != GDK_NONE)
length = gdk_selection_property_get (widget->window, &buffer,
&type, &format);
else
length = 0; /* silence gcc */
if (event->property == GDK_NONE || buffer == NULL)
{
current_retrievals = g_list_remove_link (current_retrievals, tmp_list);
......
......@@ -3615,7 +3615,6 @@ static void
find_cursor_at_line (GtkText* text, const LineParams* start_line, gint pixel_height)
{
GdkWChar ch;
GtkOldEditable *old_editable = (GtkOldEditable *)text;
GtkPropertyMark mark = start_line->start;
TabStopMark tab_mark = start_line->tab_cont.tab_start;
......
......@@ -2650,7 +2650,6 @@ gtk_text_view_realize (GtkWidget *widget)
GtkTextView *text_view;
GdkWindowAttr attributes;
gint attributes_mask;
GSList *tmp_list;
text_view = GTK_TEXT_VIEW (widget);
GTK_WIDGET_SET_FLAGS (text_view, GTK_REALIZED);
......@@ -2702,7 +2701,6 @@ static void
gtk_text_view_unrealize (GtkWidget *widget)
{
GtkTextView *text_view;
GSList *tmp_list;
text_view = GTK_TEXT_VIEW (widget);
......@@ -4874,7 +4872,7 @@ append_action_signal (GtkTextView *text_view,
g_object_set_data (G_OBJECT (menuitem), "gtk-signal", (char *)signal);
gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
activate_cb, text_view);
GTK_SIGNAL_FUNC (activate_cb), text_view);
gtk_widget_show (menuitem);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
......
......@@ -1027,10 +1027,10 @@ gtk_toolbar_insert_element (GtkToolbar *toolbar,
else if (type != GTK_TOOLBAR_CHILD_RADIOBUTTON)
g_return_val_if_fail (widget == NULL, NULL);
gtk_toolbar_internal_insert_element (toolbar, type, widget, text,
tooltip_text, tooltip_private_text,
icon, callback, user_data,
position, FALSE);
return gtk_toolbar_internal_insert_element (toolbar, type, widget, text,
tooltip_text, tooltip_private_text,
icon, callback, user_data,
position, FALSE);
}
static GtkWidget *
......
......@@ -192,7 +192,7 @@ gtk_tooltips_force_window (GtkTooltips *tooltips)
gtk_signal_connect (GTK_OBJECT (tooltips->tip_window),
"destroy",
gtk_widget_destroyed,
GTK_SIGNAL_FUNC (gtk_widget_destroyed),
&tooltips->tip_window);
}
}
......
......@@ -2380,9 +2380,9 @@ uposition_stop_configure (GtkToggleButton *toggle,
GtkObject *window)
{
if (toggle->active)
gtk_signal_handler_block_by_func (window, uposition_configure, NULL);
gtk_signal_handler_block_by_func (window, GTK_SIGNAL_FUNC (uposition_configure), NULL);
else
gtk_signal_handler_unblock_by_func (window, uposition_configure, NULL);
gtk_signal_handler_unblock_by_func (window, GTK_SIGNAL_FUNC (uposition_configure), NULL);
}
static void
......@@ -3137,7 +3137,7 @@ static GtkItemFactoryEntry menu_items[] =
{ "/_Preferences/Shape/_Oval", NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Rectangle" },
{ "/_Preferences/Shape/_Rectangle", NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Square" },
{ "/_Preferences/Shape/_Oval", NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Rectangle" },
{ "/_Preferences/Shape/_Image", NULL, gtk_ifactory_cb, 0, "<ImageItem>", apple, sizeof(apple) },
{ "/_Preferences/Shape/_Image", NULL, gtk_ifactory_cb, 0, "<ImageItem>", (gchar**) apple, sizeof(apple) },
/* For testing deletion of menus */
{ "/_Preferences/Should_NotAppear", NULL, 0, 0, "<Branch>" },
......@@ -4382,10 +4382,10 @@ create_list (void)
static OptionMenuItem items[] =
{
{ "Single", list_toggle_sel_mode },
{ "Browse", list_toggle_sel_mode },
{ "Multiple", list_toggle_sel_mode },
{ "Extended", list_toggle_sel_mode }
{ "Single", GTK_SIGNAL_FUNC (list_toggle_sel_mode) },
{ "Browse", GTK_SIGNAL_FUNC (list_toggle_sel_mode) },
{ "Multiple", GTK_SIGNAL_FUNC (list_toggle_sel_mode) },
{ "Extended", GTK_SIGNAL_FUNC (list_toggle_sel_mode) }
};
if (!window)
......@@ -4872,10 +4872,10 @@ create_clist (void)
static OptionMenuItem items[] =
{
{ "Single", clist_toggle_sel_mode },
{ "Browse", clist_toggle_sel_mode },
{ "Multiple", clist_toggle_sel_mode },
{ "Extended", clist_toggle_sel_mode }
{ "Single", GTK_SIGNAL_FUNC (clist_toggle_sel_mode) },
{ "Browse", GTK_SIGNAL_FUNC (clist_toggle_sel_mode) },
{ "Multiple", GTK_SIGNAL_FUNC (clist_toggle_sel_mode) },
{ "Extended", GTK_SIGNAL_FUNC (clist_toggle_sel_mode) }
};
char text[TESTGTK_CLIST_COLUMNS][50];
......@@ -5659,32 +5659,32 @@ void create_ctree (void)
static OptionMenuItem items1[] =
{
{ "No lines", ctree_toggle_line_style },
{ "Solid", ctree_toggle_line_style },
{ "Dotted", ctree_toggle_line_style },
{ "Tabbed", ctree_toggle_line_style }
{ "No lines", GTK_SIGNAL_FUNC (ctree_toggle_line_style) },
{ "Solid", GTK_SIGNAL_FUNC (ctree_toggle_line_style) },
{ "Dotted", GTK_SIGNAL_FUNC (ctree_toggle_line_style) },
{ "Tabbed", GTK_SIGNAL_FUNC (ctree_toggle_line_style) }
};
static OptionMenuItem items2[] =
{
{ "None", ctree_toggle_expander_style },
{ "Square", ctree_toggle_expander_style },
{ "Triangle", ctree_toggle_expander_style },
{ "Circular", ctree_toggle_expander_style }
{ "None", GTK_SIGNAL_FUNC (ctree_toggle_expander_style) },
{ "Square", GTK_SIGNAL_FUNC (ctree_toggle_expander_style) },
{ "Triangle", GTK_SIGNAL_FUNC (ctree_toggle_expander_style) },
{ "Circular", GTK_SIGNAL_FUNC (ctree_toggle_expander_style) }
};
static OptionMenuItem items3[] =
{
{ "Left", ctree_toggle_justify },
{ "Right", ctree_toggle_justify }
{ "Left", GTK_SIGNAL_FUNC (ctree_toggle_justify) },
{ "Right", GTK_SIGNAL_FUNC (ctree_toggle_justify) }
};
static OptionMenuItem items4[] =
{
{ "Single", ctree_toggle_sel_mode },
{ "Browse", ctree_toggle_sel_mode },
{ "Multiple", ctree_toggle_sel_mode },
{ "Extended", ctree_toggle_sel_mode }
{ "Single", GTK_SIGNAL_FUNC (ctree_toggle_sel_mode) },
{ "Browse", GTK_SIGNAL_FUNC (ctree_toggle_sel_mode) },
{ "Multiple", GTK_SIGNAL_FUNC (ctree_toggle_sel_mode) },
{ "Extended", GTK_SIGNAL_FUNC (ctree_toggle_sel_mode) }
};
if (!window)
......@@ -6198,7 +6198,7 @@ create_flipping (void)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE);
gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
flipping_toggled_cb, FALSE);
GTK_SIGNAL_FUNC (flipping_toggled_cb), FALSE);
gtk_container_set_border_width (GTK_CONTAINER (check_button), 10);
......@@ -6273,8 +6273,6 @@ create_focus (void)
GtkWidget *table;
GtkWidget *frame;
GList *list = NULL;
GList *first = NULL, *second = NULL, *tmp_list = NULL;
gint i;
window = gtk_dialog_new_with_buttons ("Keyboard focus navigation",
NULL, 0,
......@@ -7196,10 +7194,10 @@ create_notebook (void)
static OptionMenuItem items[] =
{
{ "Standard", standard_notebook },
{ "No tabs", notabs_notebook },
{ "Borderless", borderless_notebook },
{ "Scrollable", scrollable_notebook },
{ "Standard", GTK_SIGNAL_FUNC (standard_notebook) },
{ "No tabs", GTK_SIGNAL_FUNC (notabs_notebook) },
{ "Borderless", GTK_SIGNAL_FUNC (borderless_notebook) },
{ "Scrollable", GTK_SIGNAL_FUNC (scrollable_notebook) },
};
if (!window)
......@@ -8070,28 +8068,28 @@ tracking_label (GtkWidget *window)
label);
button = gtk_button_new_with_label ("Deiconify");
gtk_signal_connect_object (GTK_WIDGET (button),
gtk_signal_connect_object (GTK_OBJECT (button),
"clicked",
GTK_SIGNAL_FUNC (gtk_window_deiconify),
GTK_OBJECT (window));
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
button = gtk_button_new_with_label ("Iconify");
gtk_signal_connect_object (GTK_WIDGET (button),
gtk_signal_connect_object (GTK_OBJECT (button),
"clicked",
GTK_SIGNAL_FUNC (gtk_window_iconify),
GTK_OBJECT (window));
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
button = gtk_button_new_with_label ("Present");
gtk_signal_connect_object (GTK_WIDGET (button),
gtk_signal_connect_object (GTK_OBJECT (button),
"clicked",
GTK_SIGNAL_FUNC (gtk_window_present),
GTK_OBJECT (window));
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
button = gtk_button_new_with_label ("Show");
gtk_signal_connect_object (GTK_WIDGET (button),
gtk_signal_connect_object (GTK_OBJECT (button),
"clicked",
GTK_SIGNAL_FUNC (gtk_widget_show),
GTK_OBJECT (window));
......@@ -8111,42 +8109,42 @@ get_state_controls (GtkWidget *window)
vbox = gtk_vbox_new (FALSE, 0);
button = gtk_button_new_with_label ("Stick");
gtk_signal_connect_object (GTK_WIDGET (button),
gtk_signal_connect_object (GTK_OBJECT (button),
"clicked",
GTK_SIGNAL_FUNC (gtk_window_stick),
GTK_OBJECT (window));
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
button = gtk_button_new_with_label ("Unstick");
gtk_signal_connect_object (GTK_WIDGET (button),
gtk_signal_connect_object (GTK_OBJECT (button),
"clicked",
GTK_SIGNAL_FUNC (gtk_window_unstick),
GTK_OBJECT (window));
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
button = gtk_button_new_with_label ("Maximize");
gtk_signal_connect_object (GTK_WIDGET (button),
gtk_signal_connect_object (GTK_OBJECT (button),
"clicked",
GTK_SIGNAL_FUNC (gtk_window_maximize),
GTK_OBJECT (window));
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
button = gtk_button_new_with_label ("Unmaximize");
gtk_signal_connect_object (GTK_WIDGET (button),
gtk_signal_connect_object (GTK_OBJECT (button),
"clicked",
GTK_SIGNAL_FUNC (gtk_window_unmaximize),
GTK_OBJECT (window));
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);