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

Added wxMSW wxBitmapComboBox::DoGetBestSize(), which takes bitmap size into account.

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

1
include/wx/msw/bmpcbox.h
View File

@@ -120,6 +120,7 @@ protected:
virtual void DoDeleteOneItem(unsigned int n); virtual void DoDeleteOneItem(unsigned int n);
virtual bool OnAddBitmap(const wxBitmap& bitmap); virtual bool OnAddBitmap(const wxBitmap& bitmap);
virtual wxSize DoGetBestSize() const;
void RecreateControl(); void RecreateControl();
private: private:

14
src/msw/bmpcbox.cpp
View File

@@ -183,6 +183,20 @@ wxBitmapComboBox::~wxBitmapComboBox()
Clear(); Clear();
} }
wxSize wxBitmapComboBox::DoGetBestSize() const
{
wxSize best = wxComboBox::DoGetBestSize();
wxSize bitmapSize = GetBitmapSize();
wxCoord useHeightBitmap = EDIT_HEIGHT_FROM_CHAR_HEIGHT(bitmapSize.y);
if ( best.y < useHeightBitmap )
{
best.y = useHeightBitmap;
CacheBestSize(best);
}
return best;
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Item manipulation // Item manipulation
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------