Added some missing tests; replaced scrolwin.cpp with scrlwng.cpp

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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index bdf69d7e36429b785ae663d6f670022f4b8ce4fa..aade5967cfd9ed15af89f85a711578ed47872954 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -26,9 +26,9 @@
 #include "wx/tooltip.h"
 #endif
 
 #include "wx/tooltip.h"
 #endif
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "gdk/gdkkeysyms.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -51,10 +51,8 @@ extern bool g_isIdle;
 
 #if wxUSE_CHECKLISTBOX
 
 
 #if wxUSE_CHECKLISTBOX
 

-#define CHECKBOX_STRING "[-] "
-

 // checklistboxes have "[±] " prepended to their lables, this macro removes it
 // checklistboxes have "[±] " prepended to their lables, this macro removes it

-// (NB: 4 below is the length of CHECKBOX_STRING above)
+// (NB: 4 below is the length of wxCHECKLBOX_STRING above)

 //
 // the argument to it is a "const char *" pointer
 #define GET_REAL_LABEL(label) ((m_hasCheckBoxes)?(label)+4 : (label))
 //
 // the argument to it is a "const char *" pointer
 #define GET_REAL_LABEL(label) ((m_hasCheckBoxes)?(label)+4 : (label))


@@ -75,6 +73,33 @@ extern wxCursor   g_globalCursor;
 
 static bool       g_hasDoubleClicked = FALSE;
 
 
 static bool       g_hasDoubleClicked = FALSE;
 

+//-----------------------------------------------------------------------------
+// idle callback for SetFirstItem
+//-----------------------------------------------------------------------------
+
+struct wxlistbox_idle_struct
+{
+    wxListBox   *m_listbox;
+    int          m_item;
+    gint         m_tag;
+};
+
+static gint wxlistbox_idle_callback( gpointer gdata )
+{
+    wxlistbox_idle_struct* data = (wxlistbox_idle_struct*) gdata;
+    gdk_threads_enter();
+
+    gtk_idle_remove( data->m_tag );
+    
+    data->m_listbox->SetFirstItem( data->m_item );
+    
+    delete data;
+    
+    gdk_threads_leave();
+
+    return TRUE;
+}
+

 //-----------------------------------------------------------------------------
 // "button_release_event"
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // "button_release_event"
 //-----------------------------------------------------------------------------


@@ -170,10 +195,10 @@ gtk_listbox_button_press_callback( GtkWidget *widget,
 static gint
 gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox )
 {
 static gint
 gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox )
 {

-    if (g_isIdle) 
+    if (g_isIdle)

         wxapp_install_idle_handler();
 
         wxapp_install_idle_handler();
 

-    if (g_blockEventsOnDrag) 
+    if (g_blockEventsOnDrag)

         return FALSE;
 
     bool ret = FALSE;
         return FALSE;
 
     bool ret = FALSE;


@@ -188,9 +213,15 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
         new_event.SetCurrentFocus( listbox );
         ret = listbox->GetEventHandler()->ProcessEvent( new_event );
     }
         new_event.SetCurrentFocus( listbox );
         ret = listbox->GetEventHandler()->ProcessEvent( new_event );
     }

-    
+
+    if ((gdk_event->keyval == GDK_Return) && (!ret))
+    {
+        // eat return in all modes
+        ret = TRUE;
+    }
+        

 #if wxUSE_CHECKLISTBOX
 #if wxUSE_CHECKLISTBOX

-    if ((gdk_event->keyval != ' ') && (listbox->m_hasCheckBoxes) && (!ret))
+    if ((gdk_event->keyval == ' ') && (listbox->m_hasCheckBoxes) && (!ret))

     {
         int sel = listbox->GtkGetIndex( widget );
 
     {
         int sel = listbox->GtkGetIndex( widget );
 


@@ -218,14 +249,19 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
 // "select" and "deselect"
 //-----------------------------------------------------------------------------
 
 // "select" and "deselect"
 //-----------------------------------------------------------------------------
 

-static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox );
+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 )
 {
 
 static void gtk_listitem_deselect_callback( GtkWidget *widget, wxListBox *listbox )
 {

-    gtk_listitem_select_callback( widget, listbox );
+    gtk_listitem_select_cb( widget, listbox, FALSE );

 }
 
 }
 

