added support for wxALWAYS_SHOW_SB (finally closes patch 410865 -- first still opened...)

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

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index e3edea4f3d15345290eec76d349cbc8e80a41d6b..4f166e489e42716fc30948cdfe6bd99092715bbc 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -657,7 +657,7 @@ void wxListBox::Delete( int n )
     }
 
     if ( m_strings )
-        m_strings->Remove(n);
+        m_strings->RemoveAt(n);
 }
 
 // ----------------------------------------------------------------------------
@@ -958,6 +958,8 @@ GtkWidget *wxListBox::GetConnectWidget()
 
 bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
 {
+    if (m_widget->window == window) return TRUE;
+
     if (GTK_WIDGET(m_list)->window == window) return TRUE;
 
     GList *child = m_list->children;
@@ -1037,7 +1039,8 @@ void wxListBox::OnInternalIdle()
         }
     }
 
-    UpdateWindowUI();
+    if (wxUpdateUIEvent::CanUpdate())
+        UpdateWindowUI();
 }
 
 wxSize wxListBox::DoGetBestSize() const