Completely remove any use of GtkWindow allow-grow and allow-shrink properties
These have been deprecated and removed from master.
GtkWindow:resizable should be used instead.
This completes commit 1a03a65e36
Reported by Benjamin Otte
This commit is contained in:
parent
4198dd8519
commit
3ccc617052
@ -390,7 +390,6 @@ new_testrgb_window (GdkPixbuf *pixbuf, gchar *title)
|
|||||||
"GtkObject::user_data", NULL,
|
"GtkObject::user_data", NULL,
|
||||||
"GtkWindow::type", GTK_WINDOW_TOPLEVEL,
|
"GtkWindow::type", GTK_WINDOW_TOPLEVEL,
|
||||||
"GtkWindow::title", title ? title : "testrgb",
|
"GtkWindow::title", title ? title : "testrgb",
|
||||||
"GtkWindow::allow_shrink", TRUE,
|
|
||||||
NULL);
|
NULL);
|
||||||
g_signal_connect (window, "destroy",
|
g_signal_connect (window, "destroy",
|
||||||
G_CALLBACK (quit_func), NULL);
|
G_CALLBACK (quit_func), NULL);
|
||||||
|
@ -106,8 +106,7 @@ GtkWindow::default_width, GtkWindow::default_height:
|
|||||||
- default_height is -1 if unset, or >= 0 if
|
- default_height is -1 if unset, or >= 0 if
|
||||||
a default height is set
|
a default height is set
|
||||||
|
|
||||||
GtkWindow::allow_grow, GtkWindow::resizable:
|
GtkWindow::resizable:
|
||||||
- equivalent properties; changing one notifies on the other
|
|
||||||
- if FALSE, we set the min size to the max size in the geometry
|
- if FALSE, we set the min size to the max size in the geometry
|
||||||
hints.
|
hints.
|
||||||
- If the app programmer has called gtk_window_set_geometry_hints()
|
- If the app programmer has called gtk_window_set_geometry_hints()
|
||||||
|
@ -7599,7 +7599,6 @@ int main (int argc, char *argv[])
|
|||||||
dialog = gtk_dialog_new ();
|
dialog = gtk_dialog_new ();
|
||||||
gtk_window_set_title (GTK_WINDOW (dialog), "GTKToolbar Tutorial");
|
gtk_window_set_title (GTK_WINDOW (dialog), "GTKToolbar Tutorial");
|
||||||
gtk_widget_set_size_request (GTK_WIDGET (dialog), 600, 300);
|
gtk_widget_set_size_request (GTK_WIDGET (dialog), 600, 300);
|
||||||
GTK_WINDOW (dialog)->allow_shrink = TRUE;
|
|
||||||
|
|
||||||
/* typically we quit if someone tries to close us */
|
/* typically we quit if someone tries to close us */
|
||||||
g_signal_connect (dialog, "delete-event",
|
g_signal_connect (dialog, "delete-event",
|
||||||
|
@ -1968,6 +1968,7 @@ gtk_false G_GNUC_CONST
|
|||||||
gtk_true G_GNUC_CONST
|
gtk_true G_GNUC_CONST
|
||||||
gtk_events_pending
|
gtk_events_pending
|
||||||
gtk_disable_setlocale
|
gtk_disable_setlocale
|
||||||
|
gtk_distribute_natural_allocation
|
||||||
gtk_set_locale
|
gtk_set_locale
|
||||||
gtk_check_version
|
gtk_check_version
|
||||||
gtk_get_default_language
|
gtk_get_default_language
|
||||||
|
@ -717,7 +717,7 @@ gtk_decorated_window_recalculate_regions (GtkWindow *window)
|
|||||||
n_regions += 2; /* close, Title */
|
n_regions += 2; /* close, Title */
|
||||||
if (deco->maximizable)
|
if (deco->maximizable)
|
||||||
n_regions += 1;
|
n_regions += 1;
|
||||||
if (window->allow_shrink || window->allow_grow)
|
if (gtk_window_get_resizable (window))
|
||||||
n_regions += 2;
|
n_regions += 2;
|
||||||
|
|
||||||
if (deco->n_regions != n_regions)
|
if (deco->n_regions != n_regions)
|
||||||
@ -759,7 +759,7 @@ gtk_decorated_window_recalculate_regions (GtkWindow *window)
|
|||||||
region->type = GTK_WINDOW_REGION_TITLE;
|
region->type = GTK_WINDOW_REGION_TITLE;
|
||||||
region++;
|
region++;
|
||||||
|
|
||||||
if (window->allow_shrink || window->allow_grow)
|
if (gtk_window_get_resizable (window))
|
||||||
{
|
{
|
||||||
region->rect.x = width - (DECORATION_BORDER_RIGHT + 10);
|
region->rect.x = width - (DECORATION_BORDER_RIGHT + 10);
|
||||||
region->rect.y = height - DECORATION_BORDER_BOTTOM;
|
region->rect.y = height - DECORATION_BORDER_BOTTOM;
|
||||||
|
@ -7331,10 +7331,6 @@ gtk_window_get_resizable (GtkWindow *window)
|
|||||||
{
|
{
|
||||||
g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
|
g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
|
||||||
|
|
||||||
/* allow_grow is most likely to indicate the semantic concept we
|
|
||||||
* mean by "resizable" (and will be a reliable indicator if
|
|
||||||
* set_policy() hasn't been called)
|
|
||||||
*/
|
|
||||||
return window->resizable;
|
return window->resizable;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -41,8 +41,7 @@ main (int argc, char *argv[])
|
|||||||
"user_data", NULL,
|
"user_data", NULL,
|
||||||
"type", GTK_WINDOW_TOPLEVEL,
|
"type", GTK_WINDOW_TOPLEVEL,
|
||||||
"title", "hello world",
|
"title", "hello world",
|
||||||
"allow_grow", FALSE,
|
"resizable", FALSE,
|
||||||
"allow_shrink", FALSE,
|
|
||||||
"border_width", 10,
|
"border_width", 10,
|
||||||
NULL),
|
NULL),
|
||||||
"signal::destroy", gtk_main_quit, NULL,
|
"signal::destroy", gtk_main_quit, NULL,
|
||||||
|
@ -3375,8 +3375,7 @@ create_tooltips (GtkWidget *widget)
|
|||||||
"GtkWindow::type", GTK_WINDOW_TOPLEVEL,
|
"GtkWindow::type", GTK_WINDOW_TOPLEVEL,
|
||||||
"GtkContainer::border_width", 0,
|
"GtkContainer::border_width", 0,
|
||||||
"GtkWindow::title", "Tooltips",
|
"GtkWindow::title", "Tooltips",
|
||||||
"GtkWindow::allow_shrink", TRUE,
|
"GtkWindow::resizable", FALSE,
|
||||||
"GtkWindow::allow_grow", FALSE,
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
gtk_window_set_screen (GTK_WINDOW (window),
|
gtk_window_set_screen (GTK_WINDOW (window),
|
||||||
@ -3495,7 +3494,7 @@ create_image (GtkWidget *widget)
|
|||||||
/* this is bogus for testing drawing when allocation < request,
|
/* this is bogus for testing drawing when allocation < request,
|
||||||
* don't copy into real code
|
* don't copy into real code
|
||||||
*/
|
*/
|
||||||
g_object_set (window, "allow_shrink", TRUE, "allow_grow", TRUE, NULL);
|
gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
|
||||||
|
|
||||||
g_signal_connect (window, "destroy",
|
g_signal_connect (window, "destroy",
|
||||||
G_CALLBACK (gtk_widget_destroyed),
|
G_CALLBACK (gtk_widget_destroyed),
|
||||||
@ -6573,7 +6572,7 @@ create_rulers (GtkWidget *widget)
|
|||||||
gtk_window_set_screen (GTK_WINDOW (window),
|
gtk_window_set_screen (GTK_WINDOW (window),
|
||||||
gtk_widget_get_screen (widget));
|
gtk_widget_get_screen (widget));
|
||||||
|
|
||||||
g_object_set (window, "allow_shrink", TRUE, "allow_grow", TRUE, NULL);
|
gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
|
||||||
|
|
||||||
g_signal_connect (window, "destroy",
|
g_signal_connect (window, "destroy",
|
||||||
G_CALLBACK (gtk_widget_destroyed),
|
G_CALLBACK (gtk_widget_destroyed),
|
||||||
@ -8331,22 +8330,11 @@ set_geometry_callback (GtkWidget *entry,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
allow_shrink_callback (GtkWidget *widget,
|
resizable_callback (GtkWidget *widget,
|
||||||
gpointer data)
|
|
||||||
{
|
|
||||||
g_object_set (g_object_get_data (data, "target"),
|
|
||||||
"allow_shrink",
|
|
||||||
GTK_TOGGLE_BUTTON (widget)->active,
|
|
||||||
NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
allow_grow_callback (GtkWidget *widget,
|
|
||||||
gpointer data)
|
gpointer data)
|
||||||
{
|
{
|
||||||
g_object_set (g_object_get_data (data, "target"),
|
g_object_set (g_object_get_data (data, "target"),
|
||||||
"allow_grow",
|
"resizable", GTK_TOGGLE_BUTTON (widget)->active,
|
||||||
GTK_TOGGLE_BUTTON (widget)->active,
|
|
||||||
NULL);
|
NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -8720,19 +8708,11 @@ window_controls (GtkWidget *window)
|
|||||||
control_window);
|
control_window);
|
||||||
gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||||
|
|
||||||
button = gtk_check_button_new_with_label ("Allow shrink");
|
button = gtk_check_button_new_with_label ("Allow resize");
|
||||||
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), FALSE);
|
|
||||||
g_signal_connect (button,
|
|
||||||
"toggled",
|
|
||||||
G_CALLBACK (allow_shrink_callback),
|
|
||||||
control_window);
|
|
||||||
gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
|
||||||
|
|
||||||
button = gtk_check_button_new_with_label ("Allow grow");
|
|
||||||
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
|
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
|
||||||
g_signal_connect (button,
|
g_signal_connect (button,
|
||||||
"toggled",
|
"toggled",
|
||||||
G_CALLBACK (allow_grow_callback),
|
G_CALLBACK (resizable_callback),
|
||||||
control_window);
|
control_window);
|
||||||
gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
||||||
|
|
||||||
|
@ -116,8 +116,7 @@ main (int argc, char *argv[])
|
|||||||
"user_data", NULL,
|
"user_data", NULL,
|
||||||
"type", GTK_WINDOW_TOPLEVEL,
|
"type", GTK_WINDOW_TOPLEVEL,
|
||||||
"title", label,
|
"title", label,
|
||||||
"allow_grow", FALSE,
|
"resizable", FALSE,
|
||||||
"allow_shrink", FALSE,
|
|
||||||
"border_width", 10, NULL,
|
"border_width", 10, NULL,
|
||||||
NULL);
|
NULL);
|
||||||
g_signal_connect (window[i], "destroy",
|
g_signal_connect (window[i], "destroy",
|
||||||
|
@ -286,7 +286,6 @@ new_testrgb_window (void)
|
|||||||
"GtkObject::user_data", NULL,
|
"GtkObject::user_data", NULL,
|
||||||
"GtkWindow::type", GTK_WINDOW_TOPLEVEL,
|
"GtkWindow::type", GTK_WINDOW_TOPLEVEL,
|
||||||
"GtkWindow::title", "testrgb",
|
"GtkWindow::title", "testrgb",
|
||||||
"GtkWindow::allow_shrink", FALSE,
|
|
||||||
NULL);
|
NULL);
|
||||||
g_signal_connect (window, "destroy",
|
g_signal_connect (window, "destroy",
|
||||||
G_CALLBACK (quit_func), NULL);
|
G_CALLBACK (quit_func), NULL);
|
||||||
|
Loading…
Reference in New Issue
Block a user