From 401c8bc2317beff9c3b56c92db890b9ce5c015d6 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Mon, 4 Jun 2012 17:36:51 +0000 Subject: [PATCH] Fix layout of wxStaticText, and possibly other controls. GtkLabel perversely does not use its actual size to do layout, but will use its size request. So restore calling gtk_widget_set_size_request() for all widgets, which was removed in r71465. See #14374 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/window.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 2b1d991e42..41f3947cfa 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -2567,11 +2567,10 @@ static gboolean queue_resize(void*) void wxWindowGTK::DoMoveWindow(int x, int y, int width, int height) { + gtk_widget_set_size_request(m_widget, width, height); GtkWidget* parent = gtk_widget_get_parent(m_widget); if (WX_IS_PIZZA(parent)) WX_PIZZA(parent)->move(m_widget, x, y, width, height); - else - gtk_widget_set_size_request(m_widget, width, height); // With GTK3, gtk_widget_queue_resize() is ignored while a size-allocate // is in progress. This situation is common in wxWidgets, since -- 2.47.2