1552971 ] Add flag for wxODComboBox::OnDrawItem to indicate selection

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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 5d46ab79ceea95c6c20443f51232841bfc056370..75a80a78a713b618835afaad13c6dff21d7449e8 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -157,7 +157,7 @@ gtk_listbox_button_press_callback( GtkWidget *widget,
                                    GdkEventButton *gdk_event,
                                    wxListBox *listbox )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
+    // don't need to install idle handler, its done from "event" signal
 
     if (g_blockEventsOnDrag) return FALSE;
     if (g_blockEventsOnScroll) return FALSE;
@@ -203,7 +203,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget,
                                 GdkEventKey *gdk_event,
                                 wxListBox *listbox )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
+    // don't need to install idle handler, its done from "event" signal
 
     if (g_blockEventsOnDrag) return FALSE;
 
@@ -240,13 +240,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget,
         listbox->m_spacePressed = true;
     }
 
-    if (ret)
-    {
-        g_signal_stop_emission_by_name (widget, "key_press_event");
-        return TRUE;
-    }
-
-    return FALSE;
+    return ret;
 }
 }
 
@@ -1028,7 +1022,7 @@ int wxListBox::DoListHitTest(const wxPoint& point) const
 {
     // gtk_tree_view_get_path_at_pos() also gets items that are not visible and
     // we only want visible items we need to check for it manually here
-    if ( !GetClientRect().Inside(point) )
+    if ( !GetClientRect().Contains(point) )
         return wxNOT_FOUND;
 
     // need to translate from master window since it is in client coords