Probably fixed listbox crashes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index fa4b4bcdc7ae448562373c99864cc60baab5736a..9339a6dedfa90bdcca54e15821586313c596218e 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -947,7 +947,7 @@ void wxListBox::GtkDisableEvents()
         gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
           GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
 
-        if (HasFlag(wxLB_MULTIPLE))
+        if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED))
             gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
               GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
 
@@ -963,7 +963,7 @@ void wxListBox::GtkEnableEvents()
         gtk_signal_connect( GTK_OBJECT(child->data), "select",
           GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
 
-        if (HasFlag(wxLB_MULTIPLE))
+        if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED))
             gtk_signal_connect( GTK_OBJECT(child->data), "deselect",
               GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
 

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index fa4b4bcdc7ae448562373c99864cc60baab5736a..9339a6dedfa90bdcca54e15821586313c596218e 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -947,7 +947,7 @@ void wxListBox::GtkDisableEvents()
         gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
           GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
 
-        if (HasFlag(wxLB_MULTIPLE))
+        if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED))
             gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
               GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
 
@@ -963,7 +963,7 @@ void wxListBox::GtkEnableEvents()
         gtk_signal_connect( GTK_OBJECT(child->data), "select",
           GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
 
-        if (HasFlag(wxLB_MULTIPLE))
+        if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED))
             gtk_signal_connect( GTK_OBJECT(child->data), "deselect",
               GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );