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

return wxDefaultSize (as done in all other platforms) when the combo box is empty

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-11-28 21:50:22 +00:00
parent f3fe2d4ecb
commit 60b71826d6
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
interface/wx/bmpcbox.h
View File

@@ -180,7 +180,8 @@ public:
const wxString& name = wxBitmapComboBoxNameStr); const wxString& name = wxBitmapComboBoxNameStr);
/** /**
Returns size of bitmaps used in the list. Returns the size of the bitmaps used in the combo box.
If the combo box is empty, then ::wxDefaultSize is returned.
*/ */
virtual wxSize GetBitmapSize() const; virtual wxSize GetBitmapSize() const;

8
src/gtk/bmpcbox.cpp
View File

@@ -48,7 +48,7 @@ void wxBitmapComboBox::Init()
{ {
m_bitmapCellIndex = 0; m_bitmapCellIndex = 0;
m_stringCellIndex = 1; m_stringCellIndex = 1;
m_bitmapSize = wxSize(0, 0); m_bitmapSize = wxSize(-1, -1);
} }
wxBitmapComboBox::wxBitmapComboBox(wxWindow *parent, wxBitmapComboBox::wxBitmapComboBox(wxWindow *parent,
@@ -129,7 +129,7 @@ void wxBitmapComboBox::GTKCreateComboBoxWidget()
// This must be called as gtk_combo_box_entry_new_with_model adds // This must be called as gtk_combo_box_entry_new_with_model adds
// automatically adds one text column. // automatically adds one text column.
gtk_cell_layout_clear( GTK_CELL_LAYOUT(m_widget) ); gtk_cell_layout_clear( GTK_CELL_LAYOUT(m_widget) );
GtkCellRenderer* imageRenderer = gtk_cell_renderer_pixbuf_new(); GtkCellRenderer* imageRenderer = gtk_cell_renderer_pixbuf_new();
gtk_cell_layout_pack_start( GTK_CELL_LAYOUT(m_widget), gtk_cell_layout_pack_start( GTK_CELL_LAYOUT(m_widget),
@@ -160,7 +160,7 @@ GdkWindow *wxBitmapComboBox::GTKGetWindow(wxArrayGdkWindows& windows) const
{ {
if ( GetEntry() ) if ( GetEntry() )
return wxComboBox::GTKGetWindow(windows); return wxComboBox::GTKGetWindow(windows);
return wxChoice::GTKGetWindow(windows); return wxChoice::GTKGetWindow(windows);
} }
@@ -172,7 +172,7 @@ void wxBitmapComboBox::SetItemBitmap(unsigned int n, const wxBitmap& bitmap)
{ {
if ( bitmap.IsOk() ) if ( bitmap.IsOk() )
{ {
if ( m_bitmapSize.x == 0 ) if ( m_bitmapSize.x < 0 )
{ {
m_bitmapSize.x = bitmap.GetWidth(); m_bitmapSize.x = bitmap.GetWidth();
m_bitmapSize.y = bitmap.GetHeight(); m_bitmapSize.y = bitmap.GetHeight();