refactor wxDocChildFrame and wxDocMDIChildFrame to use wxDocChildFrameAny intead...

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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 225c06994d2f7f0ed2b4e6fbcd2170cff313d4f8..842f157f5c89dbe8e8604bfc96799aca0c5724c7 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -112,17 +112,6 @@ gtk_listbox_row_activated_callback(GtkTreeView        * WXUNUSED(treeview),
 // "changed"
 //-----------------------------------------------------------------------------
 
 // "changed"
 //-----------------------------------------------------------------------------
 

-static void SendEvent( wxCommandEvent &event, wxListBox *listbox, int item )
-{
-    event.SetInt( item );
-    event.SetString( listbox->GetString( item ) );
-    if ( listbox->HasClientObjectData() )
-        event.SetClientObject( listbox->GetClientObject(item) );
-    else if ( listbox->HasClientUntypedData() )
-        event.SetClientData( listbox->GetClientData(item) );
-    listbox->HandleWindowEvent( event );
-}
-

 extern "C" {
 static void
 gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection),
 extern "C" {
 static void
 gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection),


@@ -130,96 +119,15 @@ gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection),
 {
     if (g_blockEventsOnDrag) return;
 
 {
     if (g_blockEventsOnDrag) return;
 

-    wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
-    event.SetEventObject( listbox );
-
-    if (listbox->HasFlag(wxLB_MULTIPLE) || listbox->HasFlag(wxLB_EXTENDED))
+    if (listbox->HasFlag(wxLB_MULTIPLE | wxLB_EXTENDED))

     {
     {

-        wxArrayInt selections;
-        listbox->GetSelections( selections );
-        
-        if ((selections.GetCount() == 0) && (listbox->m_oldSelection.GetCount() == 0))
-        {
-            // nothing changed, just leave
-            return;
-        }
-        
-        if (selections.GetCount() == listbox->m_oldSelection.GetCount())
-        {
-            bool changed = false;
-            size_t idx;
-            for (idx = 0; idx < selections.GetCount(); idx++)
-            {
-                if (selections[idx] != listbox->m_oldSelection[idx])
-                {
-                    changed = true;
-                    break;
-                }
-            }
-            
-            // nothing changed, just leave
-            if (!changed)
-               return;
-        }
-
-        if (selections.GetCount() == 0)
-        {
-            // indicate that this is a deselection
-            event.SetExtraLong( 0 );
-            int item = listbox->m_oldSelection[0];
-            listbox->m_oldSelection = selections;
-            SendEvent( event, listbox, item );
-            return;
-        }
-        
-        int item;
-        // Now test if any new item is selected
-        bool any_new_selected = false;
-        size_t idx;
-        for (idx = 0; idx < selections.GetCount(); idx++)
-        {
-            item = selections[idx];
-            if (listbox->m_oldSelection.Index(item) == wxNOT_FOUND)
-            {
-                any_new_selected = true;
-                break;
-            }
-        }
-        
-        if (any_new_selected)
-        {
-            // indicate that this is a selection
-            event.SetExtraLong( 1 );
-            listbox->m_oldSelection = selections;
-            SendEvent( event, listbox, item );
-            return;
-        }
-        
-        // Now test if any new item is deselected
-        bool any_new_deselected = false;
-        for (idx = 0; idx < listbox->m_oldSelection.GetCount(); idx++)
-        {
-            item = listbox->m_oldSelection[idx];
-            if (selections.Index(item) == wxNOT_FOUND)
-            {
-                any_new_deselected = true;
-                break;
-            }
-        }
-        
-        if (any_new_deselected)
-        {
-            // indicate that this is a selection
-            event.SetExtraLong( 0 );
-            listbox->m_oldSelection = selections;
-            SendEvent( event, listbox, item );
-            return;
-        }
-        
-        wxLogError( wxT("Wrong wxListBox selection") );
+        listbox->CalcAndSendEvent();

     }
     }

-    else
+    else // single selection

     {
     {

+        wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
+        event.SetEventObject( listbox );
+

         int index = listbox->GetSelection();
         if (index == wxNOT_FOUND)
         {
         int index = listbox->GetSelection();
         if (index == wxNOT_FOUND)
         {


@@ -261,7 +169,7 @@ gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection),
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static gint
+static gboolean

 gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget),
                                 GdkEventKey *gdk_event,
                                 wxListBox *listbox )
 gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget),
                                 GdkEventKey *gdk_event,
                                 wxListBox *listbox )


@@ -270,10 +178,19 @@ gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget),
         (gdk_event->keyval == GDK_ISO_Enter) ||
         (gdk_event->keyval == GDK_KP_Enter))
     {
         (gdk_event->keyval == GDK_ISO_Enter) ||
         (gdk_event->keyval == GDK_KP_Enter))
     {

-        int index = listbox->GetSelection();
-        if (index != wxNOT_FOUND)
+        int index = -1;
+        if (!listbox->HasMultipleSelection())
+            index = listbox->GetSelection();
+        else

         {
         {

+            wxArrayInt sels;
+            if (listbox->GetSelections( sels ) < 1)
+                return FALSE;
+            index = sels[0];
+        }

         
         

+        if (index != wxNOT_FOUND)
+        {

             wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
             event.SetEventObject( listbox );
             
             wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
             event.SetEventObject( listbox );
             


@@ -413,7 +330,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
 
 void wxListBox::Init()
 {
 
 void wxListBox::Init()
 {

-    m_treeview = (GtkTreeView*) NULL;
+    m_treeview = NULL;

 #if wxUSE_CHECKLISTBOX
     m_hasCheckBoxes = false;
 #endif // wxUSE_CHECKLISTBOX
 #if wxUSE_CHECKLISTBOX
     m_hasCheckBoxes = false;
 #endif // wxUSE_CHECKLISTBOX


@@ -444,7 +361,8 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
         return false;
     }
 
         return false;
     }
 

-    m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL );
+    m_widget = gtk_scrolled_window_new( NULL, NULL );
+    g_object_ref(m_widget);

     if (style & wxLB_ALWAYS_SB)
     {
       gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget),
     if (style & wxLB_ALWAYS_SB)
     {
       gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget),


@@ -457,7 +375,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     }
 
 
     }
 
 

