fix wxGTK1 compilation after wxTextEntry DoGetValue() change

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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 634f2fd26e13b09634634abf85d0e4f2aa397707..842f157f5c89dbe8e8604bfc96799aca0c5724c7 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -119,11 +119,11 @@ gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection),
 {
     if (g_blockEventsOnDrag) return;
 
 {
     if (g_blockEventsOnDrag) return;
 

-    if (listbox->HasFlag(wxLB_MULTIPLE) || listbox->HasFlag(wxLB_EXTENDED))
+    if (listbox->HasFlag(wxLB_MULTIPLE | wxLB_EXTENDED))

     {
         listbox->CalcAndSendEvent();
     }
     {
         listbox->CalcAndSendEvent();
     }

-    else
+    else // single selection

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


@@ -169,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 )


@@ -178,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 );
             


@@ -321,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


@@ -352,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),


@@ -365,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( ) );
 


@@ -412,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;
     }


@@ -499,6 +505,15 @@ void wxListBox::GtkEnableEvents()
     UpdateOldSelections();
 }
 
     UpdateOldSelections();
 }
 

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

 // ----------------------------------------------------------------------------
 // adding items
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // adding items
 // ----------------------------------------------------------------------------


@@ -905,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