Skip to content

Commit 59053e1

Browse files
committed
patch 8.0.0557: GTK: using static gravities is not useful
Problem: GTK: using static gravities is not useful. Solution: Remove setting static gravities. (Kazunobu Kuriyama)
1 parent 7860bac commit 59053e1

File tree

2 files changed

+2
-31
lines changed

2 files changed

+2
-31
lines changed

src/gui_gtk_f.c

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,6 @@ static void gtk_form_position_child(GtkForm *form,
9292
gboolean force_allocate);
9393
static void gtk_form_position_children(GtkForm *form);
9494

95-
#if !GTK_CHECK_VERSION(3,16,0)
96-
static void gtk_form_set_static_gravity(GdkWindow *window,
97-
gboolean use_static);
98-
#endif
99-
10095
static void gtk_form_send_configure(GtkForm *form);
10196

10297
static void gtk_form_child_map(GtkWidget *widget, gpointer user_data);
@@ -370,10 +365,6 @@ gtk_form_realize(GtkWidget *widget)
370365
#endif
371366
gdk_window_set_user_data(form->bin_window, widget);
372367

373-
#if !GTK_CHECK_VERSION(3,16,0)
374-
gtk_form_set_static_gravity(form->bin_window, TRUE);
375-
#endif
376-
377368
#if GTK_CHECK_VERSION(3,0,0)
378369
{
379370
GtkStyleContext * const sctx = gtk_widget_get_style_context(widget);
@@ -845,9 +836,6 @@ gtk_form_attach_child_window(GtkForm *form, GtkFormChild *child)
845836
#endif
846837

847838
gtk_widget_set_parent_window(child->widget, child->window);
848-
#if !GTK_CHECK_VERSION(3,16,0)
849-
gtk_form_set_static_gravity(child->window, TRUE);
850-
#endif
851839
/*
852840
* Install signal handlers to map/unmap child->window
853841
* alongside with the actual widget.
@@ -879,15 +867,6 @@ gtk_form_realize_child(GtkForm *form, GtkFormChild *child)
879867
{
880868
gtk_form_attach_child_window(form, child);
881869
gtk_widget_realize(child->widget);
882-
883-
#if !GTK_CHECK_VERSION(3,16,0)
884-
if (child->window == NULL) /* might be already set, see above */
885-
# if GTK_CHECK_VERSION(3,0,0)
886-
gtk_form_set_static_gravity(gtk_widget_get_window(child->widget), TRUE);
887-
# else
888-
gtk_form_set_static_gravity(child->widget->window, TRUE);
889-
# endif
890-
#endif
891870
}
892871

893872
static void
@@ -999,16 +978,6 @@ gtk_form_position_children(GtkForm *form)
999978
gtk_form_position_child(form, tmp_list->data, FALSE);
1000979
}
1001980

1002-
#if !GTK_CHECK_VERSION(3,16,0)
1003-
static void
1004-
gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static)
1005-
{
1006-
/* We don't check if static gravity is actually supported, because it
1007-
* results in an annoying assertion error message. */
1008-
gdk_window_set_static_gravities(window, use_static);
1009-
}
1010-
#endif /* !GTK_CHECK_VERSION(3,16,0) */
1011-
1012981
void
1013982
gtk_form_move_resize(GtkForm *form, GtkWidget *widget,
1014983
gint x, gint y, gint w, gint h)

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
557,
767769
/**/
768770
556,
769771
/**/

0 commit comments

Comments
 (0)