added an error message if a bitmap can't be addedto the image list

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

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index ae8b352156783fc8dd3fbf00074b11d75f47bd99..499e2153d96960791bf4d8d81a069568e20fd5cb 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -11,9 +11,14 @@
 #pragma implementation "combobox.h"
 #endif
 
+
 #include "wx/combobox.h"
+
 #include <wx/intl.h>
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -248,7 +253,7 @@ void wxComboBox::Delete( int n )
         return;
     }
   
-    GList *list = g_list_append( NULL, child->data );
+    GList *list = g_list_append( (GList*) NULL, child->data );
     gtk_list_remove_items( listbox, list );
     g_list_free( list );
   
@@ -535,3 +540,4 @@ bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
     return ( (window == GTK_ENTRY( GTK_COMBO(m_widget)->entry )->text_area) ||
              (window == GTK_COMBO(m_widget)->button->window ) );
 }
+