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

fix GetBordersForSizer(), closes #15872

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-01-24 18:29:45 +00:00
parent 15d0a86eb2
commit 5744fad0f9
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gtk/statbox.cpp
View File

@@ -158,8 +158,22 @@ wxStaticBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
{ {
*borderTop = GetCharHeight(); GtkAllocation alloc, child_alloc;
*borderOther = GetCharWidth()/2; gtk_widget_get_allocation(m_widget, &alloc);
const int w_save = alloc.width;
const int h_save = alloc.height;
if (alloc.width < 50) alloc.width = 50;
if (alloc.height < 50) alloc.height = 50;
gtk_widget_set_allocation(m_widget, &alloc);
GTK_FRAME_GET_CLASS(m_widget)->compute_child_allocation(GTK_FRAME(m_widget), &child_alloc);
alloc.width = w_save;
alloc.height = h_save;
gtk_widget_set_allocation(m_widget, &alloc);
*borderTop = child_alloc.y - alloc.y;
*borderOther = child_alloc.x - alloc.x;
} }
#endif // wxUSE_STATBOX #endif // wxUSE_STATBOX