X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ef6ff8c4d3ba9fde6f149b3169b2c2824805fe8..87df17a11b0017d31c09f767bd921abb27193bee:/src/gtk1/listbox.cpp diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp index 2ae8ed8efb..56e8db0c7d 100644 --- a/src/gtk1/listbox.cpp +++ b/src/gtk1/listbox.cpp @@ -26,7 +26,7 @@ #include "wx/tooltip.h" #endif -# include +#include #include #include @@ -51,10 +51,8 @@ extern bool g_isIdle; #if wxUSE_CHECKLISTBOX -#define CHECKBOX_STRING "[-] " - // checklistboxes have "[±] " prepended to their lables, this macro removes it -// (NB: 4 below is the length of CHECKBOX_STRING above) +// (NB: 4 below is the length of wxCHECKLBOX_STRING above) // // the argument to it is a "const char *" pointer #define GET_REAL_LABEL(label) ((m_hasCheckBoxes)?(label)+4 : (label)) @@ -75,6 +73,33 @@ extern wxCursor g_globalCursor; static bool g_hasDoubleClicked = FALSE; +//----------------------------------------------------------------------------- +// idle callback for SetFirstItem +//----------------------------------------------------------------------------- + +struct wxlistbox_idle_struct +{ + wxListBox *m_listbox; + int m_item; + gint m_tag; +}; + +static gint wxlistbox_idle_callback( gpointer gdata ) +{ + wxlistbox_idle_struct* data = (wxlistbox_idle_struct*) gdata; + gdk_threads_enter(); + + gtk_idle_remove( data->m_tag ); + + data->m_listbox->SetFirstItem( data->m_item ); + + delete data; + + gdk_threads_leave(); + + return TRUE; +} + //----------------------------------------------------------------------------- // "button_release_event" //----------------------------------------------------------------------------- @@ -189,6 +214,12 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis 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)) { @@ -218,14 +249,19 @@ 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_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_callback( widget, listbox ); + gtk_listitem_select_cb( widget, listbox, FALSE ); } -static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox ) +static void gtk_listitem_select_cb( GtkWidget *WXUNUSED(widget), wxListBox *listbox, bool is_selection ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -234,6 +270,7 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); event.SetEventObject( listbox ); + event.SetExtraLong( (long) is_selection ); wxArrayInt aSelections; int n, count = listbox->GetSelections(aSelections); @@ -305,11 +342,21 @@ 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_BROWSE; + } gtk_list_set_selection_mode( GTK_LIST(m_list), mode ); @@ -360,7 +407,10 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, wxListBox::~wxListBox() { + m_hasVMT = FALSE; + Clear(); + if (m_strings) delete m_strings; } @@ -384,24 +434,47 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos) wxCHECK_RET( pos <= length, wxT("invalid index in wxListBox::InsertItems") ); size_t nItems = items.GetCount(); + int index; - if (pos == length) + if (m_strings) { - for ( size_t n = 0; n < nItems; n++ ) + for (size_t n = 0; n < nItems; n++) { - GtkAddItem( items[n] ); - - m_clientList.Append((wxObject *)NULL); + index = m_strings->Add( items[n] ); + + if (index != GetCount()) + { + GtkAddItem( items[n], index ); + wxNode *node = m_clientList.Nth( 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 ( size_t n = 0; n < nItems; n++ ) + { + GtkAddItem( items[n] ); - m_clientList.Insert( node, (wxObject *)NULL ); + m_clientList.Append((wxObject *)NULL); + } + } + else + { + wxNode *node = m_clientList.Nth( pos ); + for ( size_t n = 0; n < nItems; n++ ) + { + GtkAddItem( items[n], pos+n ); + + m_clientList.Insert( node, (wxObject *)NULL ); + } } } @@ -445,7 +518,7 @@ 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 @@ -639,7 +712,7 @@ 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; @@ -784,12 +857,12 @@ void wxListBox::DoSetFirstItem( int n ) if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (m_list)) return; - - // terribly efficient + + // terribly efficient const gchar *vadjustment_key = "gtk-vadjustment"; guint vadjustment_key_id = g_quark_from_static_string (vadjustment_key); - - GtkAdjustment *adjustment = + + GtkAdjustment *adjustment = (GtkAdjustment*) gtk_object_get_data_by_id (GTK_OBJECT (m_list), vadjustment_key_id); wxCHECK_RET( adjustment, wxT("invalid listbox code") ); @@ -799,23 +872,20 @@ void wxListBox::DoSetFirstItem( int n ) GtkWidget *item = GTK_WIDGET(target->data); wxCHECK_RET( item, wxT("invalid listbox code") ); - // find the last item before this one which is already realized - size_t nItemsBefore; - for ( nItemsBefore = 0; item && (item->allocation.y == -1); nItemsBefore++ ) + if (item->allocation.y == -1) { - target = target->prev; - if ( !target ) - { - // nothing we can do if there are no allocated items yet - return; - } - - item = GTK_WIDGET(target->data); + 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; } - gtk_adjustment_set_value(adjustment, - item->allocation.y + - nItemsBefore*item->allocation.height); + float y = item->allocation.y; + if (y > adjustment->upper - adjustment->page_size) + y = adjustment->upper - adjustment->page_size; + gtk_adjustment_set_value( adjustment, y ); } // ----------------------------------------------------------------------------