fixed problems with sometimes processing the events twice introduced in rev 1.170...

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

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index b71512c25085bee13244b1d67ac294540359257e..40fb0c0a0c71ad637a55b38d5f129cc26e0abd06 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        listbox.cpp
+// Name:        src/gtk/listbox.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,11 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "listbox.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -67,7 +62,8 @@ struct wxlistbox_idle_struct
     gint         m_tag;
 };
 
-extern "C" gint wxlistbox_idle_callback( gpointer gdata )
+extern "C" {
+static gint wxlistbox_idle_callback( gpointer gdata )
 {
     wxlistbox_idle_struct* data = (wxlistbox_idle_struct*) gdata;
     gdk_threads_enter();
@@ -88,11 +84,13 @@ extern "C" gint wxlistbox_idle_callback( gpointer gdata )
 
     return TRUE;
 }
+}
 
 //-----------------------------------------------------------------------------
 // "focus_in_event"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static gint gtk_listitem_focus_in_callback( GtkWidget *widget,
                                           GdkEvent *WXUNUSED(event),
                                           wxWindow *win )
@@ -108,7 +106,7 @@ static gint gtk_listitem_focus_in_callback( GtkWidget *widget,
     {
         // not yet, notify it
         win->m_hasFocus = TRUE;
-        
+
         wxChildFocusEvent eventChildFocus(win);
         (void)win->GetEventHandler()->ProcessEvent(eventChildFocus);
 
@@ -120,11 +118,13 @@ static gint gtk_listitem_focus_in_callback( GtkWidget *widget,
 
     return FALSE;
 }
+}
 
 //-----------------------------------------------------------------------------
 // "focus_out_event"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static gint gtk_listitem_focus_out_callback( GtkWidget *widget, GdkEventFocus *gdk_event, wxWindowGTK *win )
 {
     if (g_isIdle)
@@ -150,6 +150,7 @@ static gint gtk_listitem_focus_out_callback( GtkWidget *widget, GdkEventFocus *g
 
     return FALSE;
 }
+}
 
 //-----------------------------------------------------------------------------
 // "button_release_event"
@@ -161,6 +162,7 @@ static gint gtk_listitem_focus_out_callback( GtkWidget *widget, GdkEventFocus *g
    this can lead to race conditions so that we emit the dclick event
    after the GDK_BUTTON_RELEASE event after the GDK_2BUTTON_PRESS event */
 
+extern "C" {
 static gint
 gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget),
                                      GdkEventButton * WXUNUSED(gdk_event),
@@ -200,11 +202,13 @@ gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget),
 
     return FALSE;
 }
+}
 
 //-----------------------------------------------------------------------------
 // "button_press_event"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static gint
 gtk_listbox_button_press_callback( GtkWidget *widget,
                                    GdkEventButton *gdk_event,
@@ -233,29 +237,34 @@ 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)) )
     {
-        if (listbox->IsSelected(sel))
-        {
-            gtk_list_unselect_item( GTK_LIST(listbox->m_list), sel );
-            return true;
-        }
+            listbox->m_blockEvent = TRUE;
+
+            int i;
+            for (i = 0; i < (int)listbox->GetCount(); i++)
+                if (i != sel)
+                    gtk_list_unselect_item( GTK_LIST(listbox->m_list), i );
+
+            listbox->m_blockEvent = FALSE;
+
+            return false;
     }
-#endif
 
     /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */
     g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS);
 
     return FALSE;
 }
