wxMessageBox off the main thread lost result code.

[wxWidgets.git] / src / generic / odcombo.cpp

diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp
index 3a15972c1380fe55e25600bbf1a43510baa1f796..d48bf5a085b69d8dc15a5f4dcc0e4fdc7cd1ebea 100644 (file)
--- a/src/generic/odcombo.cpp
+++ b/src/generic/odcombo.cpp
@@ -1174,18 +1174,14 @@ wxCoord wxOwnerDrawnComboBox::OnMeasureItemWidth( size_t WXUNUSED(item) ) const
 
 wxSize wxOwnerDrawnComboBox::DoGetBestSize() const
 {
-    wxSize best( wxComboCtrlBase::DoGetBestSize() );
-
-    if ( GetCount() > 0 )
-    {
-        wxOwnerDrawnComboBox* odc = const_cast<wxOwnerDrawnComboBox*>(this);
-        best.x = odc->GetWidestItemWidth();
-        // TODO: this class may also have GetHightestItemHeight() and
-        // GetHightestItem() methods, and so set the whole (edit part + arrow)
-        // control's height according with this max height, not only max width.
-    }
-
-    return GetSizeFromTextSize(best.x);
+    if ( GetCount() == 0 )
+        return wxComboCtrlBase::DoGetBestSize();
+
+    wxOwnerDrawnComboBox* odc = const_cast<wxOwnerDrawnComboBox*>(this);
+    // TODO: this class may also have GetHightestItemHeight() and
+    // GetHightestItem() methods, and so set the whole (edit part + arrow)
+    // control's height according with this max height, not only max width.
+    return GetSizeFromTextSize(odc->GetWidestItemWidth());
 }
 
 void wxOwnerDrawnComboBox::OnDrawBackground(wxDC& dc,