X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c6179a847d8899cceb8880abc2ab2fe9d0244c90..f363cee882672e147340240cf0bb194a68e37833:/src/gtk1/listbox.cpp diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp index a2cf2b46aa..1220748fa7 100644 --- a/src/gtk1/listbox.cpp +++ b/src/gtk1/listbox.cpp @@ -1,35 +1,31 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: listbox.cpp +// Name: src/gtk1/listbox.cpp // Purpose: // Author: Robert Roebling -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling // 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" -#include "wx/defs.h" - #if wxUSE_LISTBOX #include "wx/listbox.h" -#include "wx/dynarray.h" -#include "wx/arrstr.h" -#include "wx/utils.h" -#include "wx/intl.h" -#include "wx/checklst.h" -#include "wx/settings.h" -#include "wx/gtk/private.h" + +#ifndef WX_PRECOMP + #include "wx/dynarray.h" + #include "wx/intl.h" + #include "wx/utils.h" + #include "wx/settings.h" + #include "wx/checklst.h" + #include "wx/arrstr.h" +#endif + +#include "wx/gtk1/private.h" #if wxUSE_TOOLTIPS -#include "wx/tooltip.h" + #include "wx/tooltip.h" #endif #include @@ -54,7 +50,7 @@ extern wxWindowGTK *g_delayedFocus; extern wxWindowGTK *g_focusWindow; extern wxWindowGTK *g_focusWindowLast; -static bool g_hasDoubleClicked = FALSE; +static bool g_hasDoubleClicked = false; //----------------------------------------------------------------------------- // idle callback for SetFirstItem @@ -67,7 +63,8 @@ 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(); @@ -77,7 +74,7 @@ extern "C" gint wxlistbox_idle_callback( gpointer gdata ) // check that the items haven't been deleted from the listbox since we had // installed this callback wxListBox *lbox = data->m_listbox; - if ( data->m_item < lbox->GetCount() ) + if ( data->m_item < (int)lbox->GetCount() ) { lbox->SetFirstItem( data->m_item ); } @@ -88,14 +85,16 @@ extern "C" gint wxlistbox_idle_callback( gpointer gdata ) return TRUE; } +} //----------------------------------------------------------------------------- // "focus_in_event" //----------------------------------------------------------------------------- -static gint gtk_listitem_focus_in_callback( GtkWidget *widget, - GdkEvent *WXUNUSED(event), - wxWindow *win ) +extern "C" { +static gint gtk_listitem_focus_in_callback( GtkWidget *WXUNUSED(widget), + GdkEvent *WXUNUSED(event), + wxWindow *win ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -107,36 +106,40 @@ static gint gtk_listitem_focus_in_callback( GtkWidget *widget, if ( !win->m_hasFocus ) { // not yet, notify it - win->m_hasFocus = TRUE; - + win->m_hasFocus = true; + wxChildFocusEvent eventChildFocus(win); - (void)win->GetEventHandler()->ProcessEvent(eventChildFocus); + (void)win->HandleWindowEvent(eventChildFocus); wxFocusEvent eventFocus(wxEVT_SET_FOCUS, win->GetId()); eventFocus.SetEventObject(win); - (void)win->GetEventHandler()->ProcessEvent(eventFocus); + (void)win->HandleWindowEvent(eventFocus); } return FALSE; } +} //----------------------------------------------------------------------------- // "focus_out_event" //----------------------------------------------------------------------------- -static gint gtk_listitem_focus_out_callback( GtkWidget *widget, GdkEventFocus *gdk_event, wxWindowGTK *win ) +extern "C" { +static gint gtk_listitem_focus_out_callback( GtkWidget *WXUNUSED(widget), + GdkEventFocus *WXUNUSED(gdk_event), + wxWindowGTK *win ) { if (g_isIdle) wxapp_install_idle_handler(); - g_focusWindow = (wxWindowGTK *)NULL; + g_focusWindow = NULL; // don't send the window a kill focus event if it thinks that it doesn't // have focus already if ( win->m_hasFocus ) { - win->m_hasFocus = FALSE; + win->m_hasFocus = false; wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() ); event.SetEventObject( win ); @@ -145,22 +148,24 @@ static gint gtk_listitem_focus_out_callback( GtkWidget *widget, GdkEventFocus *g // process it too as otherwise bad things happen, especially in GTK2 // where the text control simply aborts the program if it doesn't get // the matching focus out event - (void)win->GetEventHandler()->ProcessEvent( event ); + (void)win->HandleWindowEvent( event ); } return FALSE; } +} //----------------------------------------------------------------------------- // "button_release_event" //----------------------------------------------------------------------------- -/* we would normally emit a wxEVT_COMMAND_LISTBOX_DOUBLECLICKED event once +/* we would normally emit a wxEVT_LISTBOX_DCLICK 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 */ +extern "C" { static gint gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget), GdkEventButton * WXUNUSED(gdk_event), @@ -175,7 +180,7 @@ gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget), if (!g_hasDoubleClicked) return FALSE; - wxCommandEvent event( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() ); + wxCommandEvent event( wxEVT_LISTBOX_DCLICK, listbox->GetId() ); event.SetEventObject( listbox ); wxArrayInt aSelections; @@ -196,15 +201,17 @@ gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget), event.SetInt(n); - listbox->GetEventHandler()->ProcessEvent( event ); + listbox->HandleWindowEvent( event ); return FALSE; } +} //----------------------------------------------------------------------------- // "button_press_event" //----------------------------------------------------------------------------- +extern "C" { static gint gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, @@ -226,23 +233,41 @@ gtk_listbox_button_press_callback( GtkWidget *widget, clb->Check( sel, !clb->IsChecked(sel) ); - wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() ); + wxCommandEvent event( wxEVT_CHECKLISTBOX, listbox->GetId() ); event.SetEventObject( listbox ); event.SetInt( sel ); - listbox->GetEventHandler()->ProcessEvent( event ); + listbox->HandleWindowEvent( event ); } #endif // wxUSE_CHECKLISTBOX - /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */ + 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_LISTBOX_DCLICK 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 ) { @@ -252,7 +277,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis if (g_blockEventsOnDrag) return FALSE; - bool ret = FALSE; + bool ret = false; if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) { @@ -262,13 +287,13 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */ new_event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) ); new_event.SetCurrentFocus( listbox ); - ret = listbox->GetEventHandler()->ProcessEvent( new_event ); + ret = listbox->HandleWindowEvent( new_event ); } if ((gdk_event->keyval == GDK_Return) && (!ret)) { // eat return in all modes - ret = TRUE; + ret = true; } #if wxUSE_CHECKLISTBOX @@ -280,30 +305,30 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis clb->Check( sel, !clb->IsChecked(sel) ); - wxCommandEvent new_event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() ); + wxCommandEvent new_event( wxEVT_CHECKLISTBOX, listbox->GetId() ); new_event.SetEventObject( listbox ); new_event.SetInt( sel ); - ret = listbox->GetEventHandler()->ProcessEvent( new_event ); + ret = listbox->HandleWindowEvent( new_event ); } #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; - + 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() ); + + wxCommandEvent new_event(wxEVT_LISTBOX, listbox->GetId() ); new_event.SetEventObject( listbox ); wxArrayInt aSelections; int n, count = listbox->GetSelections(aSelections); @@ -321,10 +346,10 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis n = -1; } new_event.SetInt(n); - listbox->GetEventHandler()->ProcessEvent( new_event ); + listbox->HandleWindowEvent( new_event ); } } - + if (ret) { gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); @@ -333,23 +358,12 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis 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 ) @@ -361,7 +375,7 @@ static void gtk_listitem_select_cb( GtkWidget *widget, if (listbox->m_blockEvent) return; - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); + wxCommandEvent event(wxEVT_LISTBOX, listbox->GetId() ); event.SetEventObject( listbox ); // indicate whether this is a selection or a deselection @@ -397,41 +411,55 @@ static void gtk_listitem_select_cb( GtkWidget *widget, // No longer required with new code in wxLB_SINGLE // listbox->GetEventHandler()->AddPendingEvent( event ); - listbox->GetEventHandler()->ProcessEvent( event ); + listbox->HandleWindowEvent( 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 ) +gtk_listbox_realized_callback( GtkWidget *WXUNUSED(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 //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl) - // ---------------------------------------------------------------------------- // construction // ---------------------------------------------------------------------------- wxListBox::wxListBox() { - m_list = (GtkList *) NULL; + m_list = NULL; #if wxUSE_CHECKLISTBOX - m_hasCheckBoxes = FALSE; + m_hasCheckBoxes = false; #endif // wxUSE_CHECKLISTBOX } @@ -453,19 +481,19 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, long style, const wxValidator& validator, const wxString &name ) { - m_needParent = TRUE; - m_acceptsFocus = TRUE; + m_needParent = true; + m_acceptsFocus = true; m_prevSelection = 0; // or -1 ?? - m_blockEvent = FALSE; + m_blockEvent = false; if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) { wxFAIL_MSG( wxT("wxListBox creation failed") ); - return FALSE; + return false; } - m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL ); + m_widget = gtk_scrolled_window_new( NULL, NULL ); if (style & wxLB_ALWAYS_SB) { gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget), @@ -492,7 +520,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 ); @@ -509,140 +537,78 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, gtk_signal_connect( GTK_OBJECT(m_list), "realize", GTK_SIGNAL_FUNC(gtk_listbox_realized_callback), (gpointer) this ); - + if ( style & wxLB_SORT ) { - // this will change DoAppend() behaviour + // this will change Append() behaviour m_strings = new wxSortedArrayString; } else { - m_strings = (wxSortedArrayString *)NULL; + m_strings = NULL; } - for (int i = 0; i < n; i++) - { - // add one by one - DoAppend(choices[i]); - } + Append(n, choices); m_parent->DoAddChild( this ); PostCreation(size); - SetBestSize(size); // need this too because this is a wxControlWithItems + SetInitialSize(size); // need this too because this is a wxControlWithItems - return TRUE; + return true; } wxListBox::~wxListBox() { - m_hasVMT = FALSE; + m_hasVMT = false; Clear(); - if (m_strings) - delete m_strings; + delete m_strings; } // ---------------------------------------------------------------------------- // adding items // ---------------------------------------------------------------------------- -void wxListBox::DoInsertItems(const wxArrayString& items, int pos) +int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, + wxClientDataType type) { - wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); + wxCHECK_MSG( m_list != NULL, wxNOT_FOUND, wxT("invalid listbox") ); - // VZ: notice that InsertItems knows nothing about sorting, so calling it - // from outside (and not from our own Append) is likely to break - // everything + const unsigned count = GetCount(); + wxCHECK_MSG( pos <= count, wxNOT_FOUND, + wxT("invalid index in wxListBox::InsertItems") ); // code elsewhere supposes we have as many items in m_clientList as items // in the listbox - wxASSERT_MSG( m_clientList.GetCount() == (size_t)GetCount(), - wxT("bug in client data management") ); + wxASSERT_MSG( m_clientList.GetCount() == count, + wxT("bug in client data management") ); InvalidateBestSize(); - GList *children = m_list->children; - int length = g_list_length(children); - - wxCHECK_RET( pos <= length, wxT("invalid index in wxListBox::InsertItems") ); - - size_t nItems = items.GetCount(); - int index; - - if (m_strings) - { - for (size_t n = 0; n < nItems; n++) - { - index = m_strings->Add( items[n] ); + const unsigned numItems = items.GetCount(); - if (index != GetCount()) - { - GtkAddItem( items[n], index ); - wxList::compatibility_iterator node = m_clientList.Item( index ); - m_clientList.Insert( node, (wxObject*) NULL ); - } - else - { - GtkAddItem( items[n] ); - m_clientList.Append( (wxObject*) NULL ); - } - } - } - else + for ( unsigned int n = 0; n < numItems; ++n, ++pos ) { - if (pos == length) - { - for ( size_t n = 0; n < nItems; n++ ) - { - GtkAddItem( items[n] ); + const wxString& item = items[n]; - m_clientList.Append((wxObject *)NULL); - } - } - else - { - wxList::compatibility_iterator node = m_clientList.Item( pos ); - for ( size_t n = 0; n < nItems; n++ ) - { - GtkAddItem( items[n], pos+n ); + const unsigned idx = m_strings ? m_strings->Add(item) + : pos; - m_clientList.Insert( node, (wxObject *)NULL ); - } - } - } + GtkAddItem(item, idx == GetCount() ? (unsigned) -1 : idx); - wxASSERT_MSG( m_clientList.GetCount() == (size_t)GetCount(), - wxT("bug in client data management") ); -} - -int wxListBox::DoAppend( const wxString& item ) -{ - InvalidateBestSize(); - - if (m_strings) - { - // need to determine the index - int index = m_strings->Add( item ); - - // only if not at the end anyway - if (index != GetCount()) - { - GtkAddItem( item, index ); + m_clientList.Insert(idx, NULL); - wxList::compatibility_iterator node = m_clientList.Item( index ); - m_clientList.Insert( node, (wxObject *)NULL ); - - return index; - } + AssignNewItemClientData(idx, clientData, n, type); } - GtkAddItem(item); - - m_clientList.Append((wxObject *)NULL); + wxASSERT_MSG( m_clientList.GetCount() == GetCount(), + wxT("bug in client data management") ); - return GetCount() - 1; + return pos - 1; } void wxListBox::GtkAddItem( const wxString &item, int pos ) @@ -703,7 +669,7 @@ void wxListBox::GtkAddItem( const wxString &item, int pos ) if (GTK_WIDGET_REALIZED(m_widget)) { gtk_widget_show( list_item ); - + gtk_widget_realize( list_item ); gtk_widget_realize( GTK_BIN(list_item)->child ); @@ -718,38 +684,20 @@ 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 ); } } -void wxListBox::DoSetItems( const wxArrayString& items, - void **clientData) -{ - Clear(); - - DoInsertItems(items, 0); - - if ( clientData ) - { - size_t count = items.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - SetClientData(n, clientData[n]); - } - } -} - // ---------------------------------------------------------------------------- // deleting items // ---------------------------------------------------------------------------- -void wxListBox::Clear() +void wxListBox::DoClear() { wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); - gtk_list_clear_items( m_list, 0, GetCount() ); + gtk_list_clear_items( m_list, 0, (int)GetCount() ); if ( GTK_LIST(m_list)->last_focus_child != NULL ) { @@ -757,25 +705,13 @@ void wxListBox::Clear() GTK_LIST(m_list)->last_focus_child = NULL; } - if ( HasClientObjectData() ) - { - // destroy the data (due to Robert's idea of using wxList - // and not wxList we can't just say - // m_clientList.DeleteContents(TRUE) - this would crash! - wxList::compatibility_iterator node = m_clientList.GetFirst(); - while ( node ) - { - delete (wxClientData *)node->GetData(); - node = node->GetNext(); - } - } m_clientList.Clear(); if ( m_strings ) m_strings->Clear(); } -void wxListBox::Delete( int n ) +void wxListBox::DoDeleteOneItem(unsigned int n) { wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); @@ -783,19 +719,13 @@ void wxListBox::Delete( int n ) wxCHECK_RET( child, wxT("wrong listbox index") ); - GList *list = g_list_append( (GList*) NULL, child->data ); + GList *list = g_list_append( NULL, child->data ); gtk_list_remove_items( m_list, list ); g_list_free( list ); wxList::compatibility_iterator node = m_clientList.Item( n ); if ( node ) { - if ( m_clientDataItemsType == wxClientData_Object ) - { - wxClientData *cd = (wxClientData*)node->GetData(); - delete cd; - } - m_clientList.Erase( node ); } @@ -807,7 +737,7 @@ void wxListBox::Delete( int n ) // client data // ---------------------------------------------------------------------------- -void wxListBox::DoSetItemClientData( int n, void* clientData ) +void wxListBox::DoSetItemClientData(unsigned int n, void* clientData) { wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") ); @@ -817,7 +747,7 @@ void wxListBox::DoSetItemClientData( int n, void* clientData ) node->SetData( (wxObject*) clientData ); } -void* wxListBox::DoGetItemClientData( int n ) const +void* wxListBox::DoGetItemClientData(unsigned int n) const { wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid listbox control") ); @@ -827,29 +757,6 @@ void* wxListBox::DoGetItemClientData( int n ) const return node->GetData(); } -void wxListBox::DoSetItemClientObject( int n, wxClientData* clientData ) -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") ); - - wxList::compatibility_iterator node = m_clientList.Item( n ); - wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientObject") ); - - // wxItemContainer already deletes data for us - - node->SetData( (wxObject*) clientData ); -} - -wxClientData* wxListBox::DoGetItemClientObject( int n ) const -{ - wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid listbox control") ); - - wxList::compatibility_iterator node = m_clientList.Item( n ); - wxCHECK_MSG( node, (wxClientData *)NULL, - wxT("invalid index in wxListBox::DoGetItemClientObject") ); - - return (wxClientData*) node->GetData(); -} - // ---------------------------------------------------------------------------- // string list access // ---------------------------------------------------------------------------- @@ -861,16 +768,12 @@ 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 + // checklistboxes have "[±] " prepended to their lables, remove it // - // NB: 4 below is the length of wxCHECKLBOX_STRING from wx/gtk/checklst.h + // NB: 4 below is the length of wxCHECKLBOX_STRING from wx/gtk1/checklst.h if ( m_hasCheckBoxes ) str.erase(0, 4); #endif // wxUSE_CHECKLISTBOX @@ -878,7 +781,7 @@ wxString wxListBox::GetRealLabel(GList *item) const return str; } -void wxListBox::SetString( int n, const wxString &string ) +void wxListBox::SetString(unsigned int n, const wxString &string) { wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); @@ -903,9 +806,9 @@ void wxListBox::SetString( int n, const wxString &string ) } } -wxString wxListBox::GetString( int n ) const +wxString wxListBox::GetString(unsigned 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) @@ -915,26 +818,26 @@ wxString wxListBox::GetString( int n ) const wxFAIL_MSG(wxT("wrong listbox index")); - return wxT(""); + return wxEmptyString; } -int wxListBox::GetCount() const +unsigned int wxListBox::GetCount() const { - wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") ); + wxCHECK_MSG( m_list != NULL, 0, wxT("invalid listbox") ); GList *children = m_list->children; 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++; @@ -952,7 +855,7 @@ int wxListBox::FindString( const wxString &item ) const int wxListBox::GetSelection() 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; @@ -962,12 +865,12 @@ int wxListBox::GetSelection() const count++; child = child->next; } - return -1; + return wxNOT_FOUND; } int wxListBox::GetSelections( wxArrayInt& aSelections ) const { - wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") ); + wxCHECK_MSG( m_list != NULL, wxNOT_FOUND, wxT("invalid listbox") ); // get the number of selected items first GList *child = m_list->children; @@ -997,11 +900,11 @@ int wxListBox::GetSelections( wxArrayInt& aSelections ) const bool wxListBox::IsSelected( int n ) const { - wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid listbox") ); + wxCHECK_MSG( m_list != NULL, false, wxT("invalid listbox") ); GList *target = g_list_nth( m_list->children, n ); - wxCHECK_MSG( target, FALSE, wxT("invalid listbox index") ); + wxCHECK_MSG( target, false, wxT("invalid listbox index") ); return (GTK_WIDGET(target->data)->state == GTK_STATE_SELECTED) ; } @@ -1010,7 +913,7 @@ void wxListBox::DoSetSelection( int n, bool select ) { wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); - m_blockEvent = TRUE; + m_blockEvent = true; if (select) { @@ -1022,7 +925,7 @@ void wxListBox::DoSetSelection( int n, bool select ) else gtk_list_unselect_item( m_list, n ); - m_blockEvent = FALSE; + m_blockEvent = false; } void wxListBox::DoSetFirstItem( int n ) @@ -1088,7 +991,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 ), wxConvCurrent->cWX2MB(tip), (gchar*) NULL ); + gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), wxConvCurrent->cWX2MB(tip), NULL ); child = child->next; } } @@ -1102,28 +1005,13 @@ GtkWidget *wxListBox::GetConnectWidget() bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) { - return TRUE; - -#if 0 - if (m_widget->window == window) return TRUE; - - if (GTK_WIDGET(m_list)->window == window) return TRUE; - - GList *child = m_list->children; - while (child) - { - GtkWidget *bin = GTK_WIDGET( child->data ); - if (bin->window == window) return TRUE; - child = child->next; - } - - return FALSE; -#endif + return m_widget->window == window || + GTK_WIDGET(m_list)->window == window; } void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style) { - if (m_hasBgCol && m_backgroundColour.Ok()) + if (m_hasBgCol && m_backgroundColour.IsOk()) { GdkWindow *window = GTK_WIDGET(m_list)->window; if ( window ) @@ -1150,9 +1038,9 @@ void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style) void wxListBox::OnInternalIdle() { wxCursor cursor = m_cursor; - if (g_globalCursor.Ok()) cursor = g_globalCursor; + if (g_globalCursor.IsOk()) cursor = g_globalCursor; - if (GTK_WIDGET(m_list)->window && cursor.Ok()) + if (GTK_WIDGET(m_list)->window && cursor.IsOk()) { /* I now set the cursor the anew in every OnInternalIdle call as setting the cursor in a parent window also effects the @@ -1196,7 +1084,7 @@ wxSize wxListBox::DoGetBestSize() const int wLine; // Find the widest line - for(int i = 0; i < GetCount(); i++) { + for(unsigned int i = 0; i < GetCount(); i++) { wxString str(GetString(i)); GetTextExtent(str, &wLine, NULL); lbWidth = wxMax(lbWidth, wLine); @@ -1215,7 +1103,7 @@ wxSize wxListBox::DoGetBestSize() const lbHeight = (cy+4) * wxMin(wxMax(GetCount(), 3), 10); wxSize best(lbWidth, lbHeight); - CacheBestSize(best); + CacheBestSize(best); return best; } @@ -1236,4 +1124,3 @@ wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) } #endif // wxUSE_LISTBOX -