+}
 
 //-----------------------------------------------------------------------------
 // "key_press_event"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static gint
 gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox )
 {
@@ -301,21 +310,21 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
 #endif // wxUSE_CHECKLISTBOX
 
     // Check or uncheck item with SPACE
-    if ((gdk_event->keyval == ' ') && (!ret) && 
+    if ((gdk_event->keyval == ' ') && (!ret) &&
          (((listbox->GetWindowStyleFlag() & wxLB_MULTIPLE) != 0) ||
           ((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) )
     {
         int sel = listbox->GtkGetIndex( widget );
-        
+
         if (sel != -1)
         {
             ret = TRUE;
-            
+
             if (listbox->IsSelected( sel ))
                 gtk_list_unselect_item( listbox->m_list, sel );
             else
                 gtk_list_select_item( listbox->m_list, sel );
-            
+
             wxCommandEvent new_event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
             new_event.SetEventObject( listbox );
             wxArrayInt aSelections;
@@ -337,7 +346,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
             listbox->GetEventHandler()->ProcessEvent( new_event );
         }
     }
-    
+
     if (ret)
     {
         gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
@@ -346,23 +355,12 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
 
     return FALSE;
 }
+}
 
 //-----------------------------------------------------------------------------
 // "select" and "deselect"
 //-----------------------------------------------------------------------------
 
-static void gtk_listitem_select_cb( GtkWidget *widget, wxListBox *listbox, bool is_selection );
-
-static void gtk_listitem_select_callback( GtkWidget *widget, wxListBox *listbox )
-{
-    gtk_listitem_select_cb( widget, listbox, TRUE );
-}
-
-static void gtk_listitem_deselect_callback( GtkWidget *widget, wxListBox *listbox )
-{
-    gtk_listitem_select_cb( widget, listbox, FALSE );
-}
-
 static void gtk_listitem_select_cb( GtkWidget *widget,
                                     wxListBox *listbox,
                                     bool is_selection )
@@ -413,22 +411,38 @@ static void gtk_listitem_select_cb( GtkWidget *widget,
     listbox->GetEventHandler()->ProcessEvent( event );
 }
 
+extern "C" {
+static void gtk_listitem_select_callback( GtkWidget *widget, wxListBox *listbox )
+{
+    gtk_listitem_select_cb( widget, listbox, TRUE );
+}
+}
+
+extern "C" {
+static void gtk_listitem_deselect_callback( GtkWidget *widget, wxListBox *listbox )
+{
+    gtk_listitem_select_cb( widget, listbox, FALSE );
+}
+}
+
 //-----------------------------------------------------------------------------
 // wxListBox
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static gint
 gtk_listbox_realized_callback( GtkWidget *m_widget, wxListBox *win )
 {
     if (g_isIdle)
         wxapp_install_idle_handler();
-        
+
     GList *child = win->m_list->children;
     for (child = win->m_list->children; child != NULL; child = child->next)
         gtk_widget_show( GTK_WIDGET(child->data) );
-    
+
     return false;
 }
+}
 
 //-----------------------------------------------------------------------------
 // wxListBox
@@ -522,7 +536,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     gtk_signal_connect( GTK_OBJECT(m_list), "realize",
                         GTK_SIGNAL_FUNC(gtk_listbox_realized_callback), (gpointer) this );
-                            
+
     if ( style & wxLB_SORT )
     {
         // this will change DoAppend() behaviour
@@ -716,7 +730,7 @@ void wxListBox::GtkAddItem( const wxString &item, int pos )
     if (GTK_WIDGET_REALIZED(m_widget))
     {
         gtk_widget_show( list_item );
-        
+
         gtk_widget_realize( list_item );
         gtk_widget_realize( GTK_BIN(list_item)->child );
 
@@ -731,8 +745,7 @@ void wxListBox::GtkAddItem( const wxString &item, int pos )
     {
         gtk_widget_modify_style( GTK_WIDGET( list_item ), style );
         GtkBin *bin = GTK_BIN( list_item );
-        GtkWidget *label = GTK_WIDGET( bin->child );
-        gtk_widget_modify_style( label, style );
+        gtk_widget_modify_style( GTK_WIDGET( bin->child ), style );
         gtk_rc_style_unref( style );
     }
 }
@@ -918,7 +931,7 @@ void wxListBox::SetString( int n, const wxString &string )
 
 wxString wxListBox::GetString( int n ) const
 {
-    wxCHECK_MSG( m_list != NULL, wxT(""), wxT("invalid listbox") );
+    wxCHECK_MSG( m_list != NULL, wxEmptyString, wxT("invalid listbox") );
 
     GList *child = g_list_nth( m_list->children, n );
     if (child)
@@ -928,7 +941,7 @@ wxString wxListBox::GetString( int n ) const
 
     wxFAIL_MSG(wxT("wrong listbox index"));
 
-    return wxT("");
+    return wxEmptyString;
 }
 
 int wxListBox::GetCount() const
@@ -939,15 +952,15 @@ int wxListBox::GetCount() const
     return g_list_length(children);
 }
 
-int wxListBox::FindString( const wxString &item ) const
+int wxListBox::FindString( const wxString &item, bool bCase ) const
 {
-    wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
+    wxCHECK_MSG( m_list != NULL, wxNOT_FOUND, wxT("invalid listbox") );
 
     GList *child = m_list->children;
     int count = 0;
     while (child)
     {
-        if ( GetRealLabel(child) == item )
+        if ( item.IsSameAs( GetRealLabel(child), bCase ) )
             return count;
 
         count++;
@@ -1117,7 +1130,7 @@ bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
 {
     return TRUE;
 
-#if 0    
+#if 0
     if (m_widget->window == window) return TRUE;
 
     if (GTK_WIDGET(m_list)->window == window) return TRUE;
@@ -1228,7 +1241,7 @@ wxSize wxListBox::DoGetBestSize() const
     lbHeight = (cy+4) * wxMin(wxMax(GetCount(), 3), 10);
 
     wxSize best(lbWidth, lbHeight);
-    CacheBestSize(best);        
+    CacheBestSize(best);
     return best;
 }
 
@@ -1249,4 +1262,3 @@ wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 }
 
 #endif // wxUSE_LISTBOX
-