X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e380f72b45f33dbae8246c65bf1e7d33075439e6..d669c2415958a769d9565ffd20f3fa2f23eddf77:/src/gtk/listbox.cpp

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 066cc2a8e9..2793afeb92 100644
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -17,6 +17,16 @@
 #include "wx/utils.h"
 #include <wx/intl.h>
 
+//-------------------------------------------------------------------------
+// conditional compilation
+//-------------------------------------------------------------------------
+
+#if (GTK_MINOR_VERSION == 1)
+#if (GTK_MICRO_VERSION >= 5)
+#define NEW_GTK_SCROLL_CODE
+#endif
+#endif
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -91,7 +101,12 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     gtk_list_set_selection_mode( GTK_LIST(m_list), mode );
 
+#ifdef NEW_GTK_SCROLL_CODE
+    gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(m_widget), GTK_WIDGET(m_list) );
+#else
     gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_list) );
+#endif
+
     gtk_widget_show( GTK_WIDGET(m_list) );
 
     wxSize newSize = size;
@@ -163,7 +178,9 @@ void wxListBox::AppendCommon( const wxString &item )
 
     ConnectWidget( list_item );
 
-    ConnectDnDWidget( list_item );
+#ifndef NEW_GTK_DND_CODE
+    if (m_dropTarget) m_dropTarget->RegisterWidget( list_item );
+#endif
 }
 
 void wxListBox::Append( const wxString &item )
@@ -481,21 +498,31 @@ void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
 {
     wxCHECK_RET( m_list != NULL, "invalid listbox" );
   
-    GList *child = m_list->children;
-    while (child)
+#ifndef NEW_GTK_DND_CODE
+    if (m_dropTarget)
     {
-        DisconnectDnDWidget( GTK_WIDGET( child->data ) );
-        child = child->next;
+        GList *child = m_list->children;
+        while (child)
+        {
+	    m_dropTarget->UnregisterWidget( GTK_WIDGET( child->data ) );
+            child = child->next;
+        }
     }
+#endif
+    
+    wxWindow::SetDropTarget( dropTarget );
 
-    wxWindow::SetDropTarget( dropTarget  );
-
-    child = m_list->children;
-    while (child)
+#ifndef NEW_GTK_DND_CODE
+    if (m_dropTarget)
     {
-        ConnectDnDWidget( GTK_WIDGET( child->data ) );
-        child = child->next;
+        GList *child = m_list->children;
+        while (child)
+        {
+	    m_dropTarget->RegisterWidget( GTK_WIDGET( child->data ) );
+            child = child->next;
+        }
     }
+#endif
 }
 
 GtkWidget *wxListBox::GetConnectWidget()