X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e78c1d7855d1fefcdbff0e093e21e5cf101ca604..19c7ac3d3bf1ac2113505a805a79c40ce3db1f5b:/src/gtk/bmpcbox.cpp

diff --git a/src/gtk/bmpcbox.cpp b/src/gtk/bmpcbox.cpp
index 88e4dcb9a6..6cbf891530 100644
--- a/src/gtk/bmpcbox.cpp
+++ b/src/gtk/bmpcbox.cpp
@@ -3,7 +3,7 @@
 // Purpose:     wxBitmapComboBox
 // Author:      Jaakko Salli
 // Created:     2008-05-19
-// RCS-ID:      $Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) 2008 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -32,14 +32,6 @@
 
 #include "wx/gtk/private.h"
 
-#ifdef __WXGTK24__
-    #include "wx/gtk/win_gtk.h"
-
-    #include <gobject/gvaluecollector.h>
-    #include <gtk/gtktreemodel.h>
-#endif
-
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -56,7 +48,7 @@ void wxBitmapComboBox::Init()
 {
     m_bitmapCellIndex = 0;
     m_stringCellIndex = 1;
-    m_bitmapSize = wxSize(0, 0);
+    m_bitmapSize = wxSize(-1, -1);
 }
 
 wxBitmapComboBox::wxBitmapComboBox(wxWindow *parent,
@@ -133,10 +125,11 @@ void wxBitmapComboBox::GTKCreateComboBoxWidget()
         m_entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
         gtk_entry_set_editable( m_entry, TRUE );
     }
+    g_object_ref(m_widget);
 
     // 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),
@@ -167,7 +160,7 @@ GdkWindow *wxBitmapComboBox::GTKGetWindow(wxArrayGdkWindows& windows) const
 {
     if ( GetEntry() )
         return wxComboBox::GTKGetWindow(windows);
-    
+
     return wxChoice::GTKGetWindow(windows);
 }
 
@@ -179,7 +172,7 @@ void wxBitmapComboBox::SetItemBitmap(unsigned int n, const wxBitmap& bitmap)
 {
     if ( bitmap.IsOk() )
     {
-        if ( m_bitmapSize.x == 0 )
+        if ( m_bitmapSize.x < 0 )
         {
             m_bitmapSize.x = bitmap.GetWidth();
             m_bitmapSize.y = bitmap.GetHeight();