Avoid overflowing the wake up when handling events in Unix console apps.

[wxWidgets.git] / src / gtk / bmpcbox.cpp

diff --git a/src/gtk/bmpcbox.cpp b/src/gtk/bmpcbox.cpp
index 0a5f75fbe37a562b1b77c544cc9794a9e3e9748c..7ac3b0ecdead07b95c67650c7d597a80cfe2f7bf 100644 (file)
--- a/src/gtk/bmpcbox.cpp
+++ b/src/gtk/bmpcbox.cpp
@@ -122,8 +122,8 @@ void wxBitmapComboBox::GTKCreateComboBoxWidget()
     else
     {
         m_widget = gtk_combo_box_entry_new_with_model( GTK_TREE_MODEL(store), m_stringCellIndex );
     else
     {
         m_widget = gtk_combo_box_entry_new_with_model( GTK_TREE_MODEL(store), m_stringCellIndex );

-        m_entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
-        gtk_entry_set_editable( m_entry, TRUE );
+        m_entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(m_widget)));
+        gtk_editable_set_editable(GTK_EDITABLE(m_entry), true);

     }
     g_object_ref(m_widget);
 
     }
     g_object_ref(m_widget);
 


@@ -224,7 +224,7 @@ wxBitmap wxBitmapComboBox::GetItemBitmap(unsigned int n) const
         if ( pixbuf )
         {
             g_object_ref( pixbuf );
         if ( pixbuf )
         {
             g_object_ref( pixbuf );

-            bitmap.SetPixbuf( pixbuf );
+            bitmap = wxBitmap(pixbuf);

         }
         g_value_unset( &value );
     }
         }
         g_value_unset( &value );
     }