Added wxGTK wxBitmapComboBox::DoGetBestSize() implementation that takes bitmap size...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/bmpcbox.h b/include/wx/gtk/bmpcbox.h
index 95e3e873c0a917346f67d5ae7de91250ab8b4b6c..bfa3399b3b38a14036896b3b954d05fb9b0ae828 100644 (file)
--- a/include/wx/gtk/bmpcbox.h
+++ b/include/wx/gtk/bmpcbox.h
@@ -133,6 +133,8 @@ protected:
     virtual void GTKCreateComboBoxWidget();
     virtual void GTKInsertComboBoxTextItem( unsigned int n, const wxString& text );
 
+    virtual wxSize DoGetBestSize() const;
+
     wxSize                  m_bitmapSize;
     int                     m_bitmapCellIndex;
 

diff --git a/src/gtk/bmpcbox.cpp b/src/gtk/bmpcbox.cpp
index 4b42a746ab8e819810a81afdb576aaf4f1a49c21..7743cd14657cf71273846fe1b28890350a360427 100644 (file)
--- a/src/gtk/bmpcbox.cpp
+++ b/src/gtk/bmpcbox.cpp
@@ -164,6 +164,19 @@ GdkWindow *wxBitmapComboBox::GTKGetWindow(wxArrayGdkWindows& windows) const
     return wxChoice::GTKGetWindow(windows);
 }
 
+wxSize wxBitmapComboBox::DoGetBestSize() const
+{
+    wxSize best = wxComboBox::DoGetBestSize();
+
+    int delta = GetBitmapSize().y - GetCharHeight();
+    if ( delta > 0 )
+    {
+        best.y += delta;
+        CacheBestSize(best);
+    }
+    return best;
+}
+
 // ----------------------------------------------------------------------------
 // Item manipulation
 // ----------------------------------------------------------------------------