-static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox )
+static void gtk_listitem_select_cb( GtkWidget *WXUNUSED(widget), wxListBox *listbox, bool is_selection )

 {
     if (g_isIdle) wxapp_install_idle_handler();
 
 {
     if (g_isIdle) wxapp_install_idle_handler();
 


@@ -234,6 +270,7 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox
 
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
     event.SetEventObject( listbox );
 
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
     event.SetEventObject( listbox );

+    event.SetExtraLong( (long) is_selection );

 
     wxArrayInt aSelections;
     int n, count = listbox->GetSelections(aSelections);
 
     wxArrayInt aSelections;
     int n, count = listbox->GetSelections(aSelections);


@@ -253,7 +290,8 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox
 
     event.m_commandInt = n;
 
 
     event.m_commandInt = n;
 

-    listbox->GetEventHandler()->ProcessEvent( event );
+    listbox->GetEventHandler()->AddPendingEvent( event );
+//    listbox->GetEventHandler()->ProcessEvent( event );

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


@@ -304,11 +342,21 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     m_list = GTK_LIST( gtk_list_new() );
 
 
     m_list = GTK_LIST( gtk_list_new() );
 

-    GtkSelectionMode mode = GTK_SELECTION_BROWSE;
+    GtkSelectionMode mode;

     if (style & wxLB_MULTIPLE)
     if (style & wxLB_MULTIPLE)

+    {

         mode = GTK_SELECTION_MULTIPLE;
         mode = GTK_SELECTION_MULTIPLE;

+    }

     else if (style & wxLB_EXTENDED)
     else if (style & wxLB_EXTENDED)

+    {

         mode = GTK_SELECTION_EXTENDED;
         mode = GTK_SELECTION_EXTENDED;

+    }
+    else
+    {
+        // if style was 0 set single mode
+        m_windowStyle |= wxLB_SINGLE;
+        mode = GTK_SELECTION_BROWSE;
+    }

 
     gtk_list_set_selection_mode( GTK_LIST(m_list), mode );
 
 
     gtk_list_set_selection_mode( GTK_LIST(m_list), mode );
 


@@ -326,12 +374,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     gtk_widget_show( GTK_WIDGET(m_list) );
 
 
     gtk_widget_show( GTK_WIDGET(m_list) );
 

-    wxSize newSize = size;
-    if (newSize.x == -1)
-        newSize.x = 100;
-    if (newSize.y == -1)
-        newSize.y = 110;
-    SetSize( newSize.x, newSize.y );
+    SetBestSize( size );

 
     if ( style & wxLB_SORT )
     {
 
     if ( style & wxLB_SORT )
     {


@@ -353,7 +396,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     PostCreation();
 
 
     PostCreation();
 

-    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) );
+    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );

     SetForegroundColour( parent->GetForegroundColour() );
     SetFont( parent->GetFont() );
 
     SetForegroundColour( parent->GetForegroundColour() );
     SetFont( parent->GetFont() );
 


@@ -364,7 +407,12 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
 wxListBox::~wxListBox()
 {
 
 wxListBox::~wxListBox()
 {

+    m_hasVMT = FALSE;
+

     Clear();
     Clear();

+    
+    if (m_strings)
+      delete m_strings;

 }
 
 void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 }
 
 void wxListBox::DoInsertItems(const wxArrayString& items, int pos)


@@ -382,28 +430,51 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 
     GList *children = m_list->children;
     int length = g_list_length(children);
 
     GList *children = m_list->children;
     int length = g_list_length(children);

-                 
+

     wxCHECK_RET( pos <= length, wxT("invalid index in wxListBox::InsertItems") );
 
     size_t nItems = items.GetCount();
     wxCHECK_RET( pos <= length, wxT("invalid index in wxListBox::InsertItems") );
 
     size_t nItems = items.GetCount();

+    int index;

 
 

-    if (pos == length)
+    if (m_strings)

     {
     {

-        for ( size_t n = 0; n < nItems; n++ )
+        for (size_t n = 0; n < nItems; n++)

         {
         {

-            GtkAddItem( items[n] );
-
-            m_clientList.Append((wxObject *)NULL);
+            index = m_strings->Add( items[n] );
+            
+            if (index != GetCount())
+            {
+                GtkAddItem( items[n], index );
+                wxNode *node = m_clientList.Nth( index );
+                m_clientList.Insert( node, (wxObject*) NULL );
+            }
+            else
+            {
+                GtkAddItem( items[n] );
+                m_clientList.Append( (wxObject*) NULL );
+            }

         }
     }
     else
     {
         }
     }
     else
     {

-        wxNode *node = m_clientList.Nth( pos );
-        for ( size_t n = 0; n < nItems; n++ )
+        if (pos == length)
+        {
+            for ( size_t n = 0; n < nItems; n++ )
+            {
+                GtkAddItem( items[n] );
+
+                m_clientList.Append((wxObject *)NULL);
+            }
+        }
+        else

         {
         {

-            GtkAddItem( items[n], pos+n );
+            wxNode *node = m_clientList.Nth( pos );
+            for ( size_t n = 0; n < nItems; n++ )
+            {
+                GtkAddItem( items[n], pos+n );

 
 

-            m_clientList.Insert( node, (wxObject *)NULL );
+                m_clientList.Insert( node, (wxObject *)NULL );
+            }

         }
     }
 
         }
     }
 


@@ -417,19 +488,19 @@ int wxListBox::DoAppend( const wxString& item )
     {
         // need to determine the index
         int index = m_strings->Add( item );
     {
         // need to determine the index
         int index = m_strings->Add( item );

-       
-       // only if not at the end anyway
-       if (index != GetCount())
-       {
-          GtkAddItem( item, index );
-          
-          wxNode *node = m_clientList.Nth( index );
+
+        // only if not at the end anyway
+        if (index != GetCount())
+        {
+           GtkAddItem( item, index );
+
+           wxNode *node = m_clientList.Nth( index );

            m_clientList.Insert( node, (wxObject *)NULL );
            m_clientList.Insert( node, (wxObject *)NULL );

-          
-          return index;
-       }
+
+           return index;
+        }

     }
     }

-    
+

     GtkAddItem(item);
 
     m_clientList.Append((wxObject *)NULL);
     GtkAddItem(item);
 
     m_clientList.Append((wxObject *)NULL);


@@ -447,7 +518,7 @@ void wxListBox::GtkAddItem( const wxString &item, int pos )
 #if wxUSE_CHECKLISTBOX
     if (m_hasCheckBoxes)
     {
 #if wxUSE_CHECKLISTBOX
     if (m_hasCheckBoxes)
     {

-        label.Prepend(CHECKBOX_STRING);
+        label.Prepend(wxCHECKLBOX_STRING);

     }
 #endif // wxUSE_CHECKLISTBOX
 
     }
 #endif // wxUSE_CHECKLISTBOX
 


@@ -455,7 +526,7 @@ void wxListBox::GtkAddItem( const wxString &item, int pos )
 
     GList *gitem_list = g_list_alloc ();
     gitem_list->data = list_item;
 
     GList *gitem_list = g_list_alloc ();
     gitem_list->data = list_item;

-  
+

     if (pos == -1)
         gtk_list_append_items( GTK_LIST (m_list), gitem_list );
     else
     if (pos == -1)
         gtk_list_append_items( GTK_LIST (m_list), gitem_list );
     else


@@ -483,18 +554,18 @@ void wxListBox::GtkAddItem( const wxString &item, int pos )
                            (GtkSignalFunc)gtk_listbox_key_press_callback,
                            (gpointer)this );
 
                            (GtkSignalFunc)gtk_listbox_key_press_callback,
                            (gpointer)this );
 

