X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a7ac4461ab64212a536a8dabffc2ad65ef573a5f..13393ab6233f67b0afe3e02bc6bc3229b8104f43:/src/gtk1/listbox.cpp diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp index 9650f43753..138fc38d96 100644 --- a/src/gtk1/listbox.cpp +++ b/src/gtk1/listbox.cpp @@ -33,11 +33,21 @@ // conditional compilation //------------------------------------------------------------------------- -#if (GTK_MINOR_VERSION == 1) -#if (GTK_MICRO_VERSION >= 5) +#if (GTK_MINOR_VERSION > 0) #define NEW_GTK_SCROLL_CODE #endif -#endif + +//----------------------------------------------------------------------------- +// private functions +//----------------------------------------------------------------------------- + +#define CHECKBOX_STRING "[-] " + +// 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)) //----------------------------------------------------------------------------- // data @@ -84,17 +94,16 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, event.m_commandInt = aSelections[0] ; event.m_clientData = listbox->GetClientData( event.m_commandInt ); wxString str(listbox->GetString(event.m_commandInt)); - if (str != "") event.m_commandString = copystring((char *)(const char *)str); + if (!str.IsEmpty()) event.m_commandString = str; } else { event.m_commandInt = -1 ; - event.m_commandString = copystring("") ; + event.m_commandString.Empty(); } listbox->GetEventHandler()->ProcessEvent( event ); - if (event.m_commandString) delete[] event.m_commandString ; } return FALSE; @@ -145,18 +154,17 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox event.m_commandInt = aSelections[0] ; event.m_clientData = listbox->GetClientData( event.m_commandInt ); wxString str(listbox->GetString(event.m_commandInt)); - if (str != "") event.m_commandString = copystring((char *)(const char *)str); + if (!str.IsEmpty()) event.m_commandString = str; } else { event.m_commandInt = -1 ; - event.m_commandString = copystring("") ; + event.m_commandString.Empty(); } event.SetEventObject( listbox ); listbox->GetEventHandler()->ProcessEvent( event ); - if (event.m_commandString) delete[] event.m_commandString ; } //----------------------------------------------------------------------------- @@ -184,8 +192,16 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, SetValidator( validator ); m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL ); - gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC ); + if (style & wxLB_ALWAYS_SB) + { + gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget), + GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS ); + } + else + { + gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC ); + } m_list = GTK_LIST( gtk_list_new() ); @@ -203,25 +219,6 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_list) ); #endif -#ifdef __WXDEBUG__ - debug_focus_in( m_widget, "wxListBox::m_widget", name ); - - debug_focus_in( GTK_WIDGET(m_list), "wxListBox::m_list", name ); - - GtkScrolledWindow *s_window = GTK_SCROLLED_WINDOW(m_widget); - - debug_focus_in( s_window->hscrollbar, "wxWindow::hsrcollbar", name ); - debug_focus_in( s_window->vscrollbar, "wxWindow::vsrcollbar", name ); - -#ifdef NEW_GTK_SCROLL_CODE - GtkViewport *viewport = GTK_VIEWPORT(s_window->child); -#else - GtkViewport *viewport = GTK_VIEWPORT(s_window->viewport); -#endif - - debug_focus_in( GTK_WIDGET(viewport), "wxWindow::viewport", name ); -#endif - gtk_widget_show( GTK_WIDGET(m_list) ); wxSize newSize = size; @@ -236,20 +233,13 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, GtkWidget *list_item; + wxString str(choices[i]); if (m_hasCheckBoxes) { - wxString str = "[-] "; - str += choices[i]; - list_item = gtk_list_item_new_with_label( str ); - } - else - { - list_item = gtk_list_item_new_with_label( choices[i] ); + str.Prepend(CHECKBOX_STRING); } -#ifdef __WXDEBUG__ - debug_focus_in( list_item, "wxListBox::list_item", name ); -#endif + list_item = gtk_list_item_new_with_label( str.mbc_str() ); gtk_container_add( GTK_CONTAINER(m_list), list_item ); @@ -284,8 +274,6 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, PostCreation(); - gtk_widget_realize( GTK_WIDGET(m_list) ); - SetBackgroundColour( parent->GetBackgroundColour() ); SetForegroundColour( parent->GetForegroundColour() ); SetFont( parent->GetFont() ); @@ -300,23 +288,118 @@ wxListBox::~wxListBox() Clear(); } +void wxListBox::InsertItems(int nItems, const wxString items[], int pos) +{ + wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); + + GList *children = m_list->children; + int length = g_list_length(children); + wxCHECK_RET( pos <= length, _T("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 + // all items after this position, then append these items and then + // reappend back the old ones. + + // first detach the old items + int n; // loop var + + if ( pos == length ) + { + // no need to do anything complicated + for ( n = 0; n < nItems; n++ ) + { + Append(items[n]); + } + + return; + } + + wxArrayString deletedLabels; + wxArrayPtrVoid deletedData; + wxArrayInt deletedChecks; // only for check list boxes + + GList *child = g_list_nth( children, pos ); + for ( n = 0; child != NULL; n++, child = child->next ) + { + // save label + GtkBin *bin = GTK_BIN( child->data ); + GtkLabel *label = GTK_LABEL( bin->child ); + + wxString str(GET_REAL_LABEL(label->label)); + deletedLabels.Add(str); + + // save data + void *clientData = NULL; + wxNode *node = NULL; + + if ( n < (int)m_clientObjectList.GetCount() ) + node = m_clientObjectList.Nth( n ); + + if ( node ) + { + clientData = node->GetData(); + m_clientObjectList.DeleteNode( node ); + } + + if ( !clientData ) + { + if ( n < (int)m_clientDataList.GetCount() ) + node = m_clientDataList.Nth( n ); + + if ( node ) + { + clientData = node->GetData(); + node = m_clientDataList.Nth( n ); + } + } + + deletedData.Add(clientData); + + // save check state + if ( m_hasCheckBoxes ) + { + deletedChecks.Add(((wxCheckListBox *)this)->IsChecked(pos + n)); + } + } + + int nDeletedCount = n; + + gtk_list_clear_items( m_list, pos, length ); + + // now append the new items + for ( n = 0; n < nItems; n++ ) + { + Append(items[n]); + } + + // and append the old items too + pos += nItems; // now the indices are shifter + for ( n = 0; n < nDeletedCount; n++ ) + { + Append(deletedLabels[n], deletedData[n]); + + if ( m_hasCheckBoxes ) + { + ((wxCheckListBox *)this)->Check(pos + n, (bool)deletedChecks[n]); + } + } +} + void wxListBox::AppendCommon( const wxString &item ) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); GtkWidget *list_item; + wxString label(item); if (m_hasCheckBoxes) { - wxString str = "[-] "; - str += item; - list_item = gtk_list_item_new_with_label( str ); - } - else - { - list_item = gtk_list_item_new_with_label( item ); + label.Prepend(CHECKBOX_STRING); } + list_item = gtk_list_item_new_with_label( label.mbc_str() ); + gtk_container_add( GTK_CONTAINER(m_list), list_item ); gtk_signal_connect( GTK_OBJECT(list_item), "select", @@ -326,8 +409,6 @@ void wxListBox::AppendCommon( const wxString &item ) gtk_signal_connect( GTK_OBJECT(list_item), "deselect", GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); - if (m_widgetStyle) ApplyWidgetStyle(); - gtk_signal_connect( GTK_OBJECT(list_item), "button_press_event", (GtkSignalFunc)gtk_listbox_button_press_callback, @@ -336,24 +417,32 @@ void wxListBox::AppendCommon( const wxString &item ) if (m_hasCheckBoxes) { gtk_signal_connect( GTK_OBJECT(list_item), - "key_press_event", - (GtkSignalFunc)gtk_listbox_key_press_callback, - (gpointer)this ); + "key_press_event", + (GtkSignalFunc)gtk_listbox_key_press_callback, + (gpointer)this ); } gtk_widget_show( list_item ); ConnectWidget( list_item ); + if (GTK_WIDGET_REALIZED(m_widget)) + { + gtk_widget_realize( list_item ); + gtk_widget_realize( GTK_BIN(list_item)->child ); + + if (m_widgetStyle) ApplyWidgetStyle(); + #if wxUSE_DRAG_AND_DROP #ifndef NEW_GTK_DND_CODE - if (m_dropTarget) m_dropTarget->RegisterWidget( list_item ); + if (m_dropTarget) m_dropTarget->RegisterWidget( list_item ); #endif #endif #if wxUSE_TOOLTIPS - if (m_toolTip) m_toolTip->Apply( this ); + if (m_toolTip) m_toolTip->Apply( this ); #endif + } } void wxListBox::Append( const wxString &item ) @@ -382,7 +471,7 @@ void wxListBox::Append( const wxString &item, wxClientData *clientData ) void wxListBox::SetClientData( int n, void* clientData ) { - wxCHECK_RET( m_widget != NULL, "invalid combobox" ); + wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); wxNode *node = m_clientDataList.Nth( n ); if (!node) return; @@ -392,7 +481,7 @@ void wxListBox::SetClientData( int n, void* clientData ) void* wxListBox::GetClientData( int n ) { - wxCHECK_MSG( m_widget != NULL, NULL, "invalid combobox" ); + wxCHECK_MSG( m_widget != NULL, NULL, _T("invalid combobox") ); wxNode *node = m_clientDataList.Nth( n ); if (!node) return NULL; @@ -402,7 +491,7 @@ void* wxListBox::GetClientData( int n ) void wxListBox::SetClientObject( int n, wxClientData* clientData ) { - wxCHECK_RET( m_widget != NULL, "invalid combobox" ); + wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); wxNode *node = m_clientObjectList.Nth( n ); if (!node) return; @@ -415,7 +504,7 @@ void wxListBox::SetClientObject( int n, wxClientData* clientData ) wxClientData* wxListBox::GetClientObject( int n ) { - wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, "invalid combobox" ); + wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, _T("invalid combobox") ); wxNode *node = m_clientObjectList.Nth( n ); if (!node) return (wxClientData*) NULL; @@ -425,7 +514,7 @@ wxClientData* wxListBox::GetClientObject( int n ) void wxListBox::Clear() { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); gtk_list_clear_items( m_list, 0, Number() ); @@ -443,11 +532,11 @@ void wxListBox::Clear() void wxListBox::Delete( int n ) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); GList *child = g_list_nth( m_list->children, n ); - wxCHECK_RET( child, "wrong listbox index" ); + wxCHECK_RET( child, _T("wrong listbox index") ); GList *list = g_list_append( (GList*) NULL, child->data ); gtk_list_remove_items( m_list, list ); @@ -470,14 +559,14 @@ void wxListBox::Delete( int n ) void wxListBox::Deselect( int n ) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); gtk_list_unselect_item( m_list, n ); } int wxListBox::FindString( const wxString &item ) const { - wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); + wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") ); GList *child = m_list->children; int count = 0; @@ -486,10 +575,10 @@ int wxListBox::FindString( const wxString &item ) const GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - wxString str = label->label; - if (m_hasCheckBoxes) str.Remove( 0, 4 ); + wxString str = GET_REAL_LABEL(label->label); - if (str == item) return count; + if (str == item) + return count; count++; child = child->next; @@ -502,7 +591,7 @@ int wxListBox::FindString( const wxString &item ) const int wxListBox::GetSelection() const { - wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); + wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") ); GList *child = m_list->children; int count = 0; @@ -517,7 +606,7 @@ int wxListBox::GetSelection() const int wxListBox::GetSelections( wxArrayInt& aSelections ) const { - wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); + wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") ); // get the number of selected items first GList *child = m_list->children; @@ -547,7 +636,7 @@ int wxListBox::GetSelections( wxArrayInt& aSelections ) const wxString wxListBox::GetString( int n ) const { - wxCHECK_MSG( m_list != NULL, "", "invalid listbox" ); + wxCHECK_MSG( m_list != NULL, _T(""), _T("invalid listbox") ); GList *child = g_list_nth( m_list->children, n ); if (child) @@ -555,18 +644,19 @@ wxString wxListBox::GetString( int n ) const GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - wxString str = label->label; - if (m_hasCheckBoxes) str.Remove( 0, 4 ); + wxString str = GET_REAL_LABEL(label->label); return str; } - wxFAIL_MSG("wrong listbox index"); - return ""; + + wxFAIL_MSG(_T("wrong listbox index")); + + return _T(""); } wxString wxListBox::GetStringSelection() const { - wxCHECK_MSG( m_list != NULL, "", "invalid listbox" ); + wxCHECK_MSG( m_list != NULL, _T(""), _T("invalid listbox") ); GList *selection = m_list->selection; if (selection) @@ -574,19 +664,18 @@ wxString wxListBox::GetStringSelection() const GtkBin *bin = GTK_BIN( selection->data ); GtkLabel *label = GTK_LABEL( bin->child ); - wxString str = label->label; - if (m_hasCheckBoxes) str.Remove( 0, 4 ); + wxString str = GET_REAL_LABEL(label->label); return str; } - wxFAIL_MSG("no listbox selection available"); - return ""; + wxFAIL_MSG(_T("no listbox selection available")); + return _T(""); } int wxListBox::Number() { - wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); + wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") ); GList *child = m_list->children; int count = 0; @@ -596,7 +685,7 @@ int wxListBox::Number() bool wxListBox::Selected( int n ) { - wxCHECK_MSG( m_list != NULL, FALSE, "invalid listbox" ); + wxCHECK_MSG( m_list != NULL, FALSE, _T("invalid listbox") ); GList *target = g_list_nth( m_list->children, n ); if (target) @@ -608,28 +697,28 @@ bool wxListBox::Selected( int n ) child = child->next; } } - wxFAIL_MSG("wrong listbox index"); + wxFAIL_MSG(_T("wrong listbox index")); return FALSE; } void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) ) { - wxFAIL_MSG("wxListBox::Set not implemented"); + wxFAIL_MSG(_T("wxListBox::Set not implemented")); } void wxListBox::SetFirstItem( int WXUNUSED(n) ) { - wxFAIL_MSG("wxListBox::SetFirstItem not implemented"); + wxFAIL_MSG(_T("wxListBox::SetFirstItem not implemented")); } void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) ) { - wxFAIL_MSG("wxListBox::SetFirstItem not implemented"); + wxFAIL_MSG(_T("wxListBox::SetFirstItem not implemented")); } void wxListBox::SetSelection( int n, bool select ) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); if (select) gtk_list_select_item( m_list, n ); @@ -639,7 +728,7 @@ void wxListBox::SetSelection( int n, bool select ) void wxListBox::SetString( int n, const wxString &string ) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); GList *child = g_list_nth( m_list->children, n ); if (child) @@ -648,20 +737,21 @@ void wxListBox::SetString( int n, const wxString &string ) GtkLabel *label = GTK_LABEL( bin->child ); wxString str; - if (m_hasCheckBoxes) str += "[-] "; + if (m_hasCheckBoxes) + str += CHECKBOX_STRING; str += string; - gtk_label_set( label, str ); + gtk_label_set( label, str.mbc_str() ); } else { - wxFAIL_MSG("wrong listbox index"); + wxFAIL_MSG(_T("wrong listbox index")); } } void wxListBox::SetStringSelection( const wxString &string, bool select ) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); SetSelection( FindString(string), select ); } @@ -683,12 +773,12 @@ int wxListBox::GetIndex( GtkWidget *item ) const } #if wxUSE_TOOLTIPS -void wxListBox::ApplyToolTip( GtkTooltips *tips, const char *tip ) +void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) { GList *child = m_list->children; while (child) { - gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), tip, (gchar*) NULL ); + gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), wxConv_local.cWX2MB(tip), (gchar*) NULL ); child = child->next; } } @@ -697,7 +787,7 @@ void wxListBox::ApplyToolTip( GtkTooltips *tips, const char *tip ) #if wxUSE_DRAG_AND_DROP void wxListBox::SetDropTarget( wxDropTarget *dropTarget ) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); #ifndef NEW_GTK_DND_CODE if (m_dropTarget) @@ -771,4 +861,3 @@ void wxListBox::ApplyWidgetStyle() child = child->next; } } -