X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbe0af5b15f8b8e95ed45abc2140fb3a1fac3c87..2b2edbedb47a54bea26df1bede371bf761e3a233:/src/gtk/listbox.cpp diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index fb6ef44edc..4c496c67a0 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -12,11 +12,19 @@ #pragma implementation "listbox.h" #endif -#include "wx/dynarray.h" #include "wx/listbox.h" + +#if wxUSE_LISTBOX + +#include "wx/dynarray.h" #include "wx/utils.h" #include "wx/intl.h" #include "wx/checklst.h" +#include "wx/settings.h" + +#if wxUSE_TOOLTIPS +#include "wx/tooltip.h" +#endif #if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" @@ -25,16 +33,41 @@ #include "gdk/gdk.h" #include "gtk/gtk.h" +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; + //------------------------------------------------------------------------- // conditional compilation //------------------------------------------------------------------------- -#if (GTK_MINOR_VERSION == 1) -#if (GTK_MICRO_VERSION >= 5) -#define NEW_GTK_SCROLL_CODE -#endif +#if (GTK_MINOR_VERSION > 0) + #define NEW_GTK_SCROLL_CODE #endif +//----------------------------------------------------------------------------- +// private functions +//----------------------------------------------------------------------------- + +#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) +// +// the argument to it is a "const char *" pointer +#define GET_REAL_LABEL(label) ((m_hasCheckBoxes)?(label)+4 : (label)) + +#else // !wxUSE_CHECKLISTBOX + +#define GET_REAL_LABEL(label) (label) + +#endif // wxUSE_CHECKLISTBOX + //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -42,39 +75,85 @@ extern bool g_blockEventsOnDrag; extern bool g_blockEventsOnScroll; +static bool g_hasDoubleClicked = FALSE; + +//----------------------------------------------------------------------------- +// "button_release_event" +//----------------------------------------------------------------------------- + +/* we would normally emit a wxEVT_COMMAND_LISTBOX_DOUBLECLICKED event once + a GDK_2BUTTON_PRESS occurs, but this has the particular problem of the + listbox keeping the focus until it receives a GDK_BUTTON_RELEASE event. + 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 */ + +static gint +gtk_listbox_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox ) +{ + if (g_isIdle) wxapp_install_idle_handler(); + + if (g_blockEventsOnDrag) return FALSE; + if (g_blockEventsOnScroll) return FALSE; + + if (!listbox->m_hasVMT) return FALSE; + + if (!g_hasDoubleClicked) return FALSE; + + wxCommandEvent event( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() ); + event.SetEventObject( listbox ); + + wxArrayInt aSelections; + int count = listbox->GetSelections(aSelections); + if ( count > 0 ) + { + event.m_commandInt = aSelections[0] ; + event.m_clientData = listbox->GetClientData( event.m_commandInt ); + wxString str(listbox->GetString(event.m_commandInt)); + if (!str.IsEmpty()) event.m_commandString = str; + } + else + { + event.m_commandInt = -1 ; + event.m_commandString.Empty(); + } + + listbox->GetEventHandler()->ProcessEvent( event ); + + return FALSE; +} + //----------------------------------------------------------------------------- // "button_press_event" //----------------------------------------------------------------------------- -static gint +static gint gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox ) { + if (g_isIdle) wxapp_install_idle_handler(); + if (g_blockEventsOnDrag) return FALSE; if (g_blockEventsOnScroll) return FALSE; - if (!listbox->HasVMT()) return FALSE; + if (!listbox->m_hasVMT) return FALSE; int sel = listbox->GetIndex( widget ); - + +#if wxUSE_CHECKLISTBOX if ((listbox->m_hasCheckBoxes) && (gdk_event->x < 15) && (gdk_event->type != GDK_2BUTTON_PRESS)) { wxCheckListBox *clb = (wxCheckListBox *)listbox; - + clb->Check( sel, !clb->IsChecked(sel) ); - + wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() ); event.SetEventObject( listbox ); event.SetInt( sel ); listbox->GetEventHandler()->ProcessEvent( event ); } +#endif // wxUSE_CHECKLISTBOX - if (gdk_event->type == GDK_2BUTTON_PRESS) - { - wxCommandEvent event( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() ); - event.SetEventObject( listbox ); - event.SetInt( sel ); - listbox->GetEventHandler()->ProcessEvent( event ); - } + /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */ + g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS); return FALSE; } @@ -83,28 +162,32 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, // "key_press_event" //----------------------------------------------------------------------------- -static gint +#if wxUSE_CHECKLISTBOX +static gint gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox ) { + if (g_isIdle) wxapp_install_idle_handler(); + if (g_blockEventsOnDrag) return FALSE; - if (!listbox->HasVMT()) return FALSE; + if (!listbox->m_hasVMT) return FALSE; if (gdk_event->keyval != ' ') return FALSE; - + int sel = listbox->GetIndex( widget ); - + wxCheckListBox *clb = (wxCheckListBox *)listbox; - + clb->Check( sel, !clb->IsChecked(sel) ); - + wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() ); event.SetEventObject( listbox ); event.SetInt( sel ); listbox->GetEventHandler()->ProcessEvent( event ); - + return FALSE; } +#endif // wxUSE_CHECKLISTBOX //----------------------------------------------------------------------------- // "select" and "deselect" @@ -112,7 +195,9 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox ) { - if (!listbox->HasVMT()) return; + if (g_isIdle) wxapp_install_idle_handler(); + + if (!listbox->m_hasVMT) return; if (g_blockEventsOnDrag) return; wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); @@ -124,18 +209,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 ; } //----------------------------------------------------------------------------- @@ -147,7 +231,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl) wxListBox::wxListBox() { m_list = (GtkList *) NULL; +#if wxUSE_CHECKLISTBOX m_hasCheckBoxes = FALSE; +#endif // wxUSE_CHECKLISTBOX } bool wxListBox::Create( wxWindow *parent, wxWindowID id, @@ -160,12 +246,22 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, PreCreation( parent, id, pos, size, style, name ); +#if wxUSE_VALIDATORS SetValidator( validator ); +#endif 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() ); GtkSelectionMode mode = GTK_SELECTION_BROWSE; @@ -182,25 +278,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; @@ -212,24 +289,19 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, { m_clientDataList.Append( (wxObject*) NULL ); m_clientObjectList.Append( (wxObject*) NULL ); - + GtkWidget *list_item; - - 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] ); - } - -#ifdef __WXDEBUG__ - debug_focus_in( list_item, "wxListBox::list_item", name ); -#endif - + + wxString str(choices[i]); +#if wxUSE_CHECKLISTBOX + if (m_hasCheckBoxes) + { + str.Prepend(CHECKBOX_STRING); + } +#endif // wxUSE_CHECKLISTBOX + + list_item = gtk_list_item_new_with_label( str.mbc_str() ); + gtk_container_add( GTK_CONTAINER(m_list), list_item ); gtk_signal_connect( GTK_OBJECT(list_item), "select", @@ -239,34 +311,38 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, gtk_signal_connect( GTK_OBJECT(list_item), "deselect", GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); - if (m_hasCheckBoxes) - { - gtk_signal_connect( GTK_OBJECT(list_item), - "button_press_event", - (GtkSignalFunc)gtk_listbox_button_press_callback, - (gpointer) this ); - } - - gtk_signal_connect( GTK_OBJECT(list_item), - "key_press_event", - (GtkSignalFunc)gtk_listbox_key_press_callback, - (gpointer)this ); - - ConnectWidget( list_item ); - + 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 ); + +#if wxUSE_CHECKLISTBOX + if (m_hasCheckBoxes) + { + gtk_signal_connect( GTK_OBJECT(list_item), + "key_press_event", + (GtkSignalFunc)gtk_listbox_key_press_callback, + (gpointer)this ); + } +#endif // wxUSE_CHECKLISTBOX + + ConnectWidget( list_item ); + gtk_widget_show( list_item ); } - m_parent->AddChild( this ); + m_parent->DoAddChild( this ); - (m_parent->m_insertCallback)( m_parent, this ); - PostCreation(); - gtk_widget_realize( GTK_WIDGET(m_list) ); - - SetBackgroundColour( parent->GetBackgroundColour() ); + SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) ); SetForegroundColour( parent->GetForegroundColour() ); + SetFont( parent->GetFont() ); Show( TRUE ); @@ -278,63 +354,181 @@ wxListBox::~wxListBox() Clear(); } -void wxListBox::AppendCommon( const wxString &item ) +void wxListBox::InsertItems(int nItems, const wxString items[], int pos) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); - - GtkWidget *list_item; + 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; + } - if (m_hasCheckBoxes) + 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),*wxConvCurrent); + 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); + +#if wxUSE_CHECKLISTBOX + // save check state + if ( m_hasCheckBoxes ) + { + deletedChecks.Add(((wxCheckListBox *)this)->IsChecked(pos + n)); + } +#endif // wxUSE_CHECKLISTBOX + } + + int nDeletedCount = n; + + gtk_list_clear_items( m_list, pos, length ); + + // now append the new items + for ( n = 0; n < nItems; n++ ) { - wxString str = "[-] "; - str += item; - list_item = gtk_list_item_new_with_label( str ); + Append(items[n]); } - else + + // 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 wxUSE_CHECKLISTBOX + if ( m_hasCheckBoxes ) + { + ((wxCheckListBox *)this)->Check(pos + n, (bool)deletedChecks[n]); + } +#endif // wxUSE_CHECKLISTBOX + } +} + +void wxListBox::AppendCommon( const wxString &item ) +{ + wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); + + GtkWidget *list_item; + + wxString label(item); +#if wxUSE_CHECKLISTBOX + if (m_hasCheckBoxes) { - list_item = gtk_list_item_new_with_label( item ); + label.Prepend(CHECKBOX_STRING); } +#endif // wxUSE_CHECKLISTBOX + + 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", GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); - if (GetWindowStyleFlag() & wxLB_MULTIPLE) + if (HasFlag(wxLB_MULTIPLE)) gtk_signal_connect( GTK_OBJECT(list_item), "deselect", GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); - gtk_container_add( GTK_CONTAINER(m_list), list_item ); + 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 ); - if (m_widgetStyle) ApplyWidgetStyle(); - +#if wxUSE_CHECKLISTBOX if (m_hasCheckBoxes) { - gtk_signal_connect( GTK_OBJECT(list_item), - "button_press_event", - (GtkSignalFunc)gtk_listbox_button_press_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), - "key_press_event", - (GtkSignalFunc)gtk_listbox_key_press_callback, - (gpointer)this ); - +#endif // wxUSE_CHECKLISTBOX + 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 ); #endif + } } void wxListBox::Append( const wxString &item ) { m_clientDataList.Append( (wxObject*) NULL ); m_clientObjectList.Append( (wxObject*) NULL ); - + AppendCommon( item ); } @@ -342,7 +536,7 @@ void wxListBox::Append( const wxString &item, void *clientData ) { m_clientDataList.Append( (wxObject*) clientData ); m_clientObjectList.Append( (wxObject*) NULL ); - + AppendCommon( item ); } @@ -350,56 +544,56 @@ void wxListBox::Append( const wxString &item, wxClientData *clientData ) { m_clientObjectList.Append( (wxObject*) clientData ); m_clientDataList.Append( (wxObject*) NULL ); - + AppendCommon( item ); } 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; - + node->SetData( (wxObject*) 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; - + return node->Data(); } 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; - + wxClientData *cd = (wxClientData*) node->Data(); if (cd) delete cd; - + node->SetData( (wxObject*) 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; - + return (wxClientData*) node->Data(); } 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() ); @@ -411,17 +605,17 @@ void wxListBox::Clear() node = node->Next(); } m_clientObjectList.Clear(); - + m_clientDataList.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 ); @@ -434,7 +628,7 @@ void wxListBox::Delete( int n ) if (cd) delete cd; m_clientObjectList.DeleteNode( node ); } - + node = m_clientDataList.Nth( n ); if (node) { @@ -444,27 +638,27 @@ 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; while (child) { GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - - wxString str = label->label; - if (m_hasCheckBoxes) str.Remove( 0, 4 ); - - if (str == item) return count; - + + wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent); + + if (str == item) + return count; + count++; child = child->next; } @@ -476,8 +670,8 @@ 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; while (child) @@ -491,8 +685,8 @@ 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; int count = 0; @@ -504,7 +698,7 @@ int wxListBox::GetSelections( wxArrayInt& aSelections ) const aSelections.Empty(); - if (count > 0) + if (count > 0) { // now fill the list aSelections.Alloc(count); // optimization attempt @@ -521,47 +715,47 @@ 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) { 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 = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent); + 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) { 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 = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent); + 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; while (child) { count++; child = child->next; } @@ -570,8 +764,8 @@ 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) { @@ -582,29 +776,29 @@ 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 ); else @@ -613,30 +807,33 @@ 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) { GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - - wxString str; - if (m_hasCheckBoxes) str += "[-] "; - str += string; - - gtk_label_set( label, str ); + + wxString str; +#if wxUSE_CHECKLISTBOX + if (m_hasCheckBoxes) + str += CHECKBOX_STRING; +#endif // wxUSE_CHECKLISTBOX + str += string; + + 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 ); } @@ -656,23 +853,35 @@ int wxListBox::GetIndex( GtkWidget *item ) const return -1; } +#if wxUSE_TOOLTIPS +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 ); + child = child->next; + } +} +#endif // wxUSE_TOOLTIPS + #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) { GList *child = m_list->children; while (child) { - m_dropTarget->UnregisterWidget( GTK_WIDGET( child->data ) ); + m_dropTarget->UnregisterWidget( GTK_WIDGET( child->data ) ); child = child->next; } } #endif - + wxWindow::SetDropTarget( dropTarget ); #ifndef NEW_GTK_DND_CODE @@ -681,7 +890,7 @@ void wxListBox::SetDropTarget( wxDropTarget *dropTarget ) GList *child = m_list->children; while (child) { - m_dropTarget->RegisterWidget( GTK_WIDGET( child->data ) ); + m_dropTarget->RegisterWidget( GTK_WIDGET( child->data ) ); child = child->next; } } @@ -712,24 +921,29 @@ bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) void wxListBox::ApplyWidgetStyle() { SetWidgetStyle(); - + if (m_backgroundColour.Ok()) { GdkWindow *window = GTK_WIDGET(m_list)->window; - m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) ); - gdk_window_set_background( window, m_backgroundColour.GetColor() ); - gdk_window_clear( window ); + if ( window ) + { + m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) ); + gdk_window_set_background( window, m_backgroundColour.GetColor() ); + gdk_window_clear( window ); + } } - + GList *child = m_list->children; while (child) { gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle ); - + GtkBin *bin = GTK_BIN( child->data ); GtkWidget *label = GTK_WIDGET( bin->child ); gtk_widget_set_style( label, m_widgetStyle ); - + child = child->next; } } + +#endif \ No newline at end of file