-    GtkScrolledWindowSetBorder(m_widget, style);
+    GTKScrolledWindowSetBorder(m_widget, style);

 
     m_treeview = GTK_TREE_VIEW( gtk_tree_view_new( ) );
 
 
     m_treeview = GTK_TREE_VIEW( gtk_tree_view_new( ) );
 


@@ -504,17 +422,13 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     gtk_tree_view_set_enable_search(m_treeview, FALSE);
 
     GtkSelectionMode mode;
     gtk_tree_view_set_enable_search(m_treeview, FALSE);
 
     GtkSelectionMode mode;

-    if (style & wxLB_MULTIPLE)
+    // GTK_SELECTION_EXTENDED is a deprecated synonym for GTK_SELECTION_MULTIPLE
+    if ( style & (wxLB_MULTIPLE | wxLB_EXTENDED) )

     {
         mode = GTK_SELECTION_MULTIPLE;
     }
     {
         mode = GTK_SELECTION_MULTIPLE;
     }

-    else if (style & wxLB_EXTENDED)
+    else // no multi-selection flags specified

     {
     {

-        mode = GTK_SELECTION_EXTENDED;
-    }
-    else
-    {
-        // if style was 0 set single mode

         m_windowStyle |= wxLB_SINGLE;
         mode = GTK_SELECTION_SINGLE;
     }
         m_windowStyle |= wxLB_SINGLE;
         mode = GTK_SELECTION_SINGLE;
     }


@@ -588,7 +502,16 @@ void wxListBox::GtkEnableEvents()
     g_signal_handlers_unblock_by_func(selection,
                                 (gpointer) gtk_listitem_changed_callback, this);
                                 
     g_signal_handlers_unblock_by_func(selection,
                                 (gpointer) gtk_listitem_changed_callback, this);
                                 

-    GtkUpdateOldSelection();
+    UpdateOldSelections();
+}
+
+
+void wxListBox::Update()
+{
+    wxWindow::Update();
+    
+    if (m_treeview)
+        gdk_window_process_updates(GTK_WIDGET(m_treeview)->window, TRUE);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -634,6 +557,8 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
             AssignNewItemClientData(GtkGetIndexFor(itercur), clientData, i, type);
     }
 
             AssignNewItemClientData(GtkGetIndexFor(itercur), clientData, i, type);
     }
 

+    UpdateOldSelections();
+

     return pos + numItems - 1;
 }
 
     return pos + numItems - 1;
 }
 


@@ -853,7 +778,7 @@ int wxListBox::GetSelections( wxArrayInt& aSelections ) const
 
     aSelections.Empty();
 
 
     aSelections.Empty();
 

-        int i = 0;
+    int i = 0;

     GtkTreeIter iter;
     GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
 
     GtkTreeIter iter;
     GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
 


@@ -920,12 +845,6 @@ void wxListBox::DoSetSelection( int n, bool select )
     GtkEnableEvents();
 }
 
     GtkEnableEvents();
 }
 

-void wxListBox::GtkUpdateOldSelection()
-{
-    if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED))
-        GetSelections( m_oldSelection );
-}
-

 void wxListBox::DoScrollToCell(int n, float alignY, float alignX)
 {
     wxCHECK_RET( m_treeview, wxT("invalid listbox") );
 void wxListBox::DoScrollToCell(int n, float alignY, float alignX)
 {
     wxCHECK_RET( m_treeview, wxT("invalid listbox") );


@@ -1001,10 +920,10 @@ int wxListBox::DoListHitTest(const wxPoint& point) const
 // ----------------------------------------------------------------------------
 
 #if wxUSE_TOOLTIPS
 // ----------------------------------------------------------------------------
 
 #if wxUSE_TOOLTIPS

-void wxListBox::ApplyToolTip( GtkTooltips *tips, const gchar *tip )
+void wxListBox::GTKApplyToolTip( GtkTooltips *tips, const gchar *tip )

 {
     // RN: Is this needed anymore?
 {
     // RN: Is this needed anymore?

-    gtk_tooltips_set_tip( tips, GTK_WIDGET( m_treeview ), tip, (gchar*) NULL );
+    gtk_tooltips_set_tip( tips, GTK_WIDGET( m_treeview ), tip, NULL );

 }
 #endif // wxUSE_TOOLTIPS
 
 }
 #endif // wxUSE_TOOLTIPS