wxGTK's built-in dockable menu now give their

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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 6e98cf6ca5baee069a5918839cb67145c4b61cfc..8c24f8b8110ec5b81ae0cec62aa92592d263660f 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -33,10 +33,8 @@
 // conditional compilation
 //-------------------------------------------------------------------------
 
-#if (GTK_MINOR_VERSION == 1)
-    #if (GTK_MICRO_VERSION >= 5)
-        #define NEW_GTK_SCROLL_CODE
-    #endif
+#if (GTK_MINOR_VERSION > 0)
+#define NEW_GTK_SCROLL_CODE
 #endif
 
 //-----------------------------------------------------------------------------
@@ -194,8 +192,16 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     SetValidator( validator );
 
     m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL );
-    gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget),
-      GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
+    if (style & wxLB_ALWAYS_SB)
+    {
+      gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget),
+        GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS );
+    }
+    else
+    {
+      gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget),
+        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
+    }
 
     m_list = GTK_LIST( gtk_list_new() );
 
@@ -213,25 +219,6 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_list) );
 #endif
 
-#ifdef __WXDEBUG__
-    debug_focus_in( m_widget, "wxListBox::m_widget", name );
-
-    debug_focus_in( GTK_WIDGET(m_list), "wxListBox::m_list", name );
-
-    GtkScrolledWindow *s_window = GTK_SCROLLED_WINDOW(m_widget);
-
-    debug_focus_in( s_window->hscrollbar, "wxWindow::hsrcollbar", name );
-    debug_focus_in( s_window->vscrollbar, "wxWindow::vsrcollbar", name );
-
-#ifdef NEW_GTK_SCROLL_CODE
-    GtkViewport *viewport = GTK_VIEWPORT(s_window->child);
-#else
-    GtkViewport *viewport = GTK_VIEWPORT(s_window->viewport);
-#endif
-
-    debug_focus_in( GTK_WIDGET(viewport), "wxWindow::viewport", name );
-#endif
-
     gtk_widget_show( GTK_WIDGET(m_list) );
 
     wxSize newSize = size;
@@ -254,10 +241,6 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
         list_item = gtk_list_item_new_with_label( str );
 
-#ifdef __WXDEBUG__
-        debug_focus_in( list_item, "wxListBox::list_item", name );
-#endif
-
         gtk_container_add( GTK_CONTAINER(m_list), list_item );
 
         gtk_signal_connect( GTK_OBJECT(list_item), "select",