-    gtk_widget_show( list_item );
-

     ConnectWidget( list_item );
 
     ConnectWidget( list_item );
 

+    gtk_widget_show( list_item );
+

     if (GTK_WIDGET_REALIZED(m_widget))
     {
         gtk_widget_realize( list_item );
         gtk_widget_realize( GTK_BIN(list_item)->child );
 
         // Apply current widget style to the new list_item
     if (GTK_WIDGET_REALIZED(m_widget))
     {
         gtk_widget_realize( list_item );
         gtk_widget_realize( GTK_BIN(list_item)->child );
 
         // Apply current widget style to the new list_item

-        if (m_widgetStyle) 
-       {
+        if (m_widgetStyle)
+        {

             gtk_widget_set_style( GTK_WIDGET( list_item ), m_widgetStyle );
             GtkBin *bin = GTK_BIN( list_item );
             GtkWidget *label = GTK_WIDGET( bin->child );
             gtk_widget_set_style( GTK_WIDGET( list_item ), m_widgetStyle );
             GtkBin *bin = GTK_BIN( list_item );
             GtkWidget *label = GTK_WIDGET( bin->child );


@@ -576,7 +647,7 @@ void wxListBox::Clear()
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 

-    gtk_list_clear_items( m_list, 0, Number() );
+    gtk_list_clear_items( m_list, 0, GetCount() );

 
     if ( HasClientObjectData() )
     {
 
     if ( HasClientObjectData() )
     {


@@ -611,7 +682,7 @@ void wxListBox::Delete( int n )
     wxNode *node = m_clientList.Nth( n );
     if ( node )
     {
     wxNode *node = m_clientList.Nth( n );
     if ( node )
     {

-        if ( m_clientDataItemsType == ClientData_Object )
+        if ( m_clientDataItemsType == wxClientData_Object )

         {
             wxClientData *cd = (wxClientData*)node->Data();
             delete cd;
         {
             wxClientData *cd = (wxClientData*)node->Data();
             delete cd;


@@ -641,7 +712,7 @@ void wxListBox::SetString( int n, const wxString &string )
         wxString str;
 #if wxUSE_CHECKLISTBOX
         if (m_hasCheckBoxes)
         wxString str;
 #if wxUSE_CHECKLISTBOX
         if (m_hasCheckBoxes)

-            str += CHECKBOX_STRING;
+            str += wxCHECKLBOX_STRING;

 #endif // wxUSE_CHECKLISTBOX
         str += string;
 
 #endif // wxUSE_CHECKLISTBOX
         str += string;
 


@@ -760,19 +831,10 @@ bool wxListBox::IsSelected( int n ) const
     wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid listbox") );
 
     GList *target = g_list_nth( m_list->children, n );
     wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid listbox") );
 
     GList *target = g_list_nth( m_list->children, n );

-    if (target)
-    {
-        GList *child = m_list->selection;
-        while (child)
-        {
-            if (child->data == target->data) return TRUE;
-            child = child->next;
-        }
-    }

 
 

-    wxFAIL_MSG(wxT("wrong listbox index"));
+    wxCHECK_MSG( target, FALSE, wxT("invalid listbox index") );

 
 

-    return FALSE;
+    return (GTK_WIDGET(target->data)->state == GTK_STATE_SELECTED) ;

 }
 
 void wxListBox::SetSelection( int n, bool select )
 }
 
 void wxListBox::SetSelection( int n, bool select )


@@ -789,9 +851,41 @@ void wxListBox::SetSelection( int n, bool select )
     GtkEnableEvents();
 }
 
     GtkEnableEvents();
 }
 

-void wxListBox::DoSetFirstItem( int WXUNUSED(n) )
+void wxListBox::DoSetFirstItem( int n )

 {
 {

-    wxFAIL_MSG(wxT("wxListBox::SetFirstItem not implemented"));
+    wxCHECK_RET( m_list, wxT("invalid listbox") );
+
+    if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (m_list))
+        return;
+    
+    // terribly efficient    
+    const gchar *vadjustment_key = "gtk-vadjustment";
+    guint vadjustment_key_id = g_quark_from_static_string (vadjustment_key);
+    
+    GtkAdjustment *adjustment = 
+       (GtkAdjustment*) gtk_object_get_data_by_id (GTK_OBJECT (m_list), vadjustment_key_id);
+    wxCHECK_RET( adjustment, wxT("invalid listbox code") );
+
+    GList *target = g_list_nth( m_list->children, n );
+    wxCHECK_RET( target, wxT("invalid listbox index") );
+    
+    GtkWidget *item = GTK_WIDGET(target->data);
+    wxCHECK_RET( item, wxT("invalid listbox code") );
+
+    if (item->allocation.y == -1)
+    {
+        wxlistbox_idle_struct* data = new wxlistbox_idle_struct;
+        data->m_listbox = this;
+        data->m_item = n;
+        data->m_tag = gtk_idle_add_priority( 800, wxlistbox_idle_callback, (gpointer) data );
+        
+        return;
+    }
+
+    float y = item->allocation.y;
+    if (y > adjustment->upper - adjustment->page_size)
+        y = adjustment->upper - adjustment->page_size;
+       gtk_adjustment_set_value( adjustment, y );

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


@@ -865,7 +959,7 @@ GtkWidget *wxListBox::GetConnectWidget()
 
 bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
 {
 
 bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
 {

-    if (wxWindow::IsOwnGtkWindow( window )) return TRUE;
+    if (GTK_WIDGET(m_list)->window == window) return TRUE;

 
     GList *child = m_list->children;
     while (child)
 
     GList *child = m_list->children;
     while (child)


@@ -917,7 +1011,7 @@ void wxListBox::OnInternalIdle()
            as setting the cursor in a parent window also effects the
            windows above so that checking for the current cursor is
            not possible. */
            as setting the cursor in a parent window also effects the
            windows above so that checking for the current cursor is
            not possible. */

-           
+

         gdk_window_set_cursor( GTK_WIDGET(m_list)->window, cursor.GetCursor() );
 
         GList *child = m_list->children;
         gdk_window_set_cursor( GTK_WIDGET(m_list)->window, cursor.GetCursor() );
 
         GList *child = m_list->children;


@@ -925,7 +1019,7 @@ void wxListBox::OnInternalIdle()
         {
             GtkBin *bin = GTK_BIN( child->data );
             GtkWidget *label = GTK_WIDGET( bin->child );
         {
             GtkBin *bin = GTK_BIN( child->data );
             GtkWidget *label = GTK_WIDGET( bin->child );

-            
+

             if (!label->window)
                 break;
             else
             if (!label->window)
                 break;
             else


@@ -938,4 +1032,9 @@ void wxListBox::OnInternalIdle()
     UpdateWindowUI();
 }
 
     UpdateWindowUI();
 }
 

+wxSize wxListBox::DoGetBestSize() const
+{
+    return wxSize(100, 110);
+}
+

 #endif
 #endif