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

Make this function public API. (#307099, Todd Berman)

Browse Source 
2006-01-09  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtk.symbols:
	* gtk/gtkwindow.h:
	* gtk/gtkwindow.c (gtk_window_get_group): Make this function
	public API.  (#307099, Todd Berman)

	* gtk/gtkmenu.c:
	* gtk/gtkmain.c:
	* gtk/gtkentrycompletion.c:
	* gtk/gtkcombo.c:
	* gtk/gtkcombobox.c: Update all callers.
This commit is contained in:
Matthias Clasen 2006-01-10 04:33:30 +00:00 committed by Matthias Clasen
parent 990b529379
commit dcfac2c69c
12 changed files with 51 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,5 +1,16 @@
2006-01-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtk.symbols:
* gtk/gtkwindow.h:
* gtk/gtkwindow.c (gtk_window_get_group): Make this function
public API. (#307099, Todd Berman)
* gtk/gtkmenu.c:
* gtk/gtkmain.c:
* gtk/gtkentrycompletion.c:
* gtk/gtkcombo.c:
* gtk/gtkcombobox.c: Update all callers.
* gtk/gtkentry.c (paste_received): Make GtkEntryCompletion
complete on pastes at the end. (#165714, Christian Neumair)

11
ChangeLog.pre-2-10
View File

@ -1,5 +1,16 @@
2006-01-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtk.symbols:
* gtk/gtkwindow.h:
* gtk/gtkwindow.c (gtk_window_get_group): Make this function
public API. (#307099, Todd Berman)
* gtk/gtkmenu.c:
* gtk/gtkmain.c:
* gtk/gtkentrycompletion.c:
* gtk/gtkcombo.c:
* gtk/gtkcombobox.c: Update all callers.
* gtk/gtkentry.c (paste_received): Make GtkEntryCompletion
complete on pastes at the end. (#165714, Christian Neumair)

3
docs/reference/ChangeLog
View File

@ -1,6 +1,7 @@
2006-01-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtk-sections.txt: Add gtk_widget_get_action
* gtk/gtk-sections.txt: Add gtk_widget_get_action,
gtk_window_get_group
2005-12-30 Matthias Clasen <mclasen@redhat.com>

1
docs/reference/gtk/gtk-sections.txt
View File

@ -4831,6 +4831,7 @@ gtk_window_get_skip_pager_hint
gtk_window_get_urgency_hint
gtk_window_get_accept_focus
gtk_window_get_focus_on_map
gtk_window_get_group
gtk_window_move
gtk_window_parse_geometry
gtk_window_reshow_with_initial_size

1
gtk/gtk.symbols
View File

@ -3962,6 +3962,7 @@ gtk_window_get_focus
gtk_window_get_focus_on_map
gtk_window_get_frame_dimensions
gtk_window_get_gravity
gtk_window_get_group
gtk_window_get_has_frame
gtk_window_get_icon
gtk_window_get_icon_list

4
gtk/gtkcombo.c
View File

@ -562,7 +562,7 @@ gtk_combo_popup_list (GtkCombo *combo)
if (GTK_IS_WINDOW (toplevel))
{
gtk_window_group_add_window (_gtk_window_get_group (GTK_WINDOW (toplevel)),
gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)),
GTK_WINDOW (combo->popwin));
}
@ -594,7 +594,7 @@ gtk_combo_popdown_list (GtkCombo *combo)
gtk_widget_hide (combo->popwin);
gtk_window_group_add_window (_gtk_window_get_group (NULL), GTK_WINDOW (combo->popwin));
gtk_window_group_add_window (gtk_window_get_group (NULL), GTK_WINDOW (combo->popwin));
}
static gboolean

4
gtk/gtkcombobox.c
View File

@ -1212,7 +1212,7 @@ gtk_combo_box_set_popup_widget (GtkComboBox *combo_box,
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (combo_box));
if (GTK_IS_WINDOW (toplevel))
gtk_window_group_add_window (_gtk_window_get_group (GTK_WINDOW (toplevel)),
gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)),
GTK_WINDOW (combo_box->priv->popup_window));
gtk_window_set_resizable (GTK_WINDOW (combo_box->priv->popup_window), FALSE);
@ -1698,7 +1698,7 @@ gtk_combo_box_popup (GtkComboBox *combo_box)
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (combo_box));
if (GTK_IS_WINDOW (toplevel))
gtk_window_group_add_window (_gtk_window_get_group (GTK_WINDOW (toplevel)),
gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)),
GTK_WINDOW (combo_box->priv->popup_window));
gtk_widget_show_all (combo_box->priv->popup_frame);

2
gtk/gtkentrycompletion.c
View File

