width and height arguments are no longer ignored in wxRadioBox::SetSize()

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

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 45cf031ba1ff53c26cb78dcd90681c4ebe36b59e..499e2153d96960791bf4d8d81a069568e20fd5cb 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -14,8 +14,6 @@
 
 #include "wx/combobox.h"
 
 
 #include "wx/combobox.h"
 

-#if wxUSE_COMBOBOX
-

 #include <wx/intl.h>
 
 #include "gdk/gdk.h"
 #include <wx/intl.h>
 
 #include "gdk/gdk.h"


@@ -255,7 +253,7 @@ void wxComboBox::Delete( int n )
         return;
     }
   
         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 );
   
     gtk_list_remove_items( listbox, list );
     g_list_free( list );
   


@@ -543,6 +541,3 @@ bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
              (window == GTK_COMBO(m_widget)->button->window ) );
 }
 
              (window == GTK_COMBO(m_widget)->button->window ) );
 }
 

-#endif
-
-  // wxUSE_COMBOBOX
\ No newline at end of file