/////////////////////////////////////////////////////////////////////////////
-// Name: listbox.cpp
+// Name: src/gtk/listbox.cpp
// Purpose:
// Author: Robert Roebling
+// Modified By: Ryan Norton (GtkTreeView implementation)
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
-#ifdef __GNUG__
-#pragma implementation "listbox.h"
-#endif
+#if wxUSE_LISTBOX
#include "wx/listbox.h"
-#if wxUSE_LISTBOX
+#ifndef WX_PRECOMP
+ #include "wx/dynarray.h"
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/utils.h"
+ #include "wx/settings.h"
+ #include "wx/checklst.h"
+ #include "wx/arrstr.h"
+#endif
-#include "wx/dynarray.h"
-#include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/checklst.h"
-#include "wx/settings.h"
+#include "wx/gtk/private.h"
+#include "wx/gtk/treeentry_gtk.h"
#if wxUSE_TOOLTIPS
-#include "wx/tooltip.h"
-#endif
-
-#if wxUSE_DRAG_AND_DROP
-#include "wx/dnd.h"
+ #include "wx/tooltip.h"
#endif
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
//-----------------------------------------------------------------------------
-// idle system
+// data
//-----------------------------------------------------------------------------
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+extern bool g_blockEventsOnDrag;
+extern bool g_blockEventsOnScroll;
-//-------------------------------------------------------------------------
-// conditional compilation
-//-------------------------------------------------------------------------
-#if (GTK_MINOR_VERSION > 0)
- #define NEW_GTK_SCROLL_CODE
-#endif
//-----------------------------------------------------------------------------
-// private functions
+// Macro to tell which row the strings are in (1 if native checklist, 0 if not)
//-----------------------------------------------------------------------------
#if wxUSE_CHECKLISTBOX
-
-#define CHECKBOX_STRING "[-] "
-
-// checklistboxes have "[±] " prepended to their lables, this macro removes it
-// (NB: 4 below is the length of CHECKBOX_STRING above)
-//
-// the argument to it is a "const char *" pointer
-#define GET_REAL_LABEL(label) ((m_hasCheckBoxes)?(label)+4 : (label))
-
-#else // !wxUSE_CHECKLISTBOX
-
-#define GET_REAL_LABEL(label) (label)
-
+# define WXLISTBOX_DATACOLUMN_ARG(x) (x->m_hasCheckBoxes ? 1 : 0)
+#else
+# define WXLISTBOX_DATACOLUMN_ARG(x) (0)
#endif // wxUSE_CHECKLISTBOX
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
-
-extern bool g_blockEventsOnDrag;
-extern bool g_blockEventsOnScroll;
-extern wxCursor g_globalCursor;
-
-static bool g_hasDoubleClicked = FALSE;
+#define WXLISTBOX_DATACOLUMN WXLISTBOX_DATACOLUMN_ARG(this)
//-----------------------------------------------------------------------------
-// "button_release_event"
+// "row-activated"
//-----------------------------------------------------------------------------
-/* we would normally emit a wxEVT_COMMAND_LISTBOX_DOUBLECLICKED event once
- a GDK_2BUTTON_PRESS occurs, but this has the particular problem of the
- listbox keeping the focus until it receives a GDK_BUTTON_RELEASE event.
- 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 */
-
-static gint
-gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget),
- GdkEventButton * WXUNUSED(gdk_event),
- wxListBox *listbox )
+extern "C" {
+static void
+gtk_listbox_row_activated_callback(GtkTreeView * WXUNUSED(treeview),
+ GtkTreePath *path,
+ GtkTreeViewColumn * WXUNUSED(col),
+ wxListBox *listbox)
{
- if (g_isIdle) wxapp_install_idle_handler();
+ if (g_blockEventsOnDrag) return;
+ if (g_blockEventsOnScroll) return;
- if (g_blockEventsOnDrag) return FALSE;
- if (g_blockEventsOnScroll) return FALSE;
+ // This is triggered by either a double-click or a space press
- if (!listbox->m_hasVMT) return FALSE;
+ int sel = gtk_tree_path_get_indices(path)[0];
- if (!g_hasDoubleClicked) return FALSE;
+ wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
+ event.SetEventObject( listbox );
- wxCommandEvent event( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
- event.SetEventObject( listbox );
+ if (listbox->IsSelected(sel))
+ {
+ GtkTreeEntry* entry = listbox->GtkGetEntry(sel);
- wxArrayInt aSelections;
- int count = listbox->GetSelections(aSelections);
- if ( count > 0 )
+ if (entry)
{
- event.m_commandInt = aSelections[0] ;
- event.m_clientData = listbox->GetClientData( event.m_commandInt );
- wxString str(listbox->GetString(event.m_commandInt));
- if (!str.IsEmpty()) event.m_commandString = str;
+ event.SetInt(sel);
+ event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry)));
+
+ if ( listbox->HasClientObjectData() )
+ event.SetClientObject( (wxClientData*) gtk_tree_entry_get_userdata(entry) );
+ else if ( listbox->HasClientUntypedData() )
+ event.SetClientData( gtk_tree_entry_get_userdata(entry) );
+
+ g_object_unref (entry);
}
else
{
- event.m_commandInt = -1 ;
- event.m_commandString.Empty();
+ wxLogSysError(wxT("Internal error - could not get entry for double-click"));
+ event.SetInt(-1);
}
+ }
+ else
+ {
+ event.SetInt(-1);
+ }
- listbox->GetEventHandler()->ProcessEvent( event );
-
- return FALSE;
+ listbox->HandleWindowEvent( event );
+}
}
//-----------------------------------------------------------------------------
-// "button_press_event"
+// "changed"
//-----------------------------------------------------------------------------
-static gint
-gtk_listbox_button_press_callback( GtkWidget *widget,
- GdkEventButton *gdk_event,
- wxListBox *listbox )
+extern "C" {
+static void
+gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection),
+ wxListBox *listbox )
{
- if (g_isIdle) wxapp_install_idle_handler();
-
- if (g_blockEventsOnDrag) return FALSE;
- if (g_blockEventsOnScroll) return FALSE;
+ if (g_blockEventsOnDrag) return;
- if (!listbox->m_hasVMT) return FALSE;
+ if (listbox->m_blockEvent) return;
- int sel = listbox->GetIndex( widget );
+ wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
+ event.SetEventObject( listbox );
-#if wxUSE_CHECKLISTBOX
- if ((listbox->m_hasCheckBoxes) && (gdk_event->x < 15) && (gdk_event->type != GDK_2BUTTON_PRESS))
+ if (listbox->HasFlag(wxLB_MULTIPLE) || listbox->HasFlag(wxLB_EXTENDED))
{
- wxCheckListBox *clb = (wxCheckListBox *)listbox;
+ wxArrayInt selections;
+ listbox->GetSelections( selections );
- clb->Check( sel, !clb->IsChecked(sel) );
+ if (selections.GetCount() == 0)
+ {
+ // indicate that this is a deselection
+ event.SetExtraLong( 0 );
+ event.SetInt( -1 );
+
+ listbox->HandleWindowEvent( event );
- wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() );
- event.SetEventObject( listbox );
- event.SetInt( sel );
- listbox->GetEventHandler()->ProcessEvent( event );
+ return;
+ }
+ else
+ {
+ // indicate that this is a selection
+ event.SetExtraLong( 1 );
+ event.SetInt( selections[0] );
+
+ listbox->HandleWindowEvent( event );
+ }
}
-#endif // wxUSE_CHECKLISTBOX
+ else
+ {
+ int index = listbox->GetSelection();
+ if (index == wxNOT_FOUND)
+ {
+ // indicate that this is a deselection
+ event.SetExtraLong( 0 );
+ event.SetInt( -1 );
- /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */
- g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS);
+ listbox->HandleWindowEvent( event );
- return FALSE;
+ return;
+ }
+ else
+ {
+ GtkTreeEntry* entry = listbox->GtkGetEntry( index );
+
+ // indicate that this is a selection
+ event.SetExtraLong( 1 );
+
+ event.SetInt( index );
+ event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry)));
+
+ if ( listbox->HasClientObjectData() )
+ event.SetClientObject(
+ (wxClientData*) gtk_tree_entry_get_userdata(entry)
+ );
+ else if ( listbox->HasClientUntypedData() )
+ event.SetClientData( gtk_tree_entry_get_userdata(entry) );
+
+ listbox->HandleWindowEvent( event );
+
+ g_object_unref (entry);
+ }
+ }
+}
}
//-----------------------------------------------------------------------------
// "key_press_event"
//-----------------------------------------------------------------------------
-#if wxUSE_CHECKLISTBOX
+extern "C" {
static gint
-gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox )
+gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget),
+ GdkEventKey *gdk_event,
+ wxListBox *listbox )
{
- if (g_isIdle) wxapp_install_idle_handler();
-
- if (g_blockEventsOnDrag) return FALSE;
-
- if (!listbox->m_hasVMT) return FALSE;
-
- if (gdk_event->keyval != ' ') return FALSE;
+ if ((gdk_event->keyval == GDK_Return) ||
+ (gdk_event->keyval == GDK_ISO_Enter) ||
+ (gdk_event->keyval == GDK_KP_Enter))
+ {
+ int index = listbox->GetSelection();
+ if (index != wxNOT_FOUND)
+ {
+
+ wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
+ event.SetEventObject( listbox );
+
+ GtkTreeEntry* entry = listbox->GtkGetEntry( index );
- int sel = listbox->GetIndex( widget );
+ // indicate that this is a selection
+ event.SetExtraLong( 1 );
- wxCheckListBox *clb = (wxCheckListBox *)listbox;
+ event.SetInt( index );
+ event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry)));
- clb->Check( sel, !clb->IsChecked(sel) );
+ if ( listbox->HasClientObjectData() )
+ event.SetClientObject(
+ (wxClientData*) gtk_tree_entry_get_userdata(entry)
+ );
+ else if ( listbox->HasClientUntypedData() )
+ event.SetClientData( gtk_tree_entry_get_userdata(entry) );
- wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() );
- event.SetEventObject( listbox );
- event.SetInt( sel );
- listbox->GetEventHandler()->ProcessEvent( event );
+ /* bool ret = */ listbox->HandleWindowEvent( event );
+ g_object_unref (entry);
+
+// wxMac and wxMSW always invoke default action
+// if (!ret)
+ {
+ // DClick not handled -> invoke default action
+ wxWindow *tlw = wxGetTopLevelParent( listbox );
+ if (tlw)
+ {
+ GtkWindow *gtk_window = GTK_WINDOW( tlw->GetHandle() );
+ if (gtk_window)
+ gtk_window_activate_default( gtk_window );
+ }
+ }
+
+ // Always intercept, otherwise we'd get another dclick
+ // event from row_activated
+ return TRUE;
+ }
+ }
+
return FALSE;
}
-#endif // wxUSE_CHECKLISTBOX
+}
//-----------------------------------------------------------------------------
-// "select" and "deselect"
+// GtkTreeEntry destruction (to destroy client data)
//-----------------------------------------------------------------------------
-static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox );
-
-static void gtk_listitem_deselect_callback( GtkWidget *widget, wxListBox *listbox )
+extern "C" {
+static void gtk_tree_entry_destroy_cb(GtkTreeEntry* entry,
+ wxListBox* listbox)
{
- gtk_listitem_select_callback( widget, listbox );
+ if (listbox->HasClientObjectData())
+ {
+ gpointer userdata = gtk_tree_entry_get_userdata(entry);
+ if (userdata)
+ delete (wxClientData *)userdata;
+ }
+}
}
-static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox )
+//-----------------------------------------------------------------------------
+// Sorting callback (standard CmpNoCase return value)
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static gint gtk_listbox_sort_callback(GtkTreeModel * WXUNUSED(model),
+ GtkTreeIter *a,
+ GtkTreeIter *b,
+ wxListBox *listbox)
{
- if (g_isIdle) wxapp_install_idle_handler();
+ GtkTreeEntry* entry;
+ GtkTreeEntry* entry2;
- if (!listbox->m_hasVMT) return;
- if (g_blockEventsOnDrag) return;
+ gtk_tree_model_get(GTK_TREE_MODEL(listbox->m_liststore),
+ a,
+ WXLISTBOX_DATACOLUMN_ARG(listbox),
+ &entry, -1);
+ gtk_tree_model_get(GTK_TREE_MODEL(listbox->m_liststore),
+ b,
+ WXLISTBOX_DATACOLUMN_ARG(listbox),
+ &entry2, -1);
+ wxCHECK_MSG(entry, 0, wxT("Could not get entry"));
+ wxCHECK_MSG(entry2, 0, wxT("Could not get entry2"));
- wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
+ //We compare collate keys here instead of calling g_utf8_collate
+ //as it is rather slow (and even the docs reccommend this)
+ int ret = strcmp(gtk_tree_entry_get_collate_key(entry),
+ gtk_tree_entry_get_collate_key(entry2));
- wxArrayInt aSelections;
- int n, count = listbox->GetSelections(aSelections);
- if ( count > 0 )
- {
- n = aSelections[0];
- event.m_clientData = listbox->m_clientData.Item(n);
- event.m_commandString = listbox->GetString(n);
- }
- else
- {
- n = -1;
- }
+ g_object_unref (entry);
+ g_object_unref (entry2);
- event.m_commandInt = n;
+ return ret;
+}
+}
- event.SetEventObject( listbox );
+//-----------------------------------------------------------------------------
+// Searching callback (TRUE == not equal, FALSE == equal)
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static gboolean gtk_listbox_searchequal_callback(GtkTreeModel * WXUNUSED(model),
+ gint WXUNUSED(column),
+ const gchar* key,
+ GtkTreeIter* iter,
+ wxListBox* listbox)
+{
+ GtkTreeEntry* entry;
+
+ gtk_tree_model_get(GTK_TREE_MODEL(listbox->m_liststore),
+ iter,
+ WXLISTBOX_DATACOLUMN_ARG(listbox),
+ &entry, -1);
+ wxCHECK_MSG(entry, 0, wxT("Could not get entry"));
+ wxGtkString keycollatekey(g_utf8_collate_key(key, -1));
+
+ int ret = strcmp(keycollatekey,
+ gtk_tree_entry_get_collate_key(entry));
- listbox->GetEventHandler()->ProcessEvent( event );
+ g_object_unref (entry);
+
+ return ret != 0;
+}
}
//-----------------------------------------------------------------------------
// wxListBox
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
// ----------------------------------------------------------------------------
// construction
// ----------------------------------------------------------------------------
-wxListBox::wxListBox()
+void wxListBox::Init()
{
- m_list = (GtkList *) NULL;
+ m_treeview = (GtkTreeView*) NULL;
#if wxUSE_CHECKLISTBOX
- m_hasCheckBoxes = FALSE;
+ m_hasCheckBoxes = false;
#endif // wxUSE_CHECKLISTBOX
}
+bool wxListBox::Create( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos, const wxSize &size,
+ const wxArrayString& choices,
+ long style, const wxValidator& validator,
+ const wxString &name )
+{
+ wxCArrayString chs(choices);
+
+ return Create( parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+ style, validator, name );
+}
+
bool wxListBox::Create( wxWindow *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size,
int n, const wxString choices[],
long style, const wxValidator& validator,
const wxString &name )
{
- m_needParent = TRUE;
- m_acceptsFocus = TRUE;
+ m_blockEvent = false;
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( wxT("wxListBox creation failed") );
- return FALSE;
+ return false;
}
m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL );
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
}
- m_list = GTK_LIST( gtk_list_new() );
- GtkSelectionMode mode = GTK_SELECTION_BROWSE;
- if (style & wxLB_MULTIPLE)
- mode = GTK_SELECTION_MULTIPLE;
- else if (style & wxLB_EXTENDED)
- mode = GTK_SELECTION_EXTENDED;
+ GtkScrolledWindowSetBorder(m_widget, style);
- gtk_list_set_selection_mode( GTK_LIST(m_list), mode );
+ m_treeview = GTK_TREE_VIEW( gtk_tree_view_new( ) );
-#ifdef NEW_GTK_SCROLL_CODE
- gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(m_widget), GTK_WIDGET(m_list) );
-#else
- gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_list) );
-#endif
+ //wxListBox doesn't have a header :)
+ //NB: If enabled SetFirstItem doesn't work correctly
+ gtk_tree_view_set_headers_visible(m_treeview, FALSE);
- /* make list scroll when moving the focus down using cursor keys */
- gtk_container_set_focus_vadjustment(
- GTK_CONTAINER(m_list),
- gtk_scrolled_window_get_vadjustment(
- GTK_SCROLLED_WINDOW(m_widget)));
+#if wxUSE_CHECKLISTBOX
+ if(m_hasCheckBoxes)
+ ((wxCheckListBox*)this)->DoCreateCheckList();
+#endif // wxUSE_CHECKLISTBOX
- gtk_widget_show( GTK_WIDGET(m_list) );
+ // Create the data column
+ gtk_tree_view_insert_column_with_attributes(m_treeview, -1, "",
+ gtk_cell_renderer_text_new(),
+ "text",
+ WXLISTBOX_DATACOLUMN, NULL);
- wxSize newSize = size;
- if (newSize.x == -1) newSize.x = 100;
- if (newSize.y == -1) newSize.y = 110;
- SetSize( newSize.x, newSize.y );
+ // Now create+set the model (GtkListStore) - first argument # of columns
+#if wxUSE_CHECKLISTBOX
+ if(m_hasCheckBoxes)
+ m_liststore = gtk_list_store_new(2, G_TYPE_BOOLEAN,
+ GTK_TYPE_TREE_ENTRY);
+ else
+#endif
+ m_liststore = gtk_list_store_new(1, GTK_TYPE_TREE_ENTRY);
- if ( style & wxLB_SORT )
- {
- // this will change DoAppend() behaviour
- m_strings = new wxSortedArrayString;
- }
+ gtk_tree_view_set_model(m_treeview, GTK_TREE_MODEL(m_liststore));
- for (int i = 0; i < n; i++)
- {
- m_clientData.Append((wxObject *)NULL);
+ g_object_unref (m_liststore); //free on treeview destruction
- DoAppend(choices[i]);
+ // Disable the pop-up textctrl that enables searching - note that
+ // the docs specify that even if this disabled (which we are doing)
+ // the user can still have it through the start-interactive-search
+ // key binding...either way we want to provide a searchequal callback
+ // NB: If this is enabled a doubleclick event (activate) gets sent
+ // on a successful search
+ gtk_tree_view_set_search_column(m_treeview, WXLISTBOX_DATACOLUMN);
+ gtk_tree_view_set_search_equal_func(m_treeview,
+ (GtkTreeViewSearchEqualFunc) gtk_listbox_searchequal_callback,
+ this,
+ NULL);
-#if 0
- wxString str(choices[i]);
+ gtk_tree_view_set_enable_search(m_treeview, FALSE);
-#if wxUSE_CHECKLISTBOX
- if (m_hasCheckBoxes)
- {
- str.Prepend(CHECKBOX_STRING);
- }
-#endif // wxUSE_CHECKLISTBOX
- GtkWidget *list_item = gtk_list_item_new_with_label( str.mbc_str() );
+ GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview );
- gtk_container_add( GTK_CONTAINER(m_list), list_item );
+ g_signal_connect_after (selection, "changed",
+ G_CALLBACK (gtk_listitem_changed_callback), this);
- gtk_signal_connect( GTK_OBJECT(list_item), "select",
- GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
+ GtkSelectionMode mode;
+ if (style & wxLB_MULTIPLE)
+ {
+ mode = GTK_SELECTION_MULTIPLE;
+ }
+ else if (style & wxLB_EXTENDED)
+ {
+ mode = GTK_SELECTION_EXTENDED;
+ }
+ else
+ {
+ // if style was 0 set single mode
+ m_windowStyle |= wxLB_SINGLE;
+ mode = GTK_SELECTION_SINGLE;
+ }
- if (style & wxLB_MULTIPLE)
- gtk_signal_connect( GTK_OBJECT(list_item), "deselect",
- GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
+ gtk_tree_selection_set_mode( selection, mode );
- gtk_signal_connect( GTK_OBJECT(list_item),
- "button_press_event",
- (GtkSignalFunc)gtk_listbox_button_press_callback,
- (gpointer) this );
+ // Handle sortable stuff
+ if(HasFlag(wxLB_SORT))
+ {
+ // Setup sorting in ascending (wx) order
+ gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(m_liststore),
+ WXLISTBOX_DATACOLUMN,
+ GTK_SORT_ASCENDING);
- gtk_signal_connect_after( GTK_OBJECT(list_item),
- "button_release_event",
- (GtkSignalFunc)gtk_listbox_button_release_callback,
- (gpointer) this );
+ // Set the sort callback
+ gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(m_liststore),
+ WXLISTBOX_DATACOLUMN,
+ (GtkTreeIterCompareFunc) gtk_listbox_sort_callback,
+ this, //userdata
+ NULL //"destroy notifier"
+ );
+ }
-#if wxUSE_CHECKLISTBOX
- if (m_hasCheckBoxes)
- {
- gtk_signal_connect( GTK_OBJECT(list_item),
- "key_press_event",
- (GtkSignalFunc)gtk_listbox_key_press_callback,
- (gpointer)this );
- }
-#endif // wxUSE_CHECKLISTBOX
- ConnectWidget( list_item );
+ gtk_container_add (GTK_CONTAINER (m_widget), GTK_WIDGET(m_treeview) );
- gtk_widget_show( list_item );
-#endif // 0
- }
+ gtk_widget_show( GTK_WIDGET(m_treeview) );
+ m_focusWidget = GTK_WIDGET(m_treeview);
- m_parent->DoAddChild( this );
+ Append(n, choices); // insert initial items
- PostCreation();
+ // generate dclick events
+ g_signal_connect_after(m_treeview, "row-activated",
+ G_CALLBACK(gtk_listbox_row_activated_callback), this);
- SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) );
- SetForegroundColour( parent->GetForegroundColour() );
- SetFont( parent->GetFont() );
+ // for intercepting dclick generation by <ENTER>
+ g_signal_connect (m_treeview, "key_press_event",
+ G_CALLBACK (gtk_listbox_key_press_callback),
+ this);
+ m_parent->DoAddChild( this );
- Show( TRUE );
+ PostCreation(size);
+ SetInitialSize(size); // need this too because this is a wxControlWithItems
- return TRUE;
+ return true;
}
wxListBox::~wxListBox()
{
+ m_hasVMT = false;
+
Clear();
}
-void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
-{
- wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
-
- // code elsewhere supposes we have as many items in m_clientData as items
- // in the listbox
- wxASSERT_MSG( m_clientData.GetCount() == (size_t)GetCount(),
- wxT("bug in client data management") );
-
- GList *children = m_list->children;
- int length = g_list_length(children);
- wxCHECK_RET( pos <= length, wxT("invalid index in wxListBox::InsertItems") );
-
- // VZ: it seems that GTK 1.0.6 doesn't has a function to insert an item
- // into a listbox at the given position, this is why we first delete
- // all items after this position, then append these items and then
- // reappend back the old ones.
-
- // VZ: notice that InsertItems knows nothing about sorting, so calling it
- // from outside (and not from our own Append) is likely to break
- // everything
+// ----------------------------------------------------------------------------
+// adding items
+// ----------------------------------------------------------------------------
- size_t nItems = items.GetCount();
+int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
+ unsigned int pos,
+ void **clientData,
+ wxClientDataType type)
+{
+ wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") );
- size_t n; // loop var
+ InvalidateBestSize();
- // optimise for this trivial case
- if ( pos == length )
+ GtkTreeIter* pIter = NULL; // append by default
+ GtkTreeIter iter;
+ if ( pos != GetCount() )
{
- // no need to do anything complicated
- for ( n = 0; n < nItems; n++ )
- {
- AppendWithoutSorting(items[n]);
+ wxCHECK_MSG( GtkGetIteratorFor(pos, &iter), wxNOT_FOUND,
+ wxT("internal wxListBox error in insertion") );
- m_clientData.Append((wxObject *)NULL);
- }
-
- wxASSERT_MSG( m_clientData.GetCount() == (size_t)GetCount(),
- wxT("bug in client data management") );
-
- return;
+ pIter = &iter;
}
- // remove the old items
- wxArrayString deletedLabels;
- wxArrayPtrVoid deletedData;
-#if wxUSE_CHECKLISTBOX
- wxArrayInt deletedChecks;
-#endif
-
- GList *child = g_list_nth( children, pos );
- for ( n = 0; child != NULL; n++, child = child->next )
+ const unsigned int numItems = items.GetCount();
+ for ( unsigned int i = 0; i < numItems; ++i )
{
- // save label
- GtkBin *bin = GTK_BIN( child->data );
- GtkLabel *label = GTK_LABEL( bin->child );
-
- wxString str(GET_REAL_LABEL(label->label),*wxConvCurrent);
- deletedLabels.Add(str);
-
- // save data
- deletedData.Add(m_clientData.Item(n));
-
-#if wxUSE_CHECKLISTBOX
- // save check state
- if ( m_hasCheckBoxes )
- {
- deletedChecks.Add(((wxCheckListBox *)this)->IsChecked(pos + n));
- }
-#endif // wxUSE_CHECKLISTBOX
- }
-
- // don't delete contents, the data will be reappended soon
- m_clientData.Clear();
+ GtkTreeEntry* entry = gtk_tree_entry_new();
+ gtk_tree_entry_set_label(entry, wxGTK_CONV(items[i]));
+ gtk_tree_entry_set_destroy_func(entry,
+ (GtkTreeEntryDestroy)gtk_tree_entry_destroy_cb,
+ this);
- size_t nDeletedCount = n;
+ GtkTreeIter itercur;
+ gtk_list_store_insert_before(m_liststore, &itercur, pIter);
- gtk_list_clear_items( m_list, pos, length );
+ GtkSetItem(itercur, entry);
- // now append the new items
- for ( n = 0; n < nItems; n++ )
- {
- AppendWithoutSorting(items[n]);
+ g_object_unref (entry);
- m_clientData.Append((wxObject *)NULL);
+ if (clientData)
+ AssignNewItemClientData(GtkGetIndexFor(itercur), clientData, i, type);
}
- // and append the old items too
- pos += nItems; // now the indices are shifter
- for ( n = 0; n < nDeletedCount; n++ )
- {
- AppendWithoutSorting(deletedLabels[n]);
+ return pos + numItems - 1;
+}
- m_clientData.Append((wxObject *)NULL);
+// ----------------------------------------------------------------------------
+// deleting items
+// ----------------------------------------------------------------------------
- if ( m_clientDataItemsType == ClientData_Object )
- SetClientObject(n, (wxClientData *)deletedData[n]);
- else if ( m_clientDataItemsType == ClientData_Void )
- SetClientData(n, deletedData[n]);
+void wxListBox::DoClear()
+{
+ wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
-#if wxUSE_CHECKLISTBOX
- if ( m_hasCheckBoxes )
- {
- ((wxCheckListBox *)this)->Check(pos + n, (bool)deletedChecks[n]);
- }
-#endif // wxUSE_CHECKLISTBOX
- }
+ InvalidateBestSize();
- wxASSERT_MSG( m_clientData.GetCount() == (size_t)GetCount(),
- wxT("bug in client data management") );
+ gtk_list_store_clear( m_liststore ); /* well, THAT was easy :) */
}
-int wxListBox::DoAppend( const wxString& item )
+void wxListBox::DoDeleteOneItem(unsigned int n)
{
- int index;
- if ( m_strings )
- {
- // need to determine the index
- index = m_strings->Add(item);
-
- InsertItems(1, &item, index);
- }
- else
- {
- // not sorted, just append
- AppendWithoutSorting(item);
+ wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
- m_clientData.Append((wxObject *)NULL);
+ InvalidateBestSize();
- index = GetCount() - 1;
- }
+ GtkTreeIter iter;
+ wxCHECK_RET( GtkGetIteratorFor(n, &iter), wxT("wrong listbox index") );
- return index;
+ // this returns false if iter is invalid (e.g. deleting item at end) but
+ // since we don't use iter, we ignore the return value
+ gtk_list_store_remove(m_liststore, &iter);
}
-void wxListBox::AppendWithoutSorting( const wxString &item )
-{
- wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
-
- GtkWidget *list_item;
+// ----------------------------------------------------------------------------
+// helper functions for working with iterators
+// ----------------------------------------------------------------------------
- wxString label(item);
-#if wxUSE_CHECKLISTBOX
- if (m_hasCheckBoxes)
+bool wxListBox::GtkGetIteratorFor(unsigned pos, GtkTreeIter *iter) const
+{
+ if ( !gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(m_liststore),
+ iter, NULL, pos) )
{
- label.Prepend(CHECKBOX_STRING);
+ wxLogDebug(wxT("gtk_tree_model_iter_nth_child(%u) failed"), pos);
+ return false;
}
-#endif // wxUSE_CHECKLISTBOX
- list_item = gtk_list_item_new_with_label( label.mbc_str() );
+ return true;
+}
- gtk_container_add( GTK_CONTAINER(m_list), list_item );
+int wxListBox::GtkGetIndexFor(GtkTreeIter& iter) const
+{
+ GtkTreePath *path =
+ gtk_tree_model_get_path(GTK_TREE_MODEL(m_liststore), &iter);
- gtk_signal_connect( GTK_OBJECT(list_item), "select",
- GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
+ gint* pIntPath = gtk_tree_path_get_indices(path);
- if (HasFlag(wxLB_MULTIPLE))
- gtk_signal_connect( GTK_OBJECT(list_item), "deselect",
- GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
+ wxCHECK_MSG( pIntPath, wxNOT_FOUND, _T("failed to get iterator path") );
- gtk_signal_connect( GTK_OBJECT(list_item),
- "button_press_event",
- (GtkSignalFunc)gtk_listbox_button_press_callback,
- (gpointer) this );
+ int idx = pIntPath[0];
- gtk_signal_connect_after( GTK_OBJECT(list_item),
- "button_release_event",
- (GtkSignalFunc)gtk_listbox_button_release_callback,
- (gpointer) this );
+ gtk_tree_path_free( path );
-#if wxUSE_CHECKLISTBOX
- if (m_hasCheckBoxes)
- {
- gtk_signal_connect( GTK_OBJECT(list_item),
- "key_press_event",
- (GtkSignalFunc)gtk_listbox_key_press_callback,
- (gpointer)this );
- }
-#endif // wxUSE_CHECKLISTBOX
+ return idx;
+}
- gtk_widget_show( list_item );
+// get GtkTreeEntry from position (note: you need to g_unref it if valid)
+GtkTreeEntry *wxListBox::GtkGetEntry(unsigned n) const
+{
+ GtkTreeIter iter;
+ if ( !GtkGetIteratorFor(n, &iter) )
+ return NULL;
- ConnectWidget( list_item );
- if (GTK_WIDGET_REALIZED(m_widget))
- {
- gtk_widget_realize( list_item );
- gtk_widget_realize( GTK_BIN(list_item)->child );
-
- //if (m_widgetStyle) ApplyWidgetStyle();
- if (m_widgetStyle) {
- // Apply current widget style to the new list_item
- 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( label, m_widgetStyle );
- }
+ GtkTreeEntry* entry = NULL;
+ gtk_tree_model_get(GTK_TREE_MODEL(m_liststore), &iter,
+ WXLISTBOX_DATACOLUMN, &entry, -1);
-#if wxUSE_DRAG_AND_DROP
- #ifndef NEW_GTK_DND_CODE
- if (m_dropTarget) m_dropTarget->RegisterWidget( list_item );
- #endif
-#endif
-
-#if wxUSE_TOOLTIPS
- if (m_tooltip) m_tooltip->Apply( this );
-#endif
- }
+ return entry;
}
-void wxListBox::DoSetItems( const wxArrayString& items,
- void **clientData)
+void wxListBox::GtkSetItem(GtkTreeIter& iter, const GtkTreeEntry *entry)
{
- Clear();
-
- DoInsertItems(items, 0);
-
- if ( clientData )
+#if wxUSE_CHECKLISTBOX
+ if ( m_hasCheckBoxes )
{
- size_t count = items.GetCount();
- for ( size_t n = 0; n < count; n++ )
- {
- SetClientData(n, clientData[n]);
- }
+ gtk_list_store_set(m_liststore, &iter,
+ 0, FALSE, // FALSE == not toggled
+ 1, entry,
+ -1);
+ }
+ else
+#endif // wxUSE_CHECKLISTBOX
+ {
+ gtk_list_store_set(m_liststore, &iter, 0, entry, -1);
}
}
// client data
// ----------------------------------------------------------------------------
-void wxListBox::DoSetClientData( int n, void* clientData )
+void* wxListBox::DoGetItemClientData(unsigned int n) const
{
- wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
+ wxCHECK_MSG( IsValid(n), NULL,
+ wxT("Invalid index passed to GetItemClientData") );
- wxNode *node = m_clientData.Nth( n );
- wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetClientData") );
+ GtkTreeEntry* entry = GtkGetEntry(n);
+ wxCHECK_MSG(entry, NULL, wxT("could not get entry"));
- node->SetData( (wxObject*) clientData );
+ void* userdata = gtk_tree_entry_get_userdata( entry );
+ g_object_unref (entry);
+ return userdata;
}
-void* wxListBox::DoGetClientData( int n ) const
+void wxListBox::DoSetItemClientData(unsigned int n, void* clientData)
{
- wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid listbox control") );
+ wxCHECK_RET( IsValid(n),
+ wxT("Invalid index passed to SetItemClientData") );
- wxNode *node = m_clientData.Nth( n );
- wxCHECK_MSG( node, NULL, wxT("invalid index in wxListBox::DoGetClientData") );
+ GtkTreeEntry* entry = GtkGetEntry(n);
+ wxCHECK_RET(entry, wxT("could not get entry"));
- return node->Data();
+ gtk_tree_entry_set_userdata( entry, clientData );
+ g_object_unref (entry);
}
-void wxListBox::DoSetClientObject( int n, wxClientData* clientData )
-{
- wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
+// ----------------------------------------------------------------------------
+// string list access
+// ----------------------------------------------------------------------------
- wxNode *node = m_clientData.Nth( n );
- wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetClientObject") );
+void wxListBox::SetString(unsigned int n, const wxString& label)
+{
+ wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetString") );
+ wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
- wxClientData *cd = (wxClientData*) node->Data();
- delete cd;
+ GtkTreeEntry* entry = GtkGetEntry(n);
+ wxCHECK_RET( entry, wxT("wrong listbox index") );
- node->SetData( (wxObject*) clientData );
-}
+ // update the item itself
+ gtk_tree_entry_set_label(entry, wxGTK_CONV(label));
-wxClientData* wxListBox::DoGetClientObject( int n ) const
-{
- wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid listbox control") );
+ // and update the model which will refresh the tree too
+ GtkTreeIter iter;
+ wxCHECK_RET( GtkGetIteratorFor(n, &iter), _T("failed to get iterator") );
- wxNode *node = m_clientData.Nth( n );
- wxCHECK_MSG( node, (wxClientData *)NULL,
- wxT("invalid index in wxListBox::DoGetClientObject") );
+ // FIXME: this resets the checked status of a wxCheckListBox item
- return (wxClientData*) node->Data();
+ GtkSetItem(iter, entry);
}
-void wxListBox::Clear()
+wxString wxListBox::GetString(unsigned int n) const
{
- wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
+ wxCHECK_MSG( m_treeview != NULL, wxEmptyString, wxT("invalid listbox") );
- gtk_list_clear_items( m_list, 0, Number() );
+ GtkTreeEntry* entry = GtkGetEntry(n);
+ wxCHECK_MSG( entry, wxEmptyString, wxT("wrong listbox index") );
- if ( m_clientDataItemsType == ClientData_Object )
- m_clientData.DeleteContents(TRUE);
- m_clientData.Clear();
+ wxString label = wxGTK_CONV_BACK( gtk_tree_entry_get_label(entry) );
- if ( m_strings )
- m_strings->Clear();
+ g_object_unref (entry);
+ return label;
}
-void wxListBox::Delete( int n )
+unsigned int wxListBox::GetCount() const
{
- wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
+ wxCHECK_MSG( m_treeview != NULL, 0, wxT("invalid listbox") );
- GList *child = g_list_nth( m_list->children, n );
+ return (unsigned int)gtk_tree_model_iter_n_children(GTK_TREE_MODEL(m_liststore), NULL);
+}
- wxCHECK_RET( child, wxT("wrong listbox index") );
+int wxListBox::FindString( const wxString &item, bool bCase ) const
+{
+ wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") );
- GList *list = g_list_append( (GList*) NULL, child->data );
- gtk_list_remove_items( m_list, list );
- g_list_free( list );
+ //Sort of hackish - maybe there is a faster way
+ unsigned int nCount = wxListBox::GetCount();
- wxNode *node = m_clientData.Nth( n );
- if ( node )
+ for(unsigned int i = 0; i < nCount; ++i)
{
- if ( m_clientDataItemsType == ClientData_Object )
- {
- wxClientData *cd = (wxClientData*)node->Data();
- delete cd;
- }
-
- m_clientData.DeleteNode( node );
+ if( item.IsSameAs( wxListBox::GetString(i), bCase ) )
+ return (int)i;
}
- if ( m_strings )
- m_strings->Remove(n);
+
+ // it's not an error if the string is not found -> no wxCHECK
+ return wxNOT_FOUND;
}
// ----------------------------------------------------------------------------
-// string list access
+// selection
// ----------------------------------------------------------------------------
-void wxListBox::SetString( int n, const wxString &string )
+int wxListBox::GetSelection() const
{
- wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
+ wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox"));
+ wxCHECK_MSG( HasFlag(wxLB_SINGLE), wxNOT_FOUND,
+ wxT("must be single selection listbox"));
- GList *child = g_list_nth( m_list->children, n );
- if (child)
- {
- GtkBin *bin = GTK_BIN( child->data );
- GtkLabel *label = GTK_LABEL( bin->child );
+ GtkTreeIter iter;
+ GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
- wxString str;
-#if wxUSE_CHECKLISTBOX
- if (m_hasCheckBoxes)
- str += CHECKBOX_STRING;
-#endif // wxUSE_CHECKLISTBOX
- str += string;
+ // only works on single-sel
+ if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
+ return wxNOT_FOUND;
- gtk_label_set( label, str.mbc_str() );
- }
- else
- {
- wxFAIL_MSG(wxT("wrong listbox index"));
- }
+ return GtkGetIndexFor(iter);
}
-wxString wxListBox::GetString( int n ) const
+int wxListBox::GetSelections( wxArrayInt& aSelections ) const
{
- wxCHECK_MSG( m_list != NULL, wxT(""), wxT("invalid listbox") );
+ wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") );
- GList *child = g_list_nth( m_list->children, n );
- if (child)
- {
- GtkBin *bin = GTK_BIN( child->data );
- GtkLabel *label = GTK_LABEL( bin->child );
+ aSelections.Empty();
- wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent);
+ int i = 0;
+ GtkTreeIter iter;
+ GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
- return str;
- }
+ if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(m_liststore), &iter))
+ { //gtk_tree_selection_get_selected_rows is GTK 2.2+ so iter instead
+ do
+ {
+ if (gtk_tree_selection_iter_is_selected(selection, &iter))
+ aSelections.Add(i);
- wxFAIL_MSG(wxT("wrong listbox index"));
+ i++;
+ } while(gtk_tree_model_iter_next(GTK_TREE_MODEL(m_liststore), &iter));
+ }
- return wxT("");
+ return aSelections.GetCount();
}
-int wxListBox::GetCount() const
+bool wxListBox::IsSelected( int n ) const
{
- wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
+ wxCHECK_MSG( m_treeview != NULL, false, wxT("invalid listbox") );
- GList *child = m_list->children;
- int count = 0;
- while (child)
- {
- count++;
- child = child->next;
- }
+ GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
+
+ GtkTreeIter iter;
+ wxCHECK_MSG( GtkGetIteratorFor(n, &iter), false, wxT("Invalid index") );
- return count;
+ return gtk_tree_selection_iter_is_selected(selection, &iter);
}
-int wxListBox::FindString( const wxString &item ) const
+void wxListBox::DoSetSelection( int n, bool select )
{
- wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
-
- GList *child = m_list->children;
- int count = 0;
- while (child)
+ // passing -1 to SetSelection() is documented to deselect all items
+ if ( n == wxNOT_FOUND )
{
- GtkBin *bin = GTK_BIN( child->data );
- GtkLabel *label = GTK_LABEL( bin->child );
-
- wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent);
-
- if (str == item)
- return count;
-
- count++;
- child = child->next;
+ // ... and not generate any events in the process
+ GtkDeselectAll();
+ return;
}
- // it's not an error if the string is not found -> no wxCHECK
+ wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetSelection") );
- return wxNOT_FOUND;
+ // don't generate the selection event
+ GtkSetSelection(n, select, true);
}
-// ----------------------------------------------------------------------------
-// selection
-// ----------------------------------------------------------------------------
-
-int wxListBox::GetSelection() const
+void wxListBox::GtkDeselectAll()
{
- wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
+ wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
- GList *child = m_list->children;
- int count = 0;
- while (child)
- {
- if (GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED) return count;
- count++;
- child = child->next;
- }
- return -1;
+ GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
+
+ m_blockEvent = true;
+
+ gtk_tree_selection_unselect_all(selection);
+
+ m_blockEvent = false;
}
-int wxListBox::GetSelections( wxArrayInt& aSelections ) const
+void wxListBox::GtkSetSelection(int n, const bool select, const bool blockEvent)
{
- wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
+ wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
- // get the number of selected items first
- GList *child = m_list->children;
- int count = 0;
- for (child = m_list->children; child != NULL; child = child->next)
- {
- if (GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED)
- count++;
- }
+ GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
- aSelections.Empty();
+ GtkTreeIter iter;
+ wxCHECK_RET( GtkGetIteratorFor(n, &iter), wxT("Invalid index") );
- if (count > 0)
- {
- // now fill the list
- aSelections.Alloc(count); // optimization attempt
- int i = 0;
- for (child = m_list->children; child != NULL; child = child->next, i++)
- {
- if (GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED)
- aSelections.Add(i);
- }
- }
+ m_blockEvent = blockEvent;
- return count;
-}
+ if (select)
+ gtk_tree_selection_select_iter(selection, &iter);
+ else
+ gtk_tree_selection_unselect_iter(selection, &iter);
-bool wxListBox::IsSelected( int n ) const
-{
- wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid listbox") );
+ GtkTreePath* path = gtk_tree_model_get_path(
+ GTK_TREE_MODEL(m_liststore), &iter);
- 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;
- }
- }
+ gtk_tree_view_scroll_to_cell(m_treeview, path, NULL, FALSE, 0.0f, 0.0f);
- wxFAIL_MSG(wxT("wrong listbox index"));
+ gtk_tree_path_free(path);
- return FALSE;
+ m_blockEvent = false;
}
-void wxListBox::SetSelection( int n, bool select )
+void wxListBox::DoScrollToCell(int n, float alignY, float alignX)
{
- wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
+ wxCHECK_RET( m_treeview, wxT("invalid listbox") );
+ wxCHECK_RET( IsValid(n), wxT("invalid index"));
- DisableEvents();
+ //RN: I have no idea why this line is needed...
+ if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (m_treeview))
+ return;
- if (select)
- gtk_list_select_item( m_list, n );
- else
- gtk_list_unselect_item( m_list, n );
+ GtkTreeIter iter;
+ if ( !GtkGetIteratorFor(n, &iter) )
+ return;
- EnableEvents();
-}
+ GtkTreePath* path = gtk_tree_model_get_path(
+ GTK_TREE_MODEL(m_liststore), &iter);
-void wxListBox::DoSetFirstItem( int WXUNUSED(n) )
-{
- wxFAIL_MSG(wxT("wxListBox::SetFirstItem not implemented"));
-}
+ // Scroll to the desired cell (0.0 == topleft alignment)
+ gtk_tree_view_scroll_to_cell(m_treeview, path, NULL,
+ TRUE, alignY, alignX);
-// ----------------------------------------------------------------------------
-// helpers
-// ----------------------------------------------------------------------------
+ gtk_tree_path_free(path);
+}
-int wxListBox::GetIndex( GtkWidget *item ) const
+void wxListBox::DoSetFirstItem(int n)
{
- if (item)
- {
- GList *child = m_list->children;
- int count = 0;
- while (child)
- {
- if (GTK_WIDGET(child->data) == item) return count;
- count++;
- child = child->next;
- }
- }
- return -1;
+ DoScrollToCell(n, 0, 0);
}
-#if wxUSE_TOOLTIPS
-void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
+void wxListBox::EnsureVisible(int n)
{
- GList *child = m_list->children;
- while (child)
- {
- gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), wxConvCurrent->cWX2MB(tip), (gchar*) NULL );
- child = child->next;
- }
+ DoScrollToCell(n, 0.5, 0);
}
-#endif // wxUSE_TOOLTIPS
-#if wxUSE_DRAG_AND_DROP
-void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
-{
- wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
+// ----------------------------------------------------------------------------
+// hittest
+// ----------------------------------------------------------------------------
-#ifndef NEW_GTK_DND_CODE
- if (m_dropTarget)
- {
- GList *child = m_list->children;
- while (child)
- {
- m_dropTarget->UnregisterWidget( GTK_WIDGET( child->data ) );
- child = child->next;
- }
- }
-#endif
+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().Contains(point) )
+ return wxNOT_FOUND;
- wxWindow::SetDropTarget( dropTarget );
+ // need to translate from master window since it is in client coords
+ gint binx, biny;
+ gdk_window_get_geometry(gtk_tree_view_get_bin_window(m_treeview),
+ &binx, &biny, NULL, NULL, NULL);
-#ifndef NEW_GTK_DND_CODE
- if (m_dropTarget)
+ GtkTreePath* path;
+ if ( !gtk_tree_view_get_path_at_pos
+ (
+ m_treeview,
+ point.x - binx,
+ point.y - biny,
+ &path,
+ NULL, // [out] column (always 0 here)
+ NULL, // [out] x-coord relative to the cell (not interested)
+ NULL // [out] y-coord relative to the cell
+ ) )
{
- GList *child = m_list->children;
- while (child)
- {
- m_dropTarget->RegisterWidget( GTK_WIDGET( child->data ) );
- child = child->next;
- }
+ return wxNOT_FOUND;
}
-#endif
-}
-#endif
-
-void wxListBox::DisableEvents()
-{
- GList *child = m_list->children;
- while (child)
- {
- gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
- GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
- if (HasFlag(wxLB_MULTIPLE))
- gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
- GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
+ int index = gtk_tree_path_get_indices(path)[0];
+ gtk_tree_path_free(path);
- child = child->next;
- }
+ return index;
}
-void wxListBox::EnableEvents()
-{
- GList *child = m_list->children;
- while (child)
- {
- gtk_signal_connect( GTK_OBJECT(child->data), "select",
- GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
-
- if (HasFlag(wxLB_MULTIPLE))
- gtk_signal_connect( GTK_OBJECT(child->data), "deselect",
- GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
+// ----------------------------------------------------------------------------
+// helpers
+// ----------------------------------------------------------------------------
- child = child->next;
- }
+#if wxUSE_TOOLTIPS
+void wxListBox::ApplyToolTip( GtkTooltips *tips, const gchar *tip )
+{
+ // RN: Is this needed anymore?
+ gtk_tooltips_set_tip( tips, GTK_WIDGET( m_treeview ), tip, (gchar*) NULL );
}
+#endif // wxUSE_TOOLTIPS
GtkWidget *wxListBox::GetConnectWidget()
{
- return GTK_WIDGET(m_list);
+ // the correct widget for listbox events (such as mouse clicks for example)
+ // is m_treeview, not the parent scrolled window
+ return GTK_WIDGET(m_treeview);
}
-bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxListBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
{
- if (wxWindow::IsOwnGtkWindow( window )) return TRUE;
-
- GList *child = m_list->children;
- while (child)
- {
- GtkWidget *bin = GTK_WIDGET( child->data );
- if (bin->window == window) return TRUE;
- child = child->next;
- }
-
- return FALSE;
+ return gtk_tree_view_get_bin_window(m_treeview);
}
-void wxListBox::ApplyWidgetStyle()
+void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style)
{
- SetWidgetStyle();
-
- if (m_backgroundColour.Ok())
+ if (m_hasBgCol && m_backgroundColour.Ok())
{
- GdkWindow *window = GTK_WIDGET(m_list)->window;
- if ( window )
+ GdkWindow *window = gtk_tree_view_get_bin_window(m_treeview);
+ if (window)
{
- m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
+ m_backgroundColour.CalcPixel( gdk_drawable_get_colormap( window ) );
gdk_window_set_background( window, m_backgroundColour.GetColor() );
gdk_window_clear( window );
}
}
- GList *child = m_list->children;
- while (child)
- {
- gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle );
-
- GtkBin *bin = GTK_BIN( child->data );
- GtkWidget *label = GTK_WIDGET( bin->child );
- gtk_widget_set_style( label, m_widgetStyle );
-
- child = child->next;
- }
+ gtk_widget_modify_style( GTK_WIDGET(m_treeview), style );
}
-void wxListBox::OnInternalIdle()
+wxSize wxListBox::DoGetBestSize() const
{
- wxCursor cursor = m_cursor;
- if (g_globalCursor.Ok()) cursor = g_globalCursor;
+ wxCHECK_MSG(m_treeview, wxDefaultSize, wxT("invalid tree view"));
+
+ // Start with a minimum size that's not too small
+ int cx, cy;
+ GetTextExtent( wxT("X"), &cx, &cy);
+ int lbWidth = 3 * cx;
+ int lbHeight = 10;
- if (GTK_WIDGET(m_list)->window && cursor.Ok())
+ // Get the visible area of the tree view (limit to the 10th item
+ // so that it isn't too big)
+ unsigned int count = GetCount();
+ if (count)
{
- /* I now set the cursor the anew in every OnInternalIdle call
- 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;
- while (child)
- {
- GtkBin *bin = GTK_BIN( child->data );
- GtkWidget *label = GTK_WIDGET( bin->child );
-
- if (!label->window)
- break;
- else
- gdk_window_set_cursor( label->window, cursor.GetCursor() );
+ int wLine;
- child = child->next;
+ // Find the widest line
+ for(unsigned int i = 0; i < count; i++) {
+ wxString str(GetString(i));
+ GetTextExtent(str, &wLine, NULL);
+ lbWidth = wxMax(lbWidth, wLine);
}
+
+ lbWidth += 3 * cx;
+
+ // And just a bit more for the checkbox if present and then some
+ // (these are rough guesses)
+#if wxUSE_CHECKLISTBOX
+ if ( m_hasCheckBoxes )
+ {
+ lbWidth += 35;
+ cy = cy > 25 ? cy : 25; // rough height of checkbox
+ }
+#endif
+
+ // don't make the listbox too tall (limit height to around 10 items) but don't
+ // make it too small neither
+ lbHeight = (cy+4) * wxMin(wxMax(count, 3), 10);
}
- UpdateWindowUI();
+ // Add room for the scrollbar
+ lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
+
+ wxSize best(lbWidth, lbHeight);
+ CacheBestSize(best);
+ return best;
}
-#endif
+// static
+wxVisualAttributes
+wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+ return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new, true);
+}
+
+#endif // wxUSE_LISTBOX
projects / wxWidgets.git / blobdiff