AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

window: Get rid of public APIs that shouldn't be

Browse Source 
Event controllers should have replaced all of them.
And if they haven't, apps need to fix their code (I'm
looking at you Gimp).
This commit is contained in:
Benjamin Otte 2018-08-15 06:19:52 +02:00 committed by Matthias Clasen
parent 8c23ccd86e
commit cc13b47542
4 changed files with 5 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/reference/gtk/gtk4-sections.txt
View File

@ -4271,9 +4271,6 @@ gtk_window_get_toplevels
gtk_window_list_toplevels
gtk_window_add_mnemonic
gtk_window_remove_mnemonic
gtk_window_mnemonic_activate
gtk_window_activate_key
gtk_window_propagate_key_event
gtk_window_get_focus
gtk_window_set_focus
gtk_window_get_default_widget

64
gtk/gtkwindow.c
View File

@ -2646,7 +2646,7 @@ gtk_window_remove_mnemonic (GtkWindow *window,
_gtk_window_notify_keys_changed (window);
}
/**
/*
* gtk_window_mnemonic_activate:
* @window: a #GtkWindow
* @keyval: the mnemonic
@ -2656,7 +2656,7 @@ gtk_window_remove_mnemonic (GtkWindow *window,
*
* Returns: %TRUE if the activation is done.
*/
gboolean
static gboolean
gtk_window_mnemonic_activate (GtkWindow *window,
guint keyval,
GdkModifierType modifier)
@ -5717,66 +5717,6 @@ _gtk_window_query_nonaccels (GtkWindow *window,
return FALSE;
}
/**
* gtk_window_propagate_key_event:
* @window: a #GtkWindow
* @event: a #GdkEvent
*
* Propagate a key press or release event to the focus widget and
* up the focus container chain until a widget handles @event.
* This is normally called by the default ::key_press_event and
* ::key_release_event handlers for toplevel windows,
* however in some cases it may be useful to call this directly when
* overriding the standard key handling for a toplevel window.
*
* Returns: %TRUE if a widget in the focus chain handled the event.
*/
gboolean
gtk_window_propagate_key_event (GtkWindow *window,
GdkEvent *event)
{
GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
gboolean handled = FALSE;
GtkWidget *widget, *focus, *target;
g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
widget = GTK_WIDGET (window);
focus = priv->focus_widget;
if (focus)
g_object_ref (focus);
target = focus;
while (!handled &&
focus && focus != widget &&
gtk_widget_get_root (focus) == GTK_ROOT (widget))
{
GtkWidget *parent;
if (gtk_widget_is_sensitive (focus))
{
handled = gtk_widget_event (focus, (GdkEvent *)event, target);
if (handled)
break;
}
parent = _gtk_widget_get_parent (focus);
if (parent)
g_object_ref (parent);
g_object_unref (focus);
focus = parent;
}
if (focus)
g_object_unref (focus);
return handled;
}
static GtkWindowRegion
get_active_region_type (GtkWindow *window, gint x, gint y)
{

11
gtk/gtkwindow.h
View File

@ -199,22 +199,11 @@ void gtk_window_remove_mnemonic (GtkWindow *window,
guint keyval,
GtkWidget *target);
GDK_AVAILABLE_IN_ALL
gboolean gtk_window_mnemonic_activate (GtkWindow *window,
guint keyval,
GdkModifierType modifier);
GDK_AVAILABLE_IN_ALL
void gtk_window_set_mnemonic_modifier (GtkWindow *window,
GdkModifierType modifier);
GDK_AVAILABLE_IN_ALL
GdkModifierType gtk_window_get_mnemonic_modifier (GtkWindow *window);
GDK_AVAILABLE_IN_ALL
gboolean gtk_window_activate_key (GtkWindow *window,
GdkEvent *event);
GDK_AVAILABLE_IN_ALL
gboolean gtk_window_propagate_key_event (GtkWindow *window,
GdkEvent *event);
GDK_AVAILABLE_IN_ALL
void gtk_window_present (GtkWindow *window);
GDK_AVAILABLE_IN_ALL

3
gtk/gtkwindowprivate.h
View File

@ -69,6 +69,9 @@ gboolean _gtk_window_query_nonaccels (GtkWindow *window,
guint accel_key,
GdkModifierType accel_mods);
gboolean gtk_window_activate_key (GtkWindow *window,
GdkEvent *event);
void _gtk_window_schedule_mnemonics_visible (GtkWindow *window);
void _gtk_window_notify_keys_changed (GtkWindow *window);