#include "wx/tooltip.h"
#endif
-#include <gdk/gdk.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
extern bool g_blockEventsOnDrag;
extern bool g_blockEventsOnScroll;
-extern wxCursor g_globalCursor;
// Macro to tell which row the strings are in (1 if native checklist, 0 if not)
//-----------------------------------------------------------------------------
-#if wxUSE_CHECKLISTBOX && wxUSE_NATIVEGTKCHECKLIST
+#if wxUSE_CHECKLISTBOX
# define WXLISTBOX_DATACOLUMN_ARG(x) (x->m_hasCheckBoxes ? 1 : 0)
#else
# define WXLISTBOX_DATACOLUMN_ARG(x) (0)
-#endif // wxUSE_CHECKLISTBOX && wxUSE_NATIVEGTKCHECKLIST
+#endif // wxUSE_CHECKLISTBOX
#define WXLISTBOX_DATACOLUMN WXLISTBOX_DATACOLUMN_ARG(this)
extern "C" {
static void
-gtk_listbox_row_activated_callback(GtkTreeView *treeview,
+gtk_listbox_row_activated_callback(GtkTreeView * WXUNUSED(treeview),
GtkTreePath *path,
- GtkTreeViewColumn *col,
+ GtkTreeViewColumn * WXUNUSED(col),
wxListBox *listbox)
{
- if (g_isIdle) wxapp_install_idle_handler();
-
if (g_blockEventsOnDrag) return;
if (g_blockEventsOnScroll) return;
- if (!listbox->m_hasVMT) return;
-
- //Notes:
- //1) This is triggered by either a double-click or a space press
- //2) We handle both here because
- //2a) in the case of a space/keypress we can't really know
- // which item was pressed on because we can't get coords
- // from a keyevent
- //2b) It seems more correct
+ // This is triggered by either a double-click or a space press
int sel = gtk_tree_path_get_indices(path)[0];
- if(!listbox->m_spacePressed)
+ wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
+ event.SetEventObject( listbox );
+
+ if (listbox->IsSelected(sel))
{
- //Assume it was double-click
- wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
- event.SetEventObject( listbox );
+ GtkTreeEntry* entry = listbox->GtkGetEntry(sel);
- if(listbox->IsSelected(sel))
+ if (entry)
{
- GtkTreeEntry* entry = listbox->GtkGetEntry(sel);
+ event.SetInt(sel);
+ event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry)));
- if(entry)
- {
- 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
- {
- wxLogSysError(wxT("Internal error - could not get entry for double-click"));
- event.SetInt(-1);
- }
+ 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
+ {
+ wxLogSysError(wxT("Internal error - could not get entry for double-click"));
event.SetInt(-1);
-
- listbox->GetEventHandler()->ProcessEvent( event );
+ }
}
else
{
- listbox->m_spacePressed = false; //don't block selection behaviour anymore
-
- //Space was pressed - toggle the appropriate checkbox and the selection
-#if wxUSE_CHECKLISTBOX //Do it for both native and non-native
- if (listbox->m_hasCheckBoxes)
- {
- wxCheckListBox *clb = (wxCheckListBox *)listbox;
-
- clb->Check( sel, !clb->IsChecked(sel) );
-
- wxCommandEvent new_event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() );
- new_event.SetEventObject( listbox );
- new_event.SetInt( sel );
- listbox->GetEventHandler()->ProcessEvent( new_event );
- }
-#endif // wxUSE_CHECKLISTBOX
-
- if( (((listbox->GetWindowStyleFlag() & wxLB_MULTIPLE) != 0) ||
- ((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) )
- {
- //toggle the selection + send event
- listbox->GtkSetSelection(sel, !listbox->IsSelected( sel ), false);
- }
+ event.SetInt(-1);
}
+
+ listbox->HandleWindowEvent( event );
}
}
//-----------------------------------------------------------------------------
-// "button_press_event"
+// "changed"
//-----------------------------------------------------------------------------
extern "C" {
-static gint
-gtk_listbox_button_press_callback( GtkWidget *widget,
- GdkEventButton *gdk_event,
- wxListBox *listbox )
+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;
- //Just to be on the safe side - it should be unset in the activate callback
- //but we don't want any obscure bugs if it doesn't get called somehow...
- listbox->m_spacePressed = false;
+ wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
+ event.SetEventObject( listbox );
-#if wxUSE_CHECKLISTBOX && !wxUSE_NATIVEGTKCHECKLIST
- if ((listbox->m_hasCheckBoxes) && (gdk_event->x < 15) && (gdk_event->type != GDK_2BUTTON_PRESS))
+ if (listbox->HasFlag(wxLB_MULTIPLE) || listbox->HasFlag(wxLB_EXTENDED))
{
- GtkTreePath* path;
- gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget),
- (gint)gdk_event->x, (gint)gdk_event->y,
- &path, NULL, NULL, NULL);
- int sel = gtk_tree_path_get_indices(path)[0];
- gtk_tree_path_free(path);
-
- wxCheckListBox *clb = (wxCheckListBox *)listbox;
+ wxArrayInt selections;
+ listbox->GetSelections( selections );
- clb->Check( sel, !clb->IsChecked(sel) );
-
- wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() );
- event.SetEventObject( listbox );
- event.SetInt( sel );
- listbox->GetEventHandler()->ProcessEvent( event );
- }
-#endif // wxUSE_CHECKLISTBOX && !wxUSE_NATIVEGTKCHECKLIST
+ if (selections.GetCount() == 0)
+ {
+ // indicate that this is a deselection
+ event.SetExtraLong( 0 );
+ event.SetInt( -1 );
- return FALSE;
-}
-}
+ listbox->HandleWindowEvent( event );
-//-----------------------------------------------------------------------------
-// "key_press_event"
-//-----------------------------------------------------------------------------
+ return;
+ }
+ else
+ {
+ // indicate that this is a selection
+ event.SetExtraLong( 1 );
+ event.SetInt( selections[0] );
-extern "C" {
-static gint
-gtk_listbox_key_press_callback( GtkWidget *widget,
- GdkEventKey *gdk_event,
- wxListBox *listbox )
-{
- if (g_isIdle) wxapp_install_idle_handler();
+ listbox->HandleWindowEvent( event );
+ }
+ }
+ else
+ {
+ int index = listbox->GetSelection();
+ if (index == wxNOT_FOUND)
+ {
+ // indicate that this is a deselection
+ event.SetExtraLong( 0 );
+ event.SetInt( -1 );
- if (g_blockEventsOnDrag) return FALSE;
+ listbox->HandleWindowEvent( event );
+ return;
+ }
+ else
+ {
+ GtkTreeEntry* entry = listbox->GtkGetEntry( index );
- bool ret = false;
+ // indicate that this is a selection
+ event.SetExtraLong( 1 );
- if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab))
- {
- wxNavigationKeyEvent new_event;
- /* GDK reports GDK_ISO_Left_Tab for SHIFT-TAB */
- new_event.SetDirection( (gdk_event->keyval == GDK_Tab) );
- /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
- new_event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) );
- new_event.SetCurrentFocus( listbox );
- ret = listbox->GetEventHandler()->ProcessEvent( new_event );
- }
+ event.SetInt( index );
+ event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry)));
- if ((gdk_event->keyval == GDK_Return) && (!ret))
- {
- // eat return in all modes (RN:WHY?)
- ret = true;
- }
+ if ( listbox->HasClientObjectData() )
+ event.SetClientObject(
+ (wxClientData*) gtk_tree_entry_get_userdata(entry)
+ );
+ else if ( listbox->HasClientUntypedData() )
+ event.SetClientData( gtk_tree_entry_get_userdata(entry) );
- // Check or uncheck item with SPACE
- if (gdk_event->keyval == ' ')
- {
- //In the keyevent we don't know the index of the item
- //and the activated event gets called anyway...
- //
- //Also, activating with the space causes the treeview to
- //unselect all the items and then select the item in question
- //wx's behaviour is to just toggle the item's selection state
- //and leave the others alone
- listbox->m_spacePressed = true;
- }
+ listbox->HandleWindowEvent( event );
- if (ret)
- {
- g_signal_stop_emission_by_name (widget, "key_press_event");
- return TRUE;
+ g_object_unref (entry);
+ }
}
-
- return FALSE;
}
}
//-----------------------------------------------------------------------------
-// "select" and "deselect"
+// "key_press_event"
//-----------------------------------------------------------------------------
extern "C" {
-static gboolean gtk_listitem_select_cb( GtkTreeSelection* selection,
- GtkTreeModel* model,
- GtkTreePath* path,
- gboolean is_selected,
- wxListBox *listbox )
+static gint
+gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget),
+ GdkEventKey *gdk_event,
+ wxListBox *listbox )
{
- if (g_isIdle) wxapp_install_idle_handler();
-
- if (!listbox->m_hasVMT) return TRUE;
- if (g_blockEventsOnDrag) return TRUE;
-
- if (listbox->m_spacePressed) return FALSE; //see keyevent callback
- if (listbox->m_blockEvent) return TRUE;
-
- // NB: wxdocs explicitly say that this event only gets sent when
- // something is actually selected, plus the controls example
- // assumes so and passes -1 to the dogetclientdata funcs if not
-
- // OK, so basically we need to do a bit of a run-around here as
- // 1) is_selected says whether the item(s?) are CURRENTLY selected -
- // i.e. if is_selected is FALSE then the item is going to be
- // selected right now!
- // 2) However, since it is not already selected and the user
- // will expect it to be we need to manually select it and
- // return FALSE telling GTK we handled the selection
- if (is_selected) return TRUE;
-
- int nIndex = gtk_tree_path_get_indices(path)[0];
- GtkTreeEntry* entry = listbox->GtkGetEntry(nIndex);
-
- if(entry)
+ if ((gdk_event->keyval == GDK_Return) ||
+ (gdk_event->keyval == GDK_ISO_Enter) ||
+ (gdk_event->keyval == GDK_KP_Enter))
{
- //Now, as mentioned above, we manually select the row that is/was going
- //to be selected anyway by GTK
- listbox->m_blockEvent = true; //if we don't block events we will lock the
- //app due to recursion!!
-
- GtkTreeSelection* selection =
- gtk_tree_view_get_selection(listbox->m_treeview);
- GtkTreeIter iter;
- gtk_tree_model_get_iter(GTK_TREE_MODEL(listbox->m_liststore), &iter, path);
- gtk_tree_selection_select_iter(selection, &iter);
-
- listbox->m_blockEvent = false;
-
- //Finally, send the wx event
- wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
- event.SetEventObject( listbox );
+ int index = listbox->GetSelection();
+ if (index != wxNOT_FOUND)
+ {
+ wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
+ event.SetEventObject( listbox );
+
+ GtkTreeEntry* entry = listbox->GtkGetEntry( index );
- // indicate whether this is a selection or a deselection
- event.SetExtraLong( 1 );
+ // indicate that this is a selection
+ event.SetExtraLong( 1 );
- event.SetInt(nIndex);
- event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry)));
+ event.SetInt( index );
+ event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry)));
- if ( listbox->HasClientObjectData() )
- event.SetClientObject(
+ if ( listbox->HasClientObjectData() )
+ event.SetClientObject(
(wxClientData*) gtk_tree_entry_get_userdata(entry)
);
- else if ( listbox->HasClientUntypedData() )
- event.SetClientData( gtk_tree_entry_get_userdata(entry) );
+ else if ( listbox->HasClientUntypedData() )
+ event.SetClientData( gtk_tree_entry_get_userdata(entry) );
- listbox->GetEventHandler()->ProcessEvent( event );
+ bool ret = listbox->HandleWindowEvent( event );
- g_object_unref (entry);
- return FALSE; //We handled it/did it manually
+ g_object_unref (entry);
+
+ 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 TRUE; //allow selection to change
+
+ return FALSE;
}
}
static void gtk_tree_entry_destroy_cb(GtkTreeEntry* entry,
wxListBox* listbox)
{
- if(listbox->HasClientObjectData())
+ if (listbox->HasClientObjectData())
{
gpointer userdata = gtk_tree_entry_get_userdata(entry);
- if(userdata)
+ if (userdata)
delete (wxClientData *)userdata;
}
}
//-----------------------------------------------------------------------------
extern "C" {
-static gint gtk_listbox_sort_callback(GtkTreeModel *model,
+static gint gtk_listbox_sort_callback(GtkTreeModel * WXUNUSED(model),
GtkTreeIter *a,
GtkTreeIter *b,
wxListBox *listbox)
//We compare collate keys here instead of calling g_utf8_collate
//as it is rather slow (and even the docs reccommend this)
- int ret = strcasecmp(gtk_tree_entry_get_collate_key(entry),
- gtk_tree_entry_get_collate_key(entry2));
+ int ret = strcmp(gtk_tree_entry_get_collate_key(entry),
+ gtk_tree_entry_get_collate_key(entry2));
g_object_unref (entry);
g_object_unref (entry2);
//-----------------------------------------------------------------------------
extern "C" {
-static gboolean gtk_listbox_searchequal_callback(GtkTreeModel* model,
- gint column,
+static gboolean gtk_listbox_searchequal_callback(GtkTreeModel * WXUNUSED(model),
+ gint WXUNUSED(column),
const gchar* key,
GtkTreeIter* iter,
wxListBox* listbox)
WXLISTBOX_DATACOLUMN_ARG(listbox),
&entry, -1);
wxCHECK_MSG(entry, 0, wxT("Could not get entry"));
- gchar* keycollatekey = g_utf8_collate_key(key, -1);
+ wxGtkString keycollatekey(g_utf8_collate_key(key, -1));
- int ret = strcasecmp(keycollatekey,
- gtk_tree_entry_get_collate_key(entry));
+ int ret = strcmp(keycollatekey,
+ gtk_tree_entry_get_collate_key(entry));
- g_free(keycollatekey);
g_object_unref (entry);
return ret != 0;
// wxListBox
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
// ----------------------------------------------------------------------------
// construction
#if wxUSE_CHECKLISTBOX
m_hasCheckBoxes = false;
#endif // wxUSE_CHECKLISTBOX
- m_spacePressed = false;
}
bool wxListBox::Create( wxWindow *parent, wxWindowID id,
long style, const wxValidator& validator,
const wxString &name )
{
- m_needParent = true;
- m_acceptsFocus = true;
m_blockEvent = false;
if (!PreCreation( parent, pos, size ) ||
//NB: If enabled SetFirstItem doesn't work correctly
gtk_tree_view_set_headers_visible(m_treeview, FALSE);
-#if wxUSE_CHECKLISTBOX && wxUSE_NATIVEGTKCHECKLIST
+#if wxUSE_CHECKLISTBOX
if(m_hasCheckBoxes)
((wxCheckListBox*)this)->DoCreateCheckList();
-#endif // wxUSE_CHECKLISTBOX && wxUSE_NATIVEGTKCHECKLIST
+#endif // wxUSE_CHECKLISTBOX
// Create the data column
gtk_tree_view_insert_column_with_attributes(m_treeview, -1, "",
WXLISTBOX_DATACOLUMN, NULL);
// Now create+set the model (GtkListStore) - first argument # of columns
-#if wxUSE_CHECKLISTBOX && wxUSE_NATIVEGTKCHECKLIST
+#if wxUSE_CHECKLISTBOX
if(m_hasCheckBoxes)
m_liststore = gtk_list_store_new(2, G_TYPE_BOOLEAN,
GTK_TYPE_TREE_ENTRY);
GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview );
- gtk_tree_selection_set_select_function(selection,
- (GtkTreeSelectionFunc)gtk_listitem_select_cb,
- this, NULL); //NULL == destroycb
+
+ g_signal_connect_after (selection, "changed",
+ G_CALLBACK (gtk_listitem_changed_callback), this);
GtkSelectionMode mode;
if (style & wxLB_MULTIPLE)
gtk_tree_selection_set_mode( selection, mode );
- //Handle sortable stuff
- if(style & wxLB_SORT)
+ // Handle sortable stuff
+ if(HasFlag(wxLB_SORT))
{
- //Setup sorting in ascending (wx) order
+ // Setup sorting in ascending (wx) order
gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(m_liststore),
WXLISTBOX_DATACOLUMN,
GTK_SORT_ASCENDING);
- //Set the sort callback
+ // Set the sort callback
gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(m_liststore),
WXLISTBOX_DATACOLUMN,
(GtkTreeIterCompareFunc) gtk_listbox_sort_callback,
gtk_container_add (GTK_CONTAINER (m_widget), GTK_WIDGET(m_treeview) );
gtk_widget_show( GTK_WIDGET(m_treeview) );
+ m_focusWidget = GTK_WIDGET(m_treeview);
- wxListBox::DoInsertItems(wxArrayString(n, choices), 0); // insert initial items
+ Append(n, choices); // insert initial items
- //treeview-specific events
- g_signal_connect(m_treeview, "row-activated",
+ // generate dclick events
+ g_signal_connect_after(m_treeview, "row-activated",
G_CALLBACK(gtk_listbox_row_activated_callback), this);
- // other events
- g_signal_connect (m_treeview, "button_press_event",
- G_CALLBACK (gtk_listbox_button_press_callback),
- this);
+ // 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 );
PostCreation(size);
- SetBestSize(size); // need this too because this is a wxControlWithItems
+ SetInitialSize(size); // need this too because this is a wxControlWithItems
return true;
}
// adding items
// ----------------------------------------------------------------------------
-void wxListBox::GtkInsertItems(const wxArrayString& items,
- void** clientData, unsigned int pos)
+int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
+ unsigned int pos,
+ void **clientData,
+ wxClientDataType type)
{
- wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
+ wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") );
InvalidateBestSize();
- // Create and set column ids and GValues
-
- unsigned int nNum = items.GetCount();
- unsigned int nCurCount = wxListBox::GetCount();
- wxASSERT_MSG(pos <= nCurCount, wxT("Invalid index passed to wxListBox"));
-
GtkTreeIter* pIter = NULL; // append by default
GtkTreeIter iter;
- if (pos != nCurCount)
+ if ( pos != GetCount() )
{
- gboolean res = gtk_tree_model_iter_nth_child(
- GTK_TREE_MODEL(m_liststore),
- &iter, NULL, //NULL = parent = get first
- (int)pos );
- if(!res)
- {
- wxLogSysError(wxT("internal wxListBox error in insertion"));
- return;
- }
+ wxCHECK_MSG( GtkGetIteratorFor(pos, &iter), wxNOT_FOUND,
+ wxT("internal wxListBox error in insertion") );
pIter = &iter;
}
- for (unsigned int i = 0; i < nNum; ++i)
+ const unsigned int numItems = items.GetCount();
+ for ( unsigned int i = 0; i < numItems; ++i )
{
- wxString label = items[i];
-
-#if wxUSE_CHECKLISTBOX && !wxUSE_NATIVEGTKCHECKLIST
- if (m_hasCheckBoxes)
- {
- label.Prepend(wxCHECKLBOX_STRING);
- }
-#endif // wxUSE_CHECKLISTBOX
-
-
GtkTreeEntry* entry = gtk_tree_entry_new();
- gtk_tree_entry_set_label(entry, wxConvUTF8.cWX2MB(label));
+ gtk_tree_entry_set_label(entry, wxGTK_CONV(items[i]));
gtk_tree_entry_set_destroy_func(entry,
(GtkTreeEntryDestroy)gtk_tree_entry_destroy_cb,
this);
- if (clientData)
- gtk_tree_entry_set_userdata(entry, clientData[i]);
-
GtkTreeIter itercur;
gtk_list_store_insert_before(m_liststore, &itercur, pIter);
-#if wxUSE_CHECKLISTBOX && wxUSE_NATIVEGTKCHECKLIST
- if (m_hasCheckBoxes)
- {
- gtk_list_store_set(m_liststore, &itercur,
- 0, FALSE, //FALSE == not toggled
- 1, entry, -1);
- }
- else
-#endif
- gtk_list_store_set(m_liststore, &itercur,
- 0, entry, -1);
+ GtkSetItem(itercur, entry);
- g_object_unref (entry); //liststore always refs :)
- }
-}
-
-void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
-{
- wxCHECK_RET( IsValidInsert(pos), wxT("invalid index in wxListBox::InsertItems") );
+ g_object_unref (entry);
- GtkInsertItems(items, NULL, pos);
-}
+ if (clientData)
+ AssignNewItemClientData(GtkGetIndexFor(itercur), clientData, i, type);
+ }
-int wxListBox::DoAppend( const wxString& item )
-{
- // Call DoInsertItems
- unsigned int nWhere = wxListBox::GetCount();
- wxArrayString aItems;
- aItems.Add(item);
- wxListBox::DoInsertItems(aItems, nWhere);
- return nWhere;
-}
-
-void wxListBox::DoSetItems( const wxArrayString& items,
- void **clientData)
-{
- Clear();
- GtkInsertItems(items, clientData, 0);
+ return pos + numItems - 1;
}
// ----------------------------------------------------------------------------
// deleting items
// ----------------------------------------------------------------------------
-void wxListBox::Clear()
+void wxListBox::DoClear()
{
wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
gtk_list_store_clear( m_liststore ); /* well, THAT was easy :) */
}
-void wxListBox::Delete(unsigned int n)
+void wxListBox::DoDeleteOneItem(unsigned int n)
{
wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
InvalidateBestSize();
GtkTreeIter iter;
- gboolean res = gtk_tree_model_iter_nth_child(
- GTK_TREE_MODEL(m_liststore),
- &iter, NULL, //NULL = parent = get first
- n
- );
-
- wxCHECK_RET( res, wxT("wrong listbox index") );
+ wxCHECK_RET( GtkGetIteratorFor(n, &iter), wxT("wrong listbox index") );
- //this returns false if iter is invalid (i.e. deleting item
- //at end) but since we don't use iter, well... :)
+ // 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);
}
// ----------------------------------------------------------------------------
-// get GtkTreeEntry from position (note: you need to g_unref it if valid)
+// helper functions for working with iterators
// ----------------------------------------------------------------------------
-struct _GtkTreeEntry* wxListBox::GtkGetEntry(int n) const
+bool wxListBox::GtkGetIteratorFor(unsigned pos, GtkTreeIter *iter) const
{
- GtkTreeIter iter;
- gboolean res = gtk_tree_model_iter_nth_child(
- GTK_TREE_MODEL(m_liststore),
- &iter, NULL, //NULL = parent = get first
- n );
-
- if (!res)
+ if ( !gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(m_liststore),
+ iter, NULL, pos) )
{
- wxLogDebug(wxT("gtk_tree_model_iter_nth_child failed\n")
- wxT("Passed in value was:[%i] List size:[%u]"),
- n, wxListBox::GetCount() );
- return NULL;
+ wxLogDebug(wxT("gtk_tree_model_iter_nth_child(%u) failed"), pos);
+ return false;
}
+ return true;
+}
+
+int wxListBox::GtkGetIndexFor(GtkTreeIter& iter) const
+{
+ GtkTreePath *path =
+ gtk_tree_model_get_path(GTK_TREE_MODEL(m_liststore), &iter);
+
+ gint* pIntPath = gtk_tree_path_get_indices(path);
+
+ wxCHECK_MSG( pIntPath, wxNOT_FOUND, _T("failed to get iterator path") );
+
+ int idx = pIntPath[0];
+
+ gtk_tree_path_free( path );
+
+ return idx;
+}
+
+// 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;
+
GtkTreeEntry* entry = NULL;
gtk_tree_model_get(GTK_TREE_MODEL(m_liststore), &iter,
return entry;
}
+void wxListBox::GtkSetItem(GtkTreeIter& iter, const GtkTreeEntry *entry)
+{
+#if wxUSE_CHECKLISTBOX
+ if ( m_hasCheckBoxes )
+ {
+ 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
// ----------------------------------------------------------------------------
return userdata;
}
-wxClientData* wxListBox::DoGetItemClientObject(unsigned int n) const
-{
- return (wxClientData*) wxListBox::DoGetItemClientData(n);
-}
-
void wxListBox::DoSetItemClientData(unsigned int n, void* clientData)
{
wxCHECK_RET( IsValid(n),
g_object_unref (entry);
}
-void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
-{
- // wxItemContainer already deletes data for us
- wxListBox::DoSetItemClientData(n, (void*) clientData);
-}
-
// ----------------------------------------------------------------------------
// string list access
// ----------------------------------------------------------------------------
-void wxListBox::SetString(unsigned int n, const wxString &string)
+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") );
GtkTreeEntry* entry = GtkGetEntry(n);
wxCHECK_RET( entry, wxT("wrong listbox index") );
- wxString label = string;
-
-#if wxUSE_CHECKLISTBOX && !wxUSE_NATIVEGTKCHECKLIST
- if (m_hasCheckBoxes)
- label.Prepend(wxCHECKLBOX_STRING);
-#endif // wxUSE_CHECKLISTBOX
+ // update the item itself
+ gtk_tree_entry_set_label(entry, wxGTK_CONV(label));
- // RN: This may look wierd but the problem is that the TreeView
- // doesn't resort or update when changed above and there is no real
- // notification function...
- void* userdata = gtk_tree_entry_get_userdata(entry);
- gtk_tree_entry_set_userdata(entry, NULL); //don't delete on destroy
- g_object_unref (entry);
+ // and update the model which will refresh the tree too
+ GtkTreeIter iter;
+ wxCHECK_RET( GtkGetIteratorFor(n, &iter), _T("failed to get iterator") );
- bool bWasSelected = wxListBox::IsSelected(n);
- wxListBox::Delete(n);
+ // FIXME: this resets the checked status of a wxCheckListBox item
- wxArrayString aItems;
- aItems.Add(label);
- GtkInsertItems(aItems, &userdata, n);
- if (bWasSelected)
- wxListBox::GtkSetSelection(n, true, true);
+ GtkSetItem(iter, entry);
}
wxString wxListBox::GetString(unsigned int n) const
wxString label = wxGTK_CONV_BACK( gtk_tree_entry_get_label(entry) );
-#if wxUSE_CHECKLISTBOX && !wxUSE_NATIVEGTKCHECKLIST
- // checklistboxes have "[±] " prepended to their lables, remove it
- //
- // NB: 4 below is the length of wxCHECKLBOX_STRING from wx/gtk/checklst.h
- if ( m_hasCheckBoxes )
- label.erase(0, 4);
-#endif // wxUSE_CHECKLISTBOX
-
g_object_unref (entry);
return label;
}
if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
return wxNOT_FOUND;
- GtkTreePath* path =
- gtk_tree_model_get_path(GTK_TREE_MODEL(m_liststore), &iter);
-
- int sel = gtk_tree_path_get_indices(path)[0];
-
- gtk_tree_path_free(path);
-
- return sel;
+ return GtkGetIndexFor(iter);
}
int wxListBox::GetSelections( wxArrayInt& aSelections ) const
GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
GtkTreeIter iter;
- gboolean res = gtk_tree_model_iter_nth_child(
- GTK_TREE_MODEL(m_liststore),
- &iter, NULL, //NULL = parent = get first
- n );
-
- wxCHECK_MSG( res, false, wxT("Invalid index") );
+ wxCHECK_MSG( GtkGetIteratorFor(n, &iter), false, wxT("Invalid index") );
return gtk_tree_selection_iter_is_selected(selection, &iter);
}
{
// ... and not generate any events in the process
GtkDeselectAll();
+ return;
}
wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetSelection") );
GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
GtkTreeIter iter;
- gboolean res = gtk_tree_model_iter_nth_child(
- GTK_TREE_MODEL(m_liststore),
- &iter, NULL, //NULL = parent = get first
- n
- );
- wxCHECK_RET( res, wxT("Invalid index") );
+ wxCHECK_RET( GtkGetIteratorFor(n, &iter), wxT("Invalid index") );
m_blockEvent = blockEvent;
else
gtk_tree_selection_unselect_iter(selection, &iter);
+ GtkTreePath* path = gtk_tree_model_get_path(
+ GTK_TREE_MODEL(m_liststore), &iter);
+
+ gtk_tree_view_scroll_to_cell(m_treeview, path, NULL, FALSE, 0.0f, 0.0f);
+
+ gtk_tree_path_free(path);
+
m_blockEvent = false;
}
return;
GtkTreeIter iter;
- gtk_tree_model_iter_nth_child(
- GTK_TREE_MODEL(m_liststore),
- &iter,
- NULL, //NULL = parent = get first
- n
- );
+ if ( !GtkGetIteratorFor(n, &iter) )
+ return;
GtkTreePath* path = gtk_tree_model_get_path(
GTK_TREE_MODEL(m_liststore), &iter);
{
// 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().Inside(point) )
+ if ( !GetClientRect().Contains(point) )
return wxNOT_FOUND;
// need to translate from master window since it is in client coords
// ----------------------------------------------------------------------------
#if wxUSE_TOOLTIPS
-void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
+void wxListBox::ApplyToolTip( GtkTooltips *tips, const gchar *tip )
{
// RN: Is this needed anymore?
- gtk_tooltips_set_tip( tips, GTK_WIDGET( m_treeview ), wxGTK_CONV(tip), (gchar*) NULL );
+ gtk_tooltips_set_tip( tips, GTK_WIDGET( m_treeview ), tip, (gchar*) NULL );
}
#endif // wxUSE_TOOLTIPS
return GTK_WIDGET(m_treeview);
}
-bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxListBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
{
- return (window == gtk_tree_view_get_bin_window(m_treeview));
+ return gtk_tree_view_get_bin_window(m_treeview);
}
void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style)
gtk_widget_modify_style( GTK_WIDGET(m_treeview), style );
}
-void wxListBox::OnInternalIdle()
-{
- //RN: Is this needed anymore?
- wxCursor cursor = m_cursor;
- if (g_globalCursor.Ok()) cursor = g_globalCursor;
-
- if (GTK_WIDGET(m_treeview)->window && cursor.Ok())
- {
- /* 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. */
- GdkWindow *window = gtk_tree_view_get_bin_window(m_treeview);
- gdk_window_set_cursor( window, cursor.GetCursor() );
- }
-
- if (wxUpdateUIEvent::CanUpdate(this))
- UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
-}
-
wxSize wxListBox::DoGetBestSize() const
{
wxCHECK_MSG(m_treeview, wxDefaultSize, wxT("invalid tree view"));
// And just a bit more for the checkbox if present and then some
// (these are rough guesses)
-#if wxUSE_CHECKLISTBOX && wxUSE_NATIVEGTKCHECKLIST
+#if wxUSE_CHECKLISTBOX
if ( m_hasCheckBoxes )
{
lbWidth += 35;
projects / wxWidgets.git / blobdiff