X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/687706f5e722ac8a39172024f794ae0ffbd190e2..553f7d8f5608f18b99864cc36d46452d2e1ff05b:/src/gtk/listbox.cpp diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index 70203eb2db..efa0d15491 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: listbox.cpp +// Name: src/gtk/listbox.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,11 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "listbox.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -26,14 +21,19 @@ #include "wx/intl.h" #include "wx/checklst.h" #include "wx/settings.h" + +// FIXME: Use GtkTreeView/GtkListModel instead? +#include +#ifdef GTK_DISABLE_DEPRECATED +#undef GTK_DISABLE_DEPRECATED +#endif + #include "wx/gtk/private.h" #if wxUSE_TOOLTIPS #include "wx/tooltip.h" #endif -#include -#include #include //----------------------------------------------------------------------------- @@ -67,12 +67,13 @@ struct wxlistbox_idle_struct gint m_tag; }; -extern "C" gint wxlistbox_idle_callback( gpointer gdata ) +extern "C" { +static gint wxlistbox_idle_callback( gpointer gdata ) { wxlistbox_idle_struct* data = (wxlistbox_idle_struct*) gdata; gdk_threads_enter(); - gtk_idle_remove( data->m_tag ); + g_source_remove( data->m_tag ); // check that the items haven't been deleted from the listbox since we had // installed this callback @@ -88,11 +89,13 @@ extern "C" gint wxlistbox_idle_callback( gpointer gdata ) return TRUE; } +} //----------------------------------------------------------------------------- // "focus_in_event" //----------------------------------------------------------------------------- +extern "C" { static gint gtk_listitem_focus_in_callback( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxWindow *win ) @@ -108,7 +111,7 @@ static gint gtk_listitem_focus_in_callback( GtkWidget *widget, { // not yet, notify it win->m_hasFocus = TRUE; - + wxChildFocusEvent eventChildFocus(win); (void)win->GetEventHandler()->ProcessEvent(eventChildFocus); @@ -120,11 +123,13 @@ static gint gtk_listitem_focus_in_callback( GtkWidget *widget, return FALSE; } +} //----------------------------------------------------------------------------- // "focus_out_event" //----------------------------------------------------------------------------- +extern "C" { static gint gtk_listitem_focus_out_callback( GtkWidget *widget, GdkEventFocus *gdk_event, wxWindowGTK *win ) { if (g_isIdle) @@ -150,6 +155,7 @@ static gint gtk_listitem_focus_out_callback( GtkWidget *widget, GdkEventFocus *g return FALSE; } +} //----------------------------------------------------------------------------- // "button_release_event" @@ -161,6 +167,7 @@ static gint gtk_listitem_focus_out_callback( GtkWidget *widget, GdkEventFocus *g 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), @@ -200,11 +207,13 @@ gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget), return FALSE; } +} //----------------------------------------------------------------------------- // "button_press_event" //----------------------------------------------------------------------------- +extern "C" { static gint gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, @@ -233,16 +242,34 @@ 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 ) { @@ -288,21 +315,21 @@ 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) && + 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; @@ -324,32 +351,21 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis listbox->GetEventHandler()->ProcessEvent( new_event ); } } - + if (ret) { - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); + g_signal_stop_emission_by_name (widget, "key_press_event"); return TRUE; } return FALSE; } +} //----------------------------------------------------------------------------- // "select" and "deselect" //----------------------------------------------------------------------------- -static void gtk_listitem_select_cb( GtkWidget *widget, wxListBox *listbox, bool is_selection ); - -static void gtk_listitem_select_callback( GtkWidget *widget, wxListBox *listbox ) -{ - gtk_listitem_select_cb( widget, listbox, TRUE ); -} - -static void gtk_listitem_deselect_callback( GtkWidget *widget, wxListBox *listbox ) -{ - gtk_listitem_select_cb( widget, listbox, FALSE ); -} - static void gtk_listitem_select_cb( GtkWidget *widget, wxListBox *listbox, bool is_selection ) @@ -400,6 +416,39 @@ static void gtk_listitem_select_cb( GtkWidget *widget, 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) ); + + return false; +} +} + //----------------------------------------------------------------------------- // wxListBox //----------------------------------------------------------------------------- @@ -475,7 +524,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, { // if style was 0 set single mode m_windowStyle |= wxLB_SINGLE; - mode = GTK_SELECTION_MULTIPLE; + mode = GTK_SELECTION_SINGLE; } gtk_list_set_selection_mode( GTK_LIST(m_list), mode ); @@ -490,6 +539,9 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, gtk_widget_show( GTK_WIDGET(m_list) ); + g_signal_connect (m_list, "realize", + G_CALLBACK (gtk_listbox_realized_callback), this); + if ( style & wxLB_SORT ) { // this will change DoAppend() behaviour @@ -649,42 +701,37 @@ void wxListBox::GtkAddItem( const wxString &item, int pos ) else gtk_list_insert_items( GTK_LIST (m_list), gitem_list, pos ); - gtk_signal_connect_after( GTK_OBJECT(list_item), "select", - GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); + g_signal_connect_after (list_item, "select", + G_CALLBACK (gtk_listitem_select_callback), + this); 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), - "button_press_event", - (GtkSignalFunc)gtk_listbox_button_press_callback, - (gpointer) this ); - - gtk_signal_connect_after( GTK_OBJECT(list_item), - "button_release_event", - (GtkSignalFunc)gtk_listbox_button_release_callback, - (gpointer) this ); - - gtk_signal_connect( GTK_OBJECT(list_item), - "key_press_event", - (GtkSignalFunc)gtk_listbox_key_press_callback, - (gpointer)this ); - - - 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 ); - + g_signal_connect_after (list_item, "deselect", + G_CALLBACK (gtk_listitem_deselect_callback), + this); + + g_signal_connect (list_item, "button_press_event", + G_CALLBACK (gtk_listbox_button_press_callback), + this); + g_signal_connect_after (list_item, "button_release_event", + G_CALLBACK (gtk_listbox_button_release_callback), + this); + g_signal_connect (list_item, "key_press_event", + G_CALLBACK (gtk_listbox_key_press_callback), + this); + g_signal_connect (list_item, "focus_in_event", + G_CALLBACK (gtk_listitem_focus_in_callback), + this); + g_signal_connect (list_item, "focus_out_event", + G_CALLBACK (gtk_listitem_focus_out_callback), + this); ConnectWidget( list_item ); - gtk_widget_show( 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 ); @@ -699,8 +746,7 @@ void wxListBox::GtkAddItem( const wxString &item, int pos ) { gtk_widget_modify_style( GTK_WIDGET( list_item ), style ); GtkBin *bin = GTK_BIN( list_item ); - GtkWidget *label = GTK_WIDGET( bin->child ); - gtk_widget_modify_style( label, style ); + gtk_widget_modify_style( GTK_WIDGET( bin->child ), style ); gtk_rc_style_unref( style ); } } @@ -842,11 +888,7 @@ wxString wxListBox::GetRealLabel(GList *item) const wxString str; -#ifdef __WXGTK20__ str = wxGTK_CONV_BACK( gtk_label_get_text( label ) ); -#else - str = wxString( label->label ); -#endif #if wxUSE_CHECKLISTBOX // checklistboxes have "[±] " prepended to their lables, remove it @@ -876,7 +918,7 @@ void wxListBox::SetString( int n, const wxString &string ) #endif // wxUSE_CHECKLISTBOX str += string; - gtk_label_set( label, wxGTK_CONV( str ) ); + gtk_label_set_text( label, wxGTK_CONV( str ) ); } else { @@ -886,7 +928,7 @@ void wxListBox::SetString( int n, const wxString &string ) wxString wxListBox::GetString( 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) @@ -896,7 +938,7 @@ wxString wxListBox::GetString( int n ) const wxFAIL_MSG(wxT("wrong listbox index")); - return wxT(""); + return wxEmptyString; } int wxListBox::GetCount() const @@ -907,15 +949,15 @@ int wxListBox::GetCount() const 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) { - if ( GetRealLabel(child) == item ) + if ( item.IsSameAs( GetRealLabel(child), bCase ) ) return count; count++; @@ -987,7 +1029,7 @@ bool wxListBox::IsSelected( int n ) const 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") ); @@ -1032,7 +1074,7 @@ void wxListBox::DoSetFirstItem( int n ) 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 ); + data->m_tag = g_idle_add_full( 800, wxlistbox_idle_callback, data, NULL ); return; } @@ -1085,7 +1127,7 @@ bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) { return TRUE; -#if 0 +#if 0 if (m_widget->window == window) return TRUE; if (GTK_WIDGET(m_list)->window == window) return TRUE; @@ -1196,7 +1238,7 @@ wxSize wxListBox::DoGetBestSize() const lbHeight = (cy+4) * wxMin(wxMax(GetCount(), 3), 10); wxSize best(lbWidth, lbHeight); - CacheBestSize(best); + CacheBestSize(best); return best; } @@ -1217,4 +1259,3 @@ wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) } #endif // wxUSE_LISTBOX -