Commit 8acfd1e9 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Patch from Erwann Chenede, #73900 fixing a lot of warnings with Forte CC,

Wed Mar 20 16:36:08 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/*.c: Patch from Erwann Chenede, #73900 fixing
        a lot of warnings with Forte CC, mostly implicit
        casts between void * and function pointers.

        * gdk/gdkevents.c (gdk_event_get_state): GdkEventVisibility's
        state field is not a GdkModifierType. (Also #73900)
parent 67359a9c
Wed Mar 20 16:36:08 2002 Owen Taylor <otaylor@redhat.com>
* gtk/*.c: Patch from Erwann Chenede, #73900 fixing
a lot of warnings with Forte CC, mostly implicit
casts between void * and function pointers.
* gdk/gdkevents.c (gdk_event_get_state): GdkEventVisibility's
state field is not a GdkModifierType. (Also #73900)
Wed Mar 20 12:35:22 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_grab_default): Remove
......
Wed Mar 20 16:36:08 2002 Owen Taylor <otaylor@redhat.com>
* gtk/*.c: Patch from Erwann Chenede, #73900 fixing
a lot of warnings with Forte CC, mostly implicit
casts between void * and function pointers.
* gdk/gdkevents.c (gdk_event_get_state): GdkEventVisibility's
state field is not a GdkModifierType. (Also #73900)
Wed Mar 20 12:35:22 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_grab_default): Remove
......
Wed Mar 20 16:36:08 2002 Owen Taylor <otaylor@redhat.com>
* gtk/*.c: Patch from Erwann Chenede, #73900 fixing
a lot of warnings with Forte CC, mostly implicit
casts between void * and function pointers.
* gdk/gdkevents.c (gdk_event_get_state): GdkEventVisibility's
state field is not a GdkModifierType. (Also #73900)
Wed Mar 20 12:35:22 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_grab_default): Remove
......
Wed Mar 20 16:36:08 2002 Owen Taylor <otaylor@redhat.com>
* gtk/*.c: Patch from Erwann Chenede, #73900 fixing
a lot of warnings with Forte CC, mostly implicit
casts between void * and function pointers.
* gdk/gdkevents.c (gdk_event_get_state): GdkEventVisibility's
state field is not a GdkModifierType. (Also #73900)
Wed Mar 20 12:35:22 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_grab_default): Remove
......
Wed Mar 20 16:36:08 2002 Owen Taylor <otaylor@redhat.com>
* gtk/*.c: Patch from Erwann Chenede, #73900 fixing
a lot of warnings with Forte CC, mostly implicit
casts between void * and function pointers.
* gdk/gdkevents.c (gdk_event_get_state): GdkEventVisibility's
state field is not a GdkModifierType. (Also #73900)
Wed Mar 20 12:35:22 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_grab_default): Remove
......
Wed Mar 20 16:36:08 2002 Owen Taylor <otaylor@redhat.com>
* gtk/*.c: Patch from Erwann Chenede, #73900 fixing
a lot of warnings with Forte CC, mostly implicit
casts between void * and function pointers.
* gdk/gdkevents.c (gdk_event_get_state): GdkEventVisibility's
state field is not a GdkModifierType. (Also #73900)
Wed Mar 20 12:35:22 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_grab_default): Remove
......
......@@ -363,7 +363,7 @@ _gdk_pixbuf_load_module (GdkPixbufModule *image_module,
image_module->module = module;
if (pixbuf_module_symbol (module, name, "fill_vtable", &sym)) {
ModuleFillVtableFunc func = sym;
ModuleFillVtableFunc func = (ModuleFillVtableFunc) sym;
(* func) (image_module);
retval = TRUE;
} else {
......
......@@ -516,8 +516,6 @@ gdk_event_get_state (GdkEvent *event,
*state = event->property.state;
return TRUE;
case GDK_VISIBILITY_NOTIFY:
*state = event->visibility.state;
return TRUE;
case GDK_CLIENT_EVENT:
case GDK_NO_EXPOSE:
case GDK_CONFIGURE:
......
......@@ -314,7 +314,8 @@ gdk_pixmap_foreign_new (GdkNativeWindow anid)
GdkPixmapImplX11 *pix_impl;
Pixmap xpixmap;
Window root_return;
unsigned int x_ret, y_ret, w_ret, h_ret, bw_ret, depth_ret;
int x_ret, y_ret;
unsigned int w_ret, h_ret, bw_ret, depth_ret;
/* check to make sure we were passed something at
least a little sane */
......
......@@ -388,7 +388,7 @@ gtk_accel_label_set_accel_widget (GtkAccelLabel *accel_label,
{
gtk_accel_label_set_accel_closure (accel_label, NULL);
g_signal_handlers_disconnect_by_func (accel_label->accel_widget,
G_CALLBACK (refetch_widget_accel_closure),
(gpointer) refetch_widget_accel_closure,
accel_label);
g_object_unref (accel_label->accel_widget);
}
......@@ -448,7 +448,7 @@ gtk_accel_label_set_accel_closure (GtkAccelLabel *accel_label,
if (accel_label->accel_closure)
{
g_signal_handlers_disconnect_by_func (accel_label->accel_group,
G_CALLBACK (check_accel_changed),
(gpointer) check_accel_changed,
accel_label);
accel_label->accel_group = NULL;
g_closure_unref (accel_label->accel_closure);
......
......@@ -457,7 +457,7 @@ accel_map_parse_statement (GScanner *scanner)
{
guint (*parser_func) (GScanner*);
parser_func = scanner->value.v_symbol;
parser_func = (guint (*) (GScanner *))scanner->value.v_symbol;
expected_token = parser_func (scanner);
}
......@@ -512,7 +512,8 @@ gtk_accel_map_load_scanner (GScanner *scanner)
symbol_2_token = scanner->config->symbol_2_token;
scanner->config->symbol_2_token = FALSE;
saved_symbol = g_scanner_lookup_symbol (scanner, "gtk_accel_path");
g_scanner_scope_add_symbol (scanner, 0, "gtk_accel_path", accel_map_parse_accel_path);
g_scanner_scope_add_symbol (scanner, 0, "gtk_accel_path",
(gpointer) accel_map_parse_accel_path);
/* outer parsing loop
*/
......
......@@ -1916,7 +1916,7 @@ chain_widget_destroyed (GtkWidget *widget,
chain = g_list_remove (chain, widget);
g_signal_handlers_disconnect_by_func (G_OBJECT (widget),
chain_widget_destroyed,
(gpointer) chain_widget_destroyed,
user_data);
g_object_set_data (G_OBJECT (container),
......@@ -2043,7 +2043,7 @@ gtk_container_unset_focus_chain (GtkContainer *container)
while (tmp_list != NULL)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (tmp_list->data),
chain_widget_destroyed,
(gpointer) chain_widget_destroyed,
container);
tmp_list = g_list_next (tmp_list);
......
......@@ -1585,7 +1585,7 @@ gtk_entry_focus_out (GtkWidget *widget,
gtk_entry_check_cursor_blink (entry);
g_signal_handlers_disconnect_by_func (gdk_keymap_get_default (),
gtk_entry_keymap_direction_changed,
(gpointer) gtk_entry_keymap_direction_changed,
entry);
return FALSE;
......
......@@ -163,16 +163,16 @@ gtk_im_multicontext_set_slave (GtkIMMulticontext *multicontext,
gtk_im_context_reset (multicontext->slave);
g_signal_handlers_disconnect_by_func (multicontext->slave,
gtk_im_multicontext_preedit_start_cb,
(gpointer) gtk_im_multicontext_preedit_start_cb,
multicontext);
g_signal_handlers_disconnect_by_func (multicontext->slave,
gtk_im_multicontext_preedit_end_cb,
(gpointer) gtk_im_multicontext_preedit_end_cb,
multicontext);
g_signal_handlers_disconnect_by_func (multicontext->slave,
gtk_im_multicontext_preedit_changed_cb,
(gpointer) gtk_im_multicontext_preedit_changed_cb,
multicontext);
g_signal_handlers_disconnect_by_func (multicontext->slave,
gtk_im_multicontext_commit_cb,
(gpointer) gtk_im_multicontext_commit_cb,
multicontext);
g_object_unref (multicontext->slave);
......
......@@ -489,10 +489,11 @@ load_module (GSList *gtk_modules,
g_module_symbol (module, "gtk_module_init", (gpointer *) &modinit_func) &&
modinit_func)
{
if (!g_slist_find (gtk_modules, modinit_func))
if (!g_slist_find (gtk_modules, (gconstpointer) modinit_func))
{
g_module_make_resident (module);
gtk_modules = g_slist_prepend (gtk_modules, modinit_func);
gtk_modules = g_slist_prepend (gtk_modules,
(gpointer) modinit_func);
}
else
{
......@@ -762,7 +763,7 @@ gtk_init_check (int *argc,
{
GtkModuleInitFunc modinit;
modinit = slist->data;
modinit = (GtkModuleInitFunc) slist->data;
modinit (argc, argv);
}
}
......
......@@ -466,7 +466,7 @@ remove_from_window (GtkWindow *window,
if (!menubars)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (window),
G_CALLBACK (window_key_press_handler),
(gpointer) window_key_press_handler,
NULL);
}
......
......@@ -319,8 +319,7 @@ gtk_settings_get_property (GObject *object,
{
GValue tmp_value = { 0, };
GValue gstring_value = { 0, };
GtkRcPropertyParser parser = g_param_spec_get_qdata (pspec,
quark_property_parser);
GtkRcPropertyParser parser = (GtkRcPropertyParser) g_param_spec_get_qdata (pspec, quark_property_parser);
g_value_init (&gstring_value, G_TYPE_GSTRING);
......@@ -448,7 +447,7 @@ apply_queued_setting (GtkSettings *data,
GtkSettingsValue *qvalue)
{
GValue tmp_value = { 0, };
GtkRcPropertyParser parser = g_param_spec_get_qdata (pspec, quark_property_parser);
GtkRcPropertyParser parser = (GtkRcPropertyParser) g_param_spec_get_qdata (pspec, quark_property_parser);
g_value_init (&tmp_value, G_PARAM_SPEC_VALUE_TYPE (pspec));
if (_gtk_settings_parse_convert (parser, &qvalue->value,
......@@ -508,7 +507,7 @@ settings_install_property_parser (GtkSettingsClass *class,
g_object_freeze_notify (node->data);
g_object_class_install_property (G_OBJECT_CLASS (class), ++class_n_properties, pspec);
g_param_spec_set_qdata (pspec, quark_property_parser, parser);
g_param_spec_set_qdata (pspec, quark_property_parser, (gpointer) parser);
for (node = object_list; node; node = node->next)
{
......
......@@ -163,9 +163,9 @@ gtk_signal_compat_matched (GtkObject *object,
switch (action)
{
case 0: n_handlers = g_signal_handlers_disconnect_matched (object, match, 0, 0, NULL, func, data); break;
case 1: n_handlers = g_signal_handlers_block_matched (object, match, 0, 0, NULL, func, data); break;
case 2: n_handlers = g_signal_handlers_unblock_matched (object, match, 0, 0, NULL, func, data); break;
case 0: n_handlers = g_signal_handlers_disconnect_matched (object, match, 0, 0, NULL, (gpointer) func, data); break;
case 1: n_handlers = g_signal_handlers_block_matched (object, match, 0, 0, NULL, (gpointer) func, data); break;
case 2: n_handlers = g_signal_handlers_unblock_matched (object, match, 0, 0, NULL, (gpointer) func, data); break;
default: n_handlers = 0; break;
}
......
......@@ -1117,8 +1117,6 @@ gtk_spin_button_button_release (GtkWidget *widget,
}
else
return GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event);
return FALSE;
}
static gint
......
......@@ -1087,7 +1087,7 @@ gtk_text_view_set_buffer (GtkTextView *text_view,
g_slist_free (copy);
g_signal_handlers_disconnect_by_func (G_OBJECT (text_view->buffer),
gtk_text_view_mark_set_handler, text_view);
(gpointer) gtk_text_view_mark_set_handler, text_view);
g_object_unref (G_OBJECT (text_view->buffer));
text_view->dnd_mark = NULL;
......@@ -3921,7 +3921,7 @@ gtk_text_view_focus_out_event (GtkWidget *widget, GdkEventFocus *event)
}
g_signal_handlers_disconnect_by_func (gdk_keymap_get_default (),
keymap_direction_changed,
(gpointer) keymap_direction_changed,
text_view);
text_view->need_im_reset = TRUE;
......@@ -5307,9 +5307,11 @@ gtk_text_view_destroy_layout (GtkTextView *text_view)
gtk_text_view_end_selection_drag (text_view, NULL);
g_signal_handlers_disconnect_by_func (G_OBJECT (text_view->layout),
invalidated_handler, text_view);
(gpointer) invalidated_handler,
text_view);
g_signal_handlers_disconnect_by_func (G_OBJECT (text_view->layout),
changed_handler, text_view);
(gpointer) changed_handler,
text_view);
g_object_unref (G_OBJECT (text_view->layout));
text_view->layout = NULL;
}
......
......@@ -1492,17 +1492,17 @@ disconnect_ref_callbacks (GtkTreeModel *model)
g_signal_handlers_disconnect_matched (G_OBJECT (model),
G_SIGNAL_MATCH_FUNC,
0, 0, NULL,
gtk_tree_row_ref_inserted_callback,
(gpointer) gtk_tree_row_ref_inserted_callback,
NULL);
g_signal_handlers_disconnect_matched (G_OBJECT (model),
G_SIGNAL_MATCH_FUNC,
0, 0, NULL,
gtk_tree_row_ref_deleted_callback,
(gpointer) gtk_tree_row_ref_deleted_callback,
NULL);
g_signal_handlers_disconnect_matched (G_OBJECT (model),
G_SIGNAL_MATCH_FUNC,
0, 0, NULL,
gtk_tree_row_ref_reordered_callback,
(gpointer) gtk_tree_row_ref_reordered_callback,
NULL);
}
......
......@@ -7425,15 +7425,15 @@ gtk_tree_view_set_model (GtkTreeView *tree_view,
gtk_tree_view_unref_and_check_selection_tree (tree_view, tree_view->priv->tree);
g_signal_handlers_disconnect_by_func (G_OBJECT (tree_view->priv->model),
gtk_tree_view_row_changed, tree_view);
(gpointer) gtk_tree_view_row_changed, tree_view);
g_signal_handlers_disconnect_by_func (G_OBJECT (tree_view->priv->model),
gtk_tree_view_row_inserted, tree_view);
(gpointer) gtk_tree_view_row_inserted, tree_view);
g_signal_handlers_disconnect_by_func (G_OBJECT (tree_view->priv->model),
gtk_tree_view_row_has_child_toggled, tree_view);
(gpointer) gtk_tree_view_row_has_child_toggled, tree_view);
g_signal_handlers_disconnect_by_func (G_OBJECT (tree_view->priv->model),
gtk_tree_view_row_deleted, tree_view);
(gpointer) gtk_tree_view_row_deleted, tree_view);
g_signal_handlers_disconnect_by_func (G_OBJECT (tree_view->priv->model),
gtk_tree_view_rows_reordered, tree_view);
(gpointer) gtk_tree_view_rows_reordered, tree_view);
if (tree_view->priv->tree)
{
_gtk_rbtree_free (tree_view->priv->tree);
......
......@@ -6070,7 +6070,7 @@ gtk_widget_class_install_style_property_parser (GtkWidgetClass *class,
g_param_spec_ref (pspec);
g_param_spec_sink (pspec);
g_param_spec_set_qdata (pspec, quark_property_parser, parser);
g_param_spec_set_qdata (pspec, quark_property_parser, (gpointer) parser);
g_param_spec_pool_insert (style_property_spec_pool, pspec, G_OBJECT_CLASS_TYPE (class));
}
......@@ -6124,7 +6124,7 @@ gtk_widget_style_get_property (GtkWidget *widget,
peek_value = _gtk_style_peek_property_value (widget->style,
G_OBJECT_TYPE (widget),
pspec,
g_param_spec_get_qdata (pspec, quark_property_parser));
(GtkRcPropertyParser) g_param_spec_get_qdata (pspec, quark_property_parser));
/* auto-conversion of the caller's value type
*/
......@@ -6187,7 +6187,7 @@ gtk_widget_style_get_valist (GtkWidget *widget,
peek_value = _gtk_style_peek_property_value (widget->style,
G_OBJECT_TYPE (widget),
pspec,
g_param_spec_get_qdata (pspec, quark_property_parser));
(GtkRcPropertyParser) g_param_spec_get_qdata (pspec, quark_property_parser));
G_VALUE_LCOPY (peek_value, var_args, 0, &error);
if (error)
{
......
......@@ -1135,7 +1135,7 @@ gtk_window_remove_accel_group (GtkWindow *window,
g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group));
g_signal_handlers_disconnect_by_func (accel_group,
G_CALLBACK (gtk_window_notify_keys_changed),
(gpointer) gtk_window_notify_keys_changed,
window);
_gtk_accel_group_detach (accel_group, G_OBJECT (window));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment