remove unused private member m_ordered from wxDataViewVirtualListModel

[wxWidgets.git] / src / gtk / combobox.cpp

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index bf76ed5c506ce7dd5c01c2d78ddb0a3cbfbcbca2..40c437fa2334029f7c43780406693d18fde347ea 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -409,10 +409,14 @@ wxSize wxComboBox::DoGetSizeFromTextSize(int xlen, int ylen) const
 {
     wxSize tsize( wxChoice::DoGetSizeFromTextSize(xlen, ylen) );
 
 {
     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;
 }
 
     return tsize;
 }