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

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2009-07-18 08:33:55 +00:00
parent 41ce9ae1b0
commit c90e98dcb6
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gtk/bmpcbox.h
View File

@@ -133,6 +133,8 @@ protected:
virtual void GTKCreateComboBoxWidget(); virtual void GTKCreateComboBoxWidget();
virtual void GTKInsertComboBoxTextItem( unsigned int n, const wxString& text ); virtual void GTKInsertComboBoxTextItem( unsigned int n, const wxString& text );
virtual wxSize DoGetBestSize() const;
wxSize m_bitmapSize; wxSize m_bitmapSize;
int m_bitmapCellIndex; int m_bitmapCellIndex;

13
src/gtk/bmpcbox.cpp
View File

@@ -164,6 +164,19 @@ GdkWindow *wxBitmapComboBox::GTKGetWindow(wxArrayGdkWindows& windows) const
return wxChoice::GTKGetWindow(windows); 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 // Item manipulation
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------