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

fix wxBitmapComboBox Gtk-CRITICAL assertion `GTK_IS_ENTRY (entry)' failed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-11-25 02:49:42 +00:00
parent 7968b5c4c5
commit 6968a3b87c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/combobox.cpp
View File

@@ -409,10 +409,14 @@ wxSize wxComboBox::DoGetSizeFromTextSize(int xlen, int ylen) const
{
wxSize tsize( wxChoice::DoGetSizeFromTextSize(xlen, ylen) );
// Add the margins we have previously set, but only the horizontal border
// as vertical one has been taken account in the prevoius call.
// Also get other GTK+ margins.
tsize.IncBy( GTKGetEntryMargins(GetEntry()).x, 0);
GtkEntry* entry = GetEntry();
if (entry)
{
// Add the margins we have previously set, but only the horizontal border
// as vertical one has been taken account in the previous call.
// Also get other GTK+ margins.
tsize.IncBy(GTKGetEntryMargins(entry).x, 0);
}
return tsize;
}