X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/071a2d78147df569d57b1ef138ab126a586b594d..11dbb4bfab8f7441e87b34cd094ac6e69438b50a:/src/gtk1/listbox.cpp diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp index 54d5f9edfd..ab51f39ea5 100644 --- a/src/gtk1/listbox.cpp +++ b/src/gtk1/listbox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: listbox.cpp +// Name: src/gtk1/listbox.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,28 +7,31 @@ // 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/utils.h" +#endif -#include "wx/dynarray.h" -#include "wx/utils.h" -#include "wx/intl.h" +#include "wx/arrstr.h" #include "wx/checklst.h" #include "wx/settings.h" +#include "wx/gtk1/private.h" #if wxUSE_TOOLTIPS -#include "wx/tooltip.h" + #include "wx/tooltip.h" #endif -#include "gdk/gdk.h" -#include "gtk/gtk.h" -#include "gdk/gdkkeysyms.h" +#include +#include +#include //----------------------------------------------------------------------------- // idle system @@ -37,43 +40,119 @@ extern void wxapp_install_idle_handler(); extern bool g_isIdle; -//------------------------------------------------------------------------- -// conditional compilation -//------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +// data +//----------------------------------------------------------------------------- + +extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnScroll; +extern wxCursor g_globalCursor; +extern wxWindowGTK *g_delayedFocus; +extern wxWindowGTK *g_focusWindow; +extern wxWindowGTK *g_focusWindowLast; -#if (GTK_MINOR_VERSION > 0) - #define NEW_GTK_SCROLL_CODE -#endif +static bool g_hasDoubleClicked = false; //----------------------------------------------------------------------------- -// private functions +// idle callback for SetFirstItem //----------------------------------------------------------------------------- -#if wxUSE_CHECKLISTBOX +struct wxlistbox_idle_struct +{ + wxListBox *m_listbox; + int m_item; + gint m_tag; +}; -#define CHECKBOX_STRING "[-] " +extern "C" { +static gint wxlistbox_idle_callback( gpointer gdata ) +{ + wxlistbox_idle_struct* data = (wxlistbox_idle_struct*) gdata; + gdk_threads_enter(); -// 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)) + gtk_idle_remove( data->m_tag ); -#else // !wxUSE_CHECKLISTBOX + // check that the items haven't been deleted from the listbox since we had + // installed this callback + wxListBox *lbox = data->m_listbox; + if ( data->m_item < (int)lbox->GetCount() ) + { + lbox->SetFirstItem( data->m_item ); + } -#define GET_REAL_LABEL(label) (label) + delete data; -#endif // wxUSE_CHECKLISTBOX + gdk_threads_leave(); + + return TRUE; +} +} //----------------------------------------------------------------------------- -// data +// "focus_in_event" //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; -extern bool g_blockEventsOnScroll; -extern wxCursor g_globalCursor; +extern "C" { +static gint gtk_listitem_focus_in_callback( GtkWidget *widget, + GdkEvent *WXUNUSED(event), + wxWindow *win ) +{ + if (g_isIdle) + wxapp_install_idle_handler(); + + g_focusWindowLast = + g_focusWindow = win; + + // does the window itself think that it has the focus? + if ( !win->m_hasFocus ) + { + // not yet, notify it + win->m_hasFocus = true; -static bool g_hasDoubleClicked = FALSE; + wxChildFocusEvent eventChildFocus(win); + (void)win->GetEventHandler()->ProcessEvent(eventChildFocus); + + wxFocusEvent eventFocus(wxEVT_SET_FOCUS, win->GetId()); + eventFocus.SetEventObject(win); + + (void)win->GetEventHandler()->ProcessEvent(eventFocus); + } + + return FALSE; +} +} + +//----------------------------------------------------------------------------- +// "focus_out_event" +//----------------------------------------------------------------------------- + +extern "C" { +static gint gtk_listitem_focus_out_callback( GtkWidget *widget, GdkEventFocus *gdk_event, wxWindowGTK *win ) +{ + if (g_isIdle) + wxapp_install_idle_handler(); + + g_focusWindow = (wxWindowGTK *)NULL; + + // don't send the window a kill focus event if it thinks that it doesn't + // have focus already + if ( win->m_hasFocus ) + { + win->m_hasFocus = false; + + wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() ); + event.SetEventObject( win ); + + // even if we did process the event in wx code, still let GTK itself + // process it too as otherwise bad things happen, especially in GTK2 + // where the text control simply aborts the program if it doesn't get + // the matching focus out event + (void)win->GetEventHandler()->ProcessEvent( event ); + } + + return FALSE; +} +} //----------------------------------------------------------------------------- // "button_release_event" @@ -85,6 +164,7 @@ static bool g_hasDoubleClicked = FALSE; 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 */ +extern "C" { static gint gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget), GdkEventButton * WXUNUSED(gdk_event), @@ -118,17 +198,19 @@ gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget), n = -1; } - event.m_commandInt = n; + event.SetInt(n); listbox->GetEventHandler()->ProcessEvent( event ); return FALSE; } +} //----------------------------------------------------------------------------- // "button_press_event" //----------------------------------------------------------------------------- +extern "C" { static gint gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, @@ -157,26 +239,44 @@ gtk_listbox_button_press_callback( GtkWidget *widget, } #endif // wxUSE_CHECKLISTBOX + if ((gdk_event->state == 0) && + (((listbox->GetWindowStyleFlag() & wxLB_MULTIPLE) != 0) || + ((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) ) + { + listbox->m_blockEvent = true; + + int i; + for (i = 0; i < (int)listbox->GetCount(); i++) + if (i != sel) + gtk_list_unselect_item( GTK_LIST(listbox->m_list), i ); + + listbox->m_blockEvent = false; + + return false; + } + /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */ g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS); return FALSE; } +} //----------------------------------------------------------------------------- // "key_press_event" //----------------------------------------------------------------------------- +extern "C" { static gint gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox ) { - if (g_isIdle) + if (g_isIdle) wxapp_install_idle_handler(); - if (g_blockEventsOnDrag) + if (g_blockEventsOnDrag) return FALSE; - bool ret = FALSE; + bool ret = false; if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) { @@ -188,9 +288,15 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis 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 ((gdk_event->keyval != ' ') && (listbox->m_hasCheckBoxes) && (!ret)) + if ((gdk_event->keyval == ' ') && (listbox->m_hasCheckBoxes) && (!ret)) { int sel = listbox->GtkGetIndex( widget ); @@ -205,6 +311,44 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis } #endif // wxUSE_CHECKLISTBOX + // Check or uncheck item with SPACE + if ((gdk_event->keyval == ' ') && (!ret) && + (((listbox->GetWindowStyleFlag() & wxLB_MULTIPLE) != 0) || + ((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) ) + { + int sel = listbox->GtkGetIndex( widget ); + + if (sel != -1) + { + ret = true; + + if (listbox->IsSelected( sel )) + gtk_list_unselect_item( listbox->m_list, sel ); + else + gtk_list_select_item( listbox->m_list, sel ); + + wxCommandEvent new_event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); + new_event.SetEventObject( listbox ); + wxArrayInt aSelections; + int n, count = listbox->GetSelections(aSelections); + if ( count > 0 ) + { + n = aSelections[0]; + if ( listbox->HasClientObjectData() ) + new_event.SetClientObject( listbox->GetClientObject(n) ); + else if ( listbox->HasClientUntypedData() ) + new_event.SetClientData( listbox->GetClientData(n) ); + new_event.SetString( listbox->GetString(n) ); + } + else + { + n = -1; + } + new_event.SetInt(n); + listbox->GetEventHandler()->ProcessEvent( new_event ); + } + } + if (ret) { gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); @@ -213,28 +357,39 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis return FALSE; } +} //----------------------------------------------------------------------------- // "select" and "deselect" //----------------------------------------------------------------------------- -static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox ); - -static void gtk_listitem_deselect_callback( GtkWidget *widget, wxListBox *listbox ) -{ - gtk_listitem_select_callback( widget, listbox ); -} - -static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox ) +static void gtk_listitem_select_cb( GtkWidget *widget, + wxListBox *listbox, + bool is_selection ) { if (g_isIdle) wxapp_install_idle_handler(); if (!listbox->m_hasVMT) return; if (g_blockEventsOnDrag) return; + if (listbox->m_blockEvent) return; + wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); event.SetEventObject( listbox ); + // indicate whether this is a selection or a deselection + event.SetExtraLong( is_selection ); + + if ((listbox->GetWindowStyleFlag() & wxLB_SINGLE) != 0) + { + int sel = listbox->GtkGetIndex( widget ); + + if (listbox->m_prevSelection != sel) + gtk_list_unselect_item( listbox->m_list, listbox->m_prevSelection ); + + listbox->m_prevSelection = sel; + } + wxArrayInt aSelections; int n, count = listbox->GetSelections(aSelections); if ( count > 0 ) @@ -251,10 +406,44 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox n = -1; } - event.m_commandInt = n; + event.SetInt(n); + +// No longer required with new code in wxLB_SINGLE +// listbox->GetEventHandler()->AddPendingEvent( event ); + listbox->GetEventHandler()->ProcessEvent( event ); +} + +extern "C" { +static void gtk_listitem_select_callback( GtkWidget *widget, wxListBox *listbox ) +{ + gtk_listitem_select_cb( widget, listbox, TRUE ); +} +} + +extern "C" { +static void gtk_listitem_deselect_callback( GtkWidget *widget, wxListBox *listbox ) +{ + gtk_listitem_select_cb( widget, listbox, FALSE ); +} +} + +//----------------------------------------------------------------------------- +// wxListBox +//----------------------------------------------------------------------------- + +extern "C" { +static gint +gtk_listbox_realized_callback( GtkWidget *m_widget, wxListBox *win ) +{ + if (g_isIdle) + wxapp_install_idle_handler(); + + GList *child = win->m_list->children; + for (child = win->m_list->children; child != NULL; child = child->next) + gtk_widget_show( GTK_WIDGET(child->data) ); - listbox->GetEventHandler()->AddPendingEvent( event ); -// listbox->GetEventHandler()->ProcessEvent( event ); + return false; +} } //----------------------------------------------------------------------------- @@ -271,24 +460,38 @@ wxListBox::wxListBox() { m_list = (GtkList *) 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_needParent = true; + m_acceptsFocus = true; + m_prevSelection = 0; // or -1 ?? + 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 ); @@ -305,19 +508,25 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, m_list = GTK_LIST( gtk_list_new() ); - GtkSelectionMode mode = GTK_SELECTION_BROWSE; + 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; + } gtk_list_set_selection_mode( GTK_LIST(m_list), mode ); -#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 /* make list scroll when moving the focus down using cursor keys */ gtk_container_set_focus_vadjustment( @@ -327,7 +536,8 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, gtk_widget_show( GTK_WIDGET(m_list) ); - SetSizeOrDefault( size ); + gtk_signal_connect( GTK_OBJECT(m_list), "realize", + GTK_SIGNAL_FUNC(gtk_listbox_realized_callback), (gpointer) this ); if ( style & wxLB_SORT ) { @@ -347,23 +557,27 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, m_parent->DoAddChild( this ); - PostCreation(); - - SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) ); - SetForegroundColour( parent->GetForegroundColour() ); - SetFont( parent->GetFont() ); + PostCreation(size); + SetBestSize(size); // need this too because this is a wxControlWithItems - Show( TRUE ); - - return TRUE; + return true; } wxListBox::~wxListBox() { + m_hasVMT = false; + Clear(); + + if (m_strings) + delete m_strings; } -void wxListBox::DoInsertItems(const wxArrayString& items, int pos) +// ---------------------------------------------------------------------------- +// adding items +// ---------------------------------------------------------------------------- + +void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos) { wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); @@ -373,59 +587,86 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos) // code elsewhere supposes we have as many items in m_clientList as items // in the listbox - wxASSERT_MSG( m_clientList.GetCount() == (size_t)GetCount(), + wxASSERT_MSG( m_clientList.GetCount() == GetCount(), wxT("bug in client data management") ); + InvalidateBestSize(); + GList *children = m_list->children; - int length = g_list_length(children); - + unsigned int length = g_list_length(children); + wxCHECK_RET( pos <= length, wxT("invalid index in wxListBox::InsertItems") ); - size_t nItems = items.GetCount(); + unsigned int nItems = items.GetCount(); + int index; - if (pos == length) + if (m_strings) { - for ( size_t n = 0; n < nItems; n++ ) + for (unsigned int n = 0; n < nItems; n++) { - GtkAddItem( items[n] ); - - m_clientList.Append((wxObject *)NULL); + index = m_strings->Add( items[n] ); + + if (index != (int)GetCount()) + { + GtkAddItem( items[n], index ); + wxList::compatibility_iterator node = m_clientList.Item( index ); + m_clientList.Insert( node, (wxObject*) NULL ); + } + else + { + GtkAddItem( items[n] ); + m_clientList.Append( (wxObject*) NULL ); + } } } else { - wxNode *node = m_clientList.Nth( pos ); - for ( size_t n = 0; n < nItems; n++ ) + if (pos == length) { - GtkAddItem( items[n], pos+n ); + for ( unsigned int n = 0; n < nItems; n++ ) + { + GtkAddItem( items[n] ); - m_clientList.Insert( node, (wxObject *)NULL ); + m_clientList.Append((wxObject *)NULL); + } + } + else + { + wxList::compatibility_iterator node = m_clientList.Item( pos ); + for ( unsigned int n = 0; n < nItems; n++ ) + { + GtkAddItem( items[n], pos+n ); + + m_clientList.Insert( node, (wxObject *)NULL ); + } } } - wxASSERT_MSG( m_clientList.GetCount() == (size_t)GetCount(), + wxASSERT_MSG( m_clientList.GetCount() == GetCount(), wxT("bug in client data management") ); } int wxListBox::DoAppend( const wxString& item ) { + InvalidateBestSize(); + if (m_strings) { // 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 != (int)GetCount()) + { + GtkAddItem( item, index ); + + wxList::compatibility_iterator node = m_clientList.Item( index ); m_clientList.Insert( node, (wxObject *)NULL ); - - return index; - } + + return index; + } } - + GtkAddItem(item); m_clientList.Append((wxObject *)NULL); @@ -443,25 +684,25 @@ void wxListBox::GtkAddItem( const wxString &item, int pos ) #if wxUSE_CHECKLISTBOX if (m_hasCheckBoxes) { - label.Prepend(CHECKBOX_STRING); + label.Prepend(wxCHECKLBOX_STRING); } #endif // wxUSE_CHECKLISTBOX - list_item = gtk_list_item_new_with_label( label.mbc_str() ); + list_item = gtk_list_item_new_with_label( wxGTK_CONV( label ) ); 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 gtk_list_insert_items( GTK_LIST (m_list), gitem_list, pos ); - gtk_signal_connect( GTK_OBJECT(list_item), "select", + gtk_signal_connect_after( GTK_OBJECT(list_item), "select", GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); - if (HasFlag(wxLB_MULTIPLE)) - gtk_signal_connect( GTK_OBJECT(list_item), "deselect", + if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED)) + gtk_signal_connect_after( GTK_OBJECT(list_item), "deselect", GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this ); gtk_signal_connect( GTK_OBJECT(list_item), @@ -479,28 +720,36 @@ void wxListBox::GtkAddItem( const wxString &item, int pos ) (GtkSignalFunc)gtk_listbox_key_press_callback, (gpointer)this ); - ConnectWidget( list_item ); - gtk_widget_show( list_item ); + gtk_signal_connect( GTK_OBJECT(list_item), "focus_in_event", + GTK_SIGNAL_FUNC(gtk_listitem_focus_in_callback), (gpointer)this ); + + gtk_signal_connect( GTK_OBJECT(list_item), "focus_out_event", + GTK_SIGNAL_FUNC(gtk_listitem_focus_out_callback), (gpointer)this ); + + ConnectWidget( list_item ); if (GTK_WIDGET_REALIZED(m_widget)) { + gtk_widget_show( list_item ); + 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) - { - 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 ); - } - #if wxUSE_TOOLTIPS if (m_tooltip) m_tooltip->Apply( this ); #endif } + + // Apply current widget style to the new list_item + GtkRcStyle *style = CreateWidgetStyle(); + if (style) + { + gtk_widget_modify_style( GTK_WIDGET( list_item ), style ); + GtkBin *bin = GTK_BIN( list_item ); + gtk_widget_modify_style( GTK_WIDGET( bin->child ), style ); + gtk_rc_style_unref( style ); + } } void wxListBox::DoSetItems( const wxArrayString& items, @@ -512,8 +761,8 @@ void wxListBox::DoSetItems( const wxArrayString& items, if ( clientData ) { - size_t count = items.GetCount(); - for ( size_t n = 0; n < count; n++ ) + unsigned int count = items.GetCount(); + for ( unsigned int n = 0; n < count; n++ ) { SetClientData(n, clientData[n]); } @@ -521,69 +770,31 @@ void wxListBox::DoSetItems( const wxArrayString& items, } // ---------------------------------------------------------------------------- -// client data +// deleting items // ---------------------------------------------------------------------------- -void wxListBox::DoSetItemClientData( int n, void* clientData ) -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") ); - - wxNode *node = m_clientList.Nth( n ); - wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientData") ); - - node->SetData( (wxObject*) clientData ); -} - -void* wxListBox::DoGetItemClientData( int n ) const -{ - wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid listbox control") ); - - wxNode *node = m_clientList.Nth( n ); - wxCHECK_MSG( node, NULL, wxT("invalid index in wxListBox::DoGetItemClientData") ); - - return node->Data(); -} - -void wxListBox::DoSetItemClientObject( int n, wxClientData* clientData ) -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") ); - - wxNode *node = m_clientList.Nth( n ); - wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientObject") ); - - wxClientData *cd = (wxClientData*) node->Data(); - delete cd; - - node->SetData( (wxObject*) clientData ); -} - -wxClientData* wxListBox::DoGetItemClientObject( int n ) const -{ - wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid listbox control") ); - - wxNode *node = m_clientList.Nth( n ); - wxCHECK_MSG( node, (wxClientData *)NULL, - wxT("invalid index in wxListBox::DoGetItemClientObject") ); - - return (wxClientData*) node->Data(); -} - void wxListBox::Clear() { wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); - gtk_list_clear_items( m_list, 0, Number() ); + gtk_list_clear_items( m_list, 0, (int)GetCount() ); + + if ( GTK_LIST(m_list)->last_focus_child != NULL ) + { + // This should be NULL, I think. + GTK_LIST(m_list)->last_focus_child = NULL; + } if ( HasClientObjectData() ) { // destroy the data (due to Robert's idea of using wxList // and not wxList we can't just say - // m_clientList.DeleteContents(TRUE) - this would crash! - wxNode *node = m_clientList.First(); + // m_clientList.DeleteContents(true) - this would crash! + wxList::compatibility_iterator node = m_clientList.GetFirst(); while ( node ) { - delete (wxClientData *)node->Data(); - node = node->Next(); + delete (wxClientData *)node->GetData(); + node = node->GetNext(); } } m_clientList.Clear(); @@ -592,7 +803,7 @@ void wxListBox::Clear() m_strings->Clear(); } -void wxListBox::Delete( int n ) +void wxListBox::Delete(unsigned int n) { wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); @@ -604,27 +815,94 @@ void wxListBox::Delete( int n ) gtk_list_remove_items( m_list, list ); g_list_free( list ); - wxNode *node = m_clientList.Nth( n ); + wxList::compatibility_iterator node = m_clientList.Item( n ); if ( node ) { - if ( m_clientDataItemsType == ClientData_Object ) + if ( m_clientDataItemsType == wxClientData_Object ) { - wxClientData *cd = (wxClientData*)node->Data(); + wxClientData *cd = (wxClientData*)node->GetData(); delete cd; } - m_clientList.DeleteNode( node ); + m_clientList.Erase( node ); } if ( m_strings ) - m_strings->Remove(n); + m_strings->RemoveAt(n); +} + +// ---------------------------------------------------------------------------- +// client data +// ---------------------------------------------------------------------------- + +void wxListBox::DoSetItemClientData(unsigned int n, void* clientData) +{ + wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") ); + + wxList::compatibility_iterator node = m_clientList.Item( n ); + wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientData") ); + + node->SetData( (wxObject*) clientData ); +} + +void* wxListBox::DoGetItemClientData(unsigned int n) const +{ + wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid listbox control") ); + + wxList::compatibility_iterator node = m_clientList.Item( n ); + wxCHECK_MSG( node, NULL, wxT("invalid index in wxListBox::DoGetItemClientData") ); + + return node->GetData(); +} + +void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData) +{ + wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") ); + + wxList::compatibility_iterator node = m_clientList.Item( n ); + wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientObject") ); + + // wxItemContainer already deletes data for us + + node->SetData( (wxObject*) clientData ); +} + +wxClientData* wxListBox::DoGetItemClientObject(unsigned int n) const +{ + wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid listbox control") ); + + wxList::compatibility_iterator node = m_clientList.Item( n ); + wxCHECK_MSG( node, (wxClientData *)NULL, + wxT("invalid index in wxListBox::DoGetItemClientObject") ); + + return (wxClientData*) node->GetData(); } // ---------------------------------------------------------------------------- // string list access // ---------------------------------------------------------------------------- -void wxListBox::SetString( int n, const wxString &string ) +wxString wxListBox::GetRealLabel(GList *item) const +{ + GtkBin *bin = GTK_BIN( item->data ); + GtkLabel *label = GTK_LABEL( bin->child ); + + wxString str; + + str = wxString( label->label ); + +#if wxUSE_CHECKLISTBOX + // checklistboxes have "[±] " prepended to their lables, remove it + // + // NB: 4 below is the length of wxCHECKLBOX_STRING from wx/gtk1/checklst.h + if ( m_hasCheckBoxes ) + str.erase(0, 4); +#endif // wxUSE_CHECKLISTBOX + + return str; +} + +void wxListBox::SetString(unsigned int n, const wxString &string) { wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); @@ -637,11 +915,11 @@ void wxListBox::SetString( int n, const wxString &string ) wxString str; #if wxUSE_CHECKLISTBOX if (m_hasCheckBoxes) - str += CHECKBOX_STRING; + str += wxCHECKLBOX_STRING; #endif // wxUSE_CHECKLISTBOX str += string; - gtk_label_set( label, str.mbc_str() ); + gtk_label_set( label, wxGTK_CONV( str ) ); } else { @@ -649,48 +927,38 @@ void wxListBox::SetString( int n, const wxString &string ) } } -wxString wxListBox::GetString( int n ) const +wxString wxListBox::GetString(unsigned int n) const { - wxCHECK_MSG( m_list != NULL, wxT(""), wxT("invalid listbox") ); + wxCHECK_MSG( m_list != NULL, wxEmptyString, 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 ); - - wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent); - - return str; + return GetRealLabel(child); } wxFAIL_MSG(wxT("wrong listbox index")); - return wxT(""); + return wxEmptyString; } -int wxListBox::GetCount() const +unsigned int wxListBox::GetCount() const { - wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") ); + wxCHECK_MSG( m_list != NULL, 0, wxT("invalid listbox") ); GList *children = m_list->children; return g_list_length(children); } -int wxListBox::FindString( const wxString &item ) const +int wxListBox::FindString( const wxString &item, bool bCase ) const { - wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") ); + wxCHECK_MSG( m_list != NULL, wxNOT_FOUND, wxT("invalid listbox") ); GList *child = m_list->children; int count = 0; while (child) { - GtkBin *bin = GTK_BIN( child->data ); - GtkLabel *label = GTK_LABEL( bin->child ); - - wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent); - - if (str == item) + if ( item.IsSameAs( GetRealLabel(child), bCase ) ) return count; count++; @@ -753,41 +1021,69 @@ int wxListBox::GetSelections( wxArrayInt& aSelections ) const bool wxListBox::IsSelected( int n ) const { - wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid listbox") ); + 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::DoSetSelection( int n, bool select ) { wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); - GtkDisableEvents(); + m_blockEvent = true; if (select) + { + if ((m_windowStyle & wxLB_SINGLE) != 0) + gtk_list_unselect_item( m_list, m_prevSelection ); gtk_list_select_item( m_list, n ); + m_prevSelection = n; + } else gtk_list_unselect_item( m_list, n ); - GtkEnableEvents(); + m_blockEvent = false; } -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 ); } // ---------------------------------------------------------------------------- @@ -822,63 +1118,36 @@ void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) } #endif // wxUSE_TOOLTIPS -void wxListBox::GtkDisableEvents() -{ - 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 ); - - child = child->next; - } -} - -void wxListBox::GtkEnableEvents() -{ - 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 ); - - child = child->next; - } -} - GtkWidget *wxListBox::GetConnectWidget() { - return GTK_WIDGET(m_list); + // return GTK_WIDGET(m_list); + return m_widget; } bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) { - if (GTK_WIDGET(m_list)->window == window) return TRUE; + return true; + +#if 0 + if (m_widget->window == window) return true; + + if (GTK_WIDGET(m_list)->window == window) return true; GList *child = m_list->children; while (child) { GtkWidget *bin = GTK_WIDGET( child->data ); - if (bin->window == window) return TRUE; + if (bin->window == window) return true; child = child->next; } - return FALSE; + return false; +#endif } -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 ) @@ -892,11 +1161,11 @@ void wxListBox::ApplyWidgetStyle() GList *child = m_list->children; while (child) { - gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle ); + gtk_widget_modify_style( GTK_WIDGET(child->data), style ); GtkBin *bin = GTK_BIN( child->data ); GtkWidget *label = GTK_WIDGET( bin->child ); - gtk_widget_set_style( label, m_widgetStyle ); + gtk_widget_modify_style( label, style ); child = child->next; } @@ -913,7 +1182,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. */ - + gdk_window_set_cursor( GTK_WIDGET(m_list)->window, cursor.GetCursor() ); GList *child = m_list->children; @@ -921,7 +1190,7 @@ void wxListBox::OnInternalIdle() { GtkBin *bin = GTK_BIN( child->data ); GtkWidget *label = GTK_WIDGET( bin->child ); - + if (!label->window) break; else @@ -931,12 +1200,63 @@ void wxListBox::OnInternalIdle() } } - UpdateWindowUI(); + if (g_delayedFocus == this) + { + if (GTK_WIDGET_REALIZED(m_widget)) + { + gtk_widget_grab_focus( m_widget ); + g_delayedFocus = NULL; + } + } + + if (wxUpdateUIEvent::CanUpdate(this)) + UpdateWindowUI(wxUPDATE_UI_FROMIDLE); } wxSize wxListBox::DoGetBestSize() const { - return wxSize(100, 110); + int lbWidth = 100; // some defaults + int lbHeight = 110; + int wLine; + + // Find the widest line + for(unsigned int i = 0; i < GetCount(); i++) { + wxString str(GetString(i)); + GetTextExtent(str, &wLine, NULL); + lbWidth = wxMax(lbWidth, wLine); + } + + // Add room for the scrollbar + lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); + + // And just a bit more + int cx, cy; + GetTextExtent( wxT("X"), &cx, &cy); + lbWidth += 3 * cx; + + // 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(GetCount(), 3), 10); + + wxSize best(lbWidth, lbHeight); + CacheBestSize(best); + return best; } -#endif +void wxListBox::FixUpMouseEvent(GtkWidget *widget, wxCoord& x, wxCoord& y) +{ + // the mouse event coords are relative to the listbox items, we need to + // translate them to the normal client coords + x += widget->allocation.x; + y += widget->allocation.y; +} + + +// static +wxVisualAttributes +wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_list_new, true); +} + +#endif // wxUSE_LISTBOX