@ -1444,7 +1444,7 @@ _gtk_entry_completion_popup (GtkEntryCompletion *completion)
toplevel = gtk_widget_get_toplevel (completion->priv->entry);
if (GTK_IS_WINDOW (toplevel))
gtk_window_group_add_window (_gtk_window_get_group (GTK_WINDOW (toplevel)),
gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)),
GTK_WINDOW (completion->priv->popup_window));
/* prevent the first row being focused */

6
gtk/gtkmain.c
View File

@ -1477,9 +1477,9 @@ gtk_main_get_window_group (GtkWidget *widget)
toplevel = gtk_widget_get_toplevel (widget);
if (toplevel && GTK_IS_WINDOW (toplevel))
return _gtk_window_get_group (GTK_WINDOW (toplevel));
return gtk_window_get_group (GTK_WINDOW (toplevel));
else
return _gtk_window_get_group (NULL);
return gtk_window_get_group (NULL);
}
typedef struct
@ -1550,7 +1550,7 @@ gtk_grab_notify (GtkWindowGroup *group,
GtkWindow *toplevel = toplevels->data;
toplevels = g_list_delete_link (toplevels, toplevels);
if (group == _gtk_window_get_group (toplevel))
if (group == gtk_window_get_group (toplevel))
gtk_container_foreach (GTK_CONTAINER (toplevel), gtk_grab_notify_foreach, &info);
g_object_unref (toplevel);
}

6
gtk/gtkmenu.c
View File

@ -1397,7 +1397,7 @@ gtk_menu_popup (GtkMenu *menu,
toplevel = gtk_widget_get_toplevel (parent_menu_shell);
if (GTK_IS_WINDOW (toplevel))
gtk_window_group_add_window (_gtk_window_get_group (GTK_WINDOW (toplevel)),
gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)),
GTK_WINDOW (menu->toplevel));
}
@ -1479,7 +1479,7 @@ gtk_menu_popdown (GtkMenu *menu)
/* The X Grab, if present, will automatically be removed when we hide
* the window */
gtk_widget_hide (menu->toplevel);
gtk_window_group_add_window (_gtk_window_get_group (NULL), GTK_WINDOW (menu->toplevel));
gtk_window_group_add_window (gtk_window_get_group (NULL), GTK_WINDOW (menu->toplevel));
if (menu->torn_off)
{
@ -4424,7 +4424,7 @@ gtk_menu_grab_notify (GtkWidget *widget,
GtkWidget *grab;
toplevel = gtk_widget_get_toplevel (widget);
group = _gtk_window_get_group (GTK_WINDOW (toplevel));
group = gtk_window_get_group (GTK_WINDOW (toplevel));
grab = _gtk_window_group_get_current_grab (group);
if (!was_grabbed)

16
gtk/gtkwindow.c
View File

@ -7030,7 +7030,7 @@ gtk_window_group_add_window (GtkWindowGroup *window_group,
if (window->group)
gtk_window_group_remove_window (window->group, window);
else
window_group_cleanup_grabs (_gtk_window_get_group (NULL), window);
window_group_cleanup_grabs (gtk_window_get_group (NULL), window);
window->group = window_group;
@ -7062,10 +7062,20 @@ gtk_window_group_remove_window (GtkWindowGroup *window_group,
g_object_unref (window);
}
/* Return the group for the window or the default group
/**
* gtk_window_get_group:
* @window: a #GtkWindow, or %NULL
*
* Returns the group for @window or the default group, if
* @window is %NULL or if @window does not have an explicit
* window group.
*
* Returns: the #GtkWindowGroup for a window or the default group
*
* Since: 2.10
*/
GtkWindowGroup *
_gtk_window_get_group (GtkWindow *window)
gtk_window_get_group (GtkWindow *window)
{
if (window && window->group)
return window->group;

2
gtk/gtkwindow.h
View File

@ -364,6 +364,7 @@ void gtk_window_get_position (GtkWindow *window,
gint *root_y);
gboolean gtk_window_parse_geometry (GtkWindow *window,
const gchar *geometry);
GtkWindowGroup *gtk_window_get_group (GtkWindow *window);
/* Ignore this unless you are writing a GUI builder */
void gtk_window_reshow_with_initial_size (GtkWindow *window);
@ -393,7 +394,6 @@ void _gtk_window_constrain_size (GtkWindow *window,
gint height,
gint *new_width,
gint *new_height);
GtkWindowGroup *_gtk_window_get_group (GtkWindow *window);
GtkWidget *_gtk_window_group_get_current_grab (GtkWindowGroup *window_group);
void _gtk_window_set_has_toplevel_focus (GtkWindow *window,