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

update position for widgets in native containers, fixes #15231

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2013-06-01 17:06:14 +00:00
parent 8e85c4e4ad
commit 3ffa8d8c02
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/window.cpp
View File

@@ -1924,6 +1924,12 @@ size_allocate(GtkWidget*, GtkAllocation* alloc, wxWindow* win)
if (w < 0) w = 0;
if (h < 0) h = 0;
}
GtkAllocation a;
gtk_widget_get_allocation(win->m_widget, &a);
// update position for widgets in native containers, such as wxToolBar
// (for widgets in a wxPizza, the values should already be the same)
win->m_x = a.x;
win->m_y = a.y;
win->m_useCachedClientSize = true;
if (win->m_clientWidth != w || win->m_clientHeight != h)
{
@@ -1931,8 +1937,6 @@ size_allocate(GtkWidget*, GtkAllocation* alloc, wxWindow* win)
win->m_clientHeight = h;
// this callback can be connected to m_wxwindow,
// so always get size from m_widget->allocation
GtkAllocation a;
gtk_widget_get_allocation(win->m_widget, &a);
win->m_width = a.width;
win->m_height = a.height;
if (!win->m_nativeSizeEvent)