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

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

diff --git a/interface/wx/bmpcbox.h b/interface/wx/bmpcbox.h
index fcd53cab7100ef3370f289f6c8d1e956f701fe16..c073ead100378dd47b2da39b06c70bd224865aab 100644 (file)
--- a/interface/wx/bmpcbox.h
+++ b/interface/wx/bmpcbox.h
@@ -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;
 

diff --git a/src/gtk/bmpcbox.cpp b/src/gtk/bmpcbox.cpp
index 0378a0a0df449b7c27652ba42a52b70cd291df05..13fb8edf008bf8e2779bffbadfe688ae49944d26 100644 (file)
--- a/src/gtk/bmpcbox.cpp
+++ b/src/gtk/bmpcbox.cpp
@@ -48,7 +48,7 @@ void wxBitmapComboBox::Init()
 {
     m_bitmapCellIndex = 0;
     m_stringCellIndex = 1;
 {
     m_bitmapCellIndex = 0;
     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
     // automatically adds one text column.
 
     // This must be called as gtk_combo_box_entry_new_with_model adds
     // 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();
     gtk_cell_layout_pack_start( GTK_CELL_LAYOUT(m_widget),
 
     GtkCellRenderer* imageRenderer = gtk_cell_renderer_pixbuf_new();
     gtk_cell_layout_pack_start( GTK_CELL_LAYOUT(m_widget),


@@ -160,7 +160,7 @@ GdkWindow *wxBitmapComboBox::GTKGetWindow(wxArrayGdkWindows& windows) const
 {
     if ( GetEntry() )
         return wxComboBox::GTKGetWindow(windows);
 {
     if ( GetEntry() )
         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.y = bitmap.GetHeight();
         {
             m_bitmapSize.x = bitmap.GetWidth();
             m_bitmapSize.y = bitmap.GetHeight();