Show that the GTK+ listbox doesn't deselect any item

   in MULTIPLE mode when clicked upon.

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

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 28a5d986cfacca820455299aafae91d2b1092b81..77fefdba72dc82096591a4c58d7f87045eb0d76d 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -677,7 +677,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     wxPanel *panel = new wxPanel(m_book);
     m_listbox = new wxListBox( panel, ID_LISTBOX,
                                wxPoint(10,10), wxSize(120,70),
-                               5, choices, wxLB_ALWAYS_SB );
+                               5, choices, wxLB_MULTIPLE /*|wxLB_ALWAYS_SB*/ );
     m_listboxSorted = new wxListBox( panel, ID_LISTBOX_SORTED,
                                      wxPoint(10,90), wxSize(120,70),
                                      5, choices, wxLB_SORT );

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 3865a4f20c61d5ed0cf7370f3838908e0f322c24..b71512c25085bee13244b1d67ac294540359257e 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -233,6 +233,7 @@ gtk_listbox_button_press_callback( GtkWidget *widget,
     }
 #endif // wxUSE_CHECKLISTBOX
 
+#if 0
     if ((gdk_event->state == 0) &&
          (((listbox->GetWindowStyleFlag() & wxLB_MULTIPLE) != 0) ||
           ((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) )
@@ -243,6 +244,7 @@ gtk_listbox_button_press_callback( GtkWidget *widget,
             return true;
         }
     }
+#endif
 
     /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */
     g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS);

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 3865a4f20c61d5ed0cf7370f3838908e0f322c24..b71512c25085bee13244b1d67ac294540359257e 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -233,6 +233,7 @@ gtk_listbox_button_press_callback( GtkWidget *widget,
     }
 #endif // wxUSE_CHECKLISTBOX
 
+#if 0
     if ((gdk_event->state == 0) &&
          (((listbox->GetWindowStyleFlag() & wxLB_MULTIPLE) != 0) ||
           ((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) )
@@ -243,6 +244,7 @@ gtk_listbox_button_press_callback( GtkWidget *widget,
             return true;
         }
     }
+#endif
 
     /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */
     g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS);