X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dcf924a345ea8ffbc1cf6b40b5f75c6005e504c0..bd77da975b1aeeb52c56d2aacb02beec039b5bc3:/src/gtk1/listbox.cpp diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp index 8639e859fb..b465206877 100644 --- a/src/gtk1/listbox.cpp +++ b/src/gtk1/listbox.cpp @@ -72,10 +72,11 @@ extern bool g_isIdle; // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; -extern bool g_blockEventsOnScroll; +extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnScroll; +extern wxCursor g_globalCursor; -static bool g_hasDoubleClicked = FALSE; +static bool g_hasDoubleClicked = FALSE; //----------------------------------------------------------------------------- // "button_release_event" @@ -88,7 +89,9 @@ static bool g_hasDoubleClicked = FALSE; after the GDK_BUTTON_RELEASE event after the GDK_2BUTTON_PRESS event */ static gint -gtk_listbox_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox ) +gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget), + GdkEventButton * WXUNUSED(gdk_event), + wxListBox *listbox ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -127,7 +130,9 @@ gtk_listbox_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_even //----------------------------------------------------------------------------- static gint -gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox ) +gtk_listbox_button_press_callback( GtkWidget *widget, + GdkEventButton *gdk_event, + wxListBox *listbox ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -151,7 +156,7 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, listbox->GetEventHandler()->ProcessEvent( event ); } #endif // wxUSE_CHECKLISTBOX - + /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */ g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS); @@ -193,6 +198,13 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis // "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 ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -244,9 +256,12 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, m_needParent = TRUE; m_acceptsFocus = TRUE; - PreCreation( parent, id, pos, size, style, name ); - - SetValidator( validator ); + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, validator, name )) + { + wxFAIL_MSG( wxT("wxListBox creation failed") ); + return FALSE; + } m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL ); if (style & wxLB_ALWAYS_SB) @@ -276,6 +291,12 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, 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( + GTK_CONTAINER(m_list), + gtk_scrolled_window_get_vadjustment( + GTK_SCROLLED_WINDOW(m_widget))); + gtk_widget_show( GTK_WIDGET(m_list) ); wxSize newSize = size; @@ -307,7 +328,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, if (style & wxLB_MULTIPLE) gtk_signal_connect( GTK_OBJECT(list_item), "deselect", - GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); + GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this ); gtk_signal_connect( GTK_OBJECT(list_item), "button_press_event", @@ -354,11 +375,11 @@ wxListBox::~wxListBox() void wxListBox::InsertItems(int nItems, const wxString items[], int pos) { - wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); + wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); GList *children = m_list->children; int length = g_list_length(children); - wxCHECK_RET( pos <= length, _T("invalid index in wxListBox::InsertItems") ); + 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 @@ -378,7 +399,7 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos) return; } - + wxArrayString deletedLabels; wxArrayPtrVoid deletedData; wxArrayInt deletedChecks; // only for check list boxes @@ -396,7 +417,7 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos) // save data void *clientData = NULL; wxNode *node = NULL; - + if ( n < (int)m_clientObjectList.GetCount() ) node = m_clientObjectList.Nth( n ); @@ -409,7 +430,7 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos) if ( !clientData ) { if ( n < (int)m_clientDataList.GetCount() ) - node = m_clientDataList.Nth( n ); + node = m_clientDataList.Nth( n ); if ( node ) { @@ -456,7 +477,7 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos) void wxListBox::AppendCommon( const wxString &item ) { - wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); + wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); GtkWidget *list_item; @@ -477,7 +498,7 @@ void wxListBox::AppendCommon( const wxString &item ) if (HasFlag(wxLB_MULTIPLE)) gtk_signal_connect( GTK_OBJECT(list_item), "deselect", - GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); + GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this ); gtk_signal_connect( GTK_OBJECT(list_item), "button_press_event", @@ -507,8 +528,15 @@ void wxListBox::AppendCommon( const wxString &item ) { gtk_widget_realize( list_item ); gtk_widget_realize( GTK_BIN(list_item)->child ); - - if (m_widgetStyle) ApplyWidgetStyle(); + + //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 ); + } #if wxUSE_DRAG_AND_DROP #ifndef NEW_GTK_DND_CODE @@ -548,7 +576,7 @@ void wxListBox::Append( const wxString &item, wxClientData *clientData ) void wxListBox::SetClientData( int n, void* clientData ) { - wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); wxNode *node = m_clientDataList.Nth( n ); if (!node) return; @@ -558,7 +586,7 @@ void wxListBox::SetClientData( int n, void* clientData ) void* wxListBox::GetClientData( int n ) { - wxCHECK_MSG( m_widget != NULL, NULL, _T("invalid combobox") ); + wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") ); wxNode *node = m_clientDataList.Nth( n ); if (!node) return NULL; @@ -568,7 +596,7 @@ void* wxListBox::GetClientData( int n ) void wxListBox::SetClientObject( int n, wxClientData* clientData ) { - wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); wxNode *node = m_clientObjectList.Nth( n ); if (!node) return; @@ -581,7 +609,7 @@ void wxListBox::SetClientObject( int n, wxClientData* clientData ) wxClientData* wxListBox::GetClientObject( int n ) { - wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, _T("invalid combobox") ); + wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") ); wxNode *node = m_clientObjectList.Nth( n ); if (!node) return (wxClientData*) NULL; @@ -591,7 +619,7 @@ wxClientData* wxListBox::GetClientObject( int n ) void wxListBox::Clear() { - wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); + wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); gtk_list_clear_items( m_list, 0, Number() ); @@ -609,11 +637,11 @@ void wxListBox::Clear() void wxListBox::Delete( int n ) { - wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); + wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); GList *child = g_list_nth( m_list->children, n ); - wxCHECK_RET( child, _T("wrong listbox index") ); + wxCHECK_RET( child, wxT("wrong listbox index") ); GList *list = g_list_append( (GList*) NULL, child->data ); gtk_list_remove_items( m_list, list ); @@ -636,14 +664,18 @@ void wxListBox::Delete( int n ) void wxListBox::Deselect( int n ) { - wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); + wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); + + DisableEvents(); gtk_list_unselect_item( m_list, n ); + + EnableEvents(); } int wxListBox::FindString( const wxString &item ) const { - wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") ); + wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") ); GList *child = m_list->children; int count = 0; @@ -668,7 +700,7 @@ int wxListBox::FindString( const wxString &item ) const int wxListBox::GetSelection() const { - wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") ); + wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") ); GList *child = m_list->children; int count = 0; @@ -683,7 +715,7 @@ int wxListBox::GetSelection() const int wxListBox::GetSelections( wxArrayInt& aSelections ) const { - wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") ); + wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") ); // get the number of selected items first GList *child = m_list->children; @@ -713,7 +745,7 @@ int wxListBox::GetSelections( wxArrayInt& aSelections ) const wxString wxListBox::GetString( int n ) const { - wxCHECK_MSG( m_list != NULL, _T(""), _T("invalid listbox") ); + wxCHECK_MSG( m_list != NULL, wxT(""), wxT("invalid listbox") ); GList *child = g_list_nth( m_list->children, n ); if (child) @@ -725,15 +757,15 @@ wxString wxListBox::GetString( int n ) const return str; } - - wxFAIL_MSG(_T("wrong listbox index")); - return _T(""); + wxFAIL_MSG(wxT("wrong listbox index")); + + return wxT(""); } wxString wxListBox::GetStringSelection() const { - wxCHECK_MSG( m_list != NULL, _T(""), _T("invalid listbox") ); + wxCHECK_MSG( m_list != NULL, wxT(""), wxT("invalid listbox") ); GList *selection = m_list->selection; if (selection) @@ -746,13 +778,13 @@ wxString wxListBox::GetStringSelection() const return str; } - wxFAIL_MSG(_T("no listbox selection available")); - return _T(""); + wxFAIL_MSG(wxT("no listbox selection available")); + return wxT(""); } int wxListBox::Number() { - wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") ); + wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") ); GList *child = m_list->children; int count = 0; @@ -762,7 +794,7 @@ int wxListBox::Number() bool wxListBox::Selected( int n ) { - wxCHECK_MSG( m_list != NULL, FALSE, _T("invalid listbox") ); + wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid listbox") ); GList *target = g_list_nth( m_list->children, n ); if (target) @@ -774,38 +806,42 @@ bool wxListBox::Selected( int n ) child = child->next; } } - wxFAIL_MSG(_T("wrong listbox index")); + wxFAIL_MSG(wxT("wrong listbox index")); return FALSE; } void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) ) { - wxFAIL_MSG(_T("wxListBox::Set not implemented")); + wxFAIL_MSG(wxT("wxListBox::Set not implemented")); } void wxListBox::SetFirstItem( int WXUNUSED(n) ) { - wxFAIL_MSG(_T("wxListBox::SetFirstItem not implemented")); + wxFAIL_MSG(wxT("wxListBox::SetFirstItem not implemented")); } void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) ) { - wxFAIL_MSG(_T("wxListBox::SetFirstItem not implemented")); + wxFAIL_MSG(wxT("wxListBox::SetFirstItem not implemented")); } void wxListBox::SetSelection( int n, bool select ) { - wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); + wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); + + DisableEvents(); if (select) gtk_list_select_item( m_list, n ); else gtk_list_unselect_item( m_list, n ); + + EnableEvents(); } void wxListBox::SetString( int n, const wxString &string ) { - wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); + wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); GList *child = g_list_nth( m_list->children, n ); if (child) @@ -824,13 +860,13 @@ void wxListBox::SetString( int n, const wxString &string ) } else { - wxFAIL_MSG(_T("wrong listbox index")); + wxFAIL_MSG(wxT("wrong listbox index")); } } void wxListBox::SetStringSelection( const wxString &string, bool select ) { - wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); + wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); SetSelection( FindString(string), select ); } @@ -857,7 +893,7 @@ void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) GList *child = m_list->children; while (child) { - gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), wxConvLocal.cWX2MB(tip), (gchar*) NULL ); + gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), wxConvCurrent->cWX2MB(tip), (gchar*) NULL ); child = child->next; } } @@ -866,7 +902,7 @@ void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) #if wxUSE_DRAG_AND_DROP void wxListBox::SetDropTarget( wxDropTarget *dropTarget ) { - wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); + wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); #ifndef NEW_GTK_DND_CODE if (m_dropTarget) @@ -896,6 +932,38 @@ void wxListBox::SetDropTarget( wxDropTarget *dropTarget ) } #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 ); + + child = child->next; + } +} + +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 ); + + child = child->next; + } +} + GtkWidget *wxListBox::GetConnectWidget() { return GTK_WIDGET(m_list); @@ -944,4 +1012,36 @@ void wxListBox::ApplyWidgetStyle() } } -#endif \ No newline at end of file +void wxListBox::OnInternalIdle() +{ + wxCursor cursor = m_cursor; + if (g_globalCursor.Ok()) cursor = g_globalCursor; + + if (GTK_WIDGET(m_list)->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. */ + + 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() ); + + child = child->next; + } + } + + UpdateWindowUI(); +} + +#endif