Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix layout of wxStaticText, and possibly other controls.

Browse Source 
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
This commit is contained in:
Paul Cornett
2012-06-04 17:36:51 +00:00
parent 340ef5c5ab
commit 401c8bc231
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gtk/window.cpp
View File

@@ -2567,11 +2567,10 @@ static gboolean queue_resize(void*)
void wxWindowGTK::DoMoveWindow(int x, int y, int width, int height) 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); GtkWidget* parent = gtk_widget_get_parent(m_widget);
if (WX_IS_PIZZA(parent)) if (WX_IS_PIZZA(parent))
WX_PIZZA(parent)->move(m_widget, x, y, width, height); 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 // With GTK3, gtk_widget_queue_resize() is ignored while a size-allocate
// is in progress. This situation is common in wxWidgets, since // is in progress. This situation is common in wxWidgets, since