extern void wxapp_install_idle_handler();
extern bool g_isIdle;
-//-----------------------------------------------------------------------------
-// private functions
-//-----------------------------------------------------------------------------
-
-#if wxUSE_CHECKLISTBOX
-
-// checklistboxes have "[±] " prepended to their lables, this macro removes it
-// (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))
-
-#else // !wxUSE_CHECKLISTBOX
-
-#define GET_REAL_LABEL(label) (label)
-
-#endif // wxUSE_CHECKLISTBOX
-
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
gtk_listitem_select_cb( widget, listbox, FALSE );
}
-static void gtk_listitem_select_cb( GtkWidget *widget, wxListBox *listbox, bool is_selection )
+static void gtk_listitem_select_cb( GtkWidget *widget,
+ wxListBox *listbox,
+ bool is_selection )
{
if (g_isIdle) wxapp_install_idle_handler();
if (!listbox->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
-
+
if (listbox->m_blockEvent) return;
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
event.SetEventObject( listbox );
-
-// MSW doesn't do that either
-// event.SetExtraLong( (long) is_selection );
+ // indicate whether this is a selection or a deselection
+ event.SetExtraLong( is_selection );
if ((listbox->GetWindowStyleFlag() & wxLB_SINGLE) != 0)
{
delete m_strings;
}
+// ----------------------------------------------------------------------------
+// adding items
+// ----------------------------------------------------------------------------
+
void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
{
wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
if (index != GetCount())
{
GtkAddItem( items[n], index );
- wxNode *node = m_clientList.Nth( index );
+ wxList::compatibility_iterator node = m_clientList.Item( index );
m_clientList.Insert( node, (wxObject*) NULL );
}
else
}
else
{
- wxNode *node = m_clientList.Nth( pos );
+ wxList::compatibility_iterator node = m_clientList.Item( pos );
for ( size_t n = 0; n < nItems; n++ )
{
GtkAddItem( items[n], pos+n );
{
GtkAddItem( item, index );
- wxNode *node = m_clientList.Nth( index );
+ wxList::compatibility_iterator node = m_clientList.Item( index );
m_clientList.Insert( node, (wxObject *)NULL );
return index;
}
// ----------------------------------------------------------------------------
-// client data
+// deleting items
// ----------------------------------------------------------------------------
-void wxListBox::DoSetItemClientData( int n, void* clientData )
-{
- wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
-
- wxNode *node = m_clientList.Nth( n );
- wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientData") );
-
- node->SetData( (wxObject*) clientData );
-}
-
-void* wxListBox::DoGetItemClientData( int n ) const
-{
- wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid listbox control") );
-
- wxNode *node = m_clientList.Nth( n );
- wxCHECK_MSG( node, NULL, wxT("invalid index in wxListBox::DoGetItemClientData") );
-
- return node->Data();
-}
-
-void wxListBox::DoSetItemClientObject( int n, wxClientData* clientData )
-{
- wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
-
- wxNode *node = m_clientList.Nth( n );
- wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientObject") );
-
- wxClientData *cd = (wxClientData*) node->Data();
- delete cd;
-
- node->SetData( (wxObject*) clientData );
-}
-
-wxClientData* wxListBox::DoGetItemClientObject( int n ) const
-{
- wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid listbox control") );
-
- wxNode *node = m_clientList.Nth( n );
- wxCHECK_MSG( node, (wxClientData *)NULL,
- wxT("invalid index in wxListBox::DoGetItemClientObject") );
-
- return (wxClientData*) node->Data();
-}
-
void wxListBox::Clear()
{
wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
gtk_list_clear_items( m_list, 0, GetCount() );
-
+
if ( GTK_LIST(m_list)->last_focus_child != NULL )
{
// This should be NULL, I think.
// destroy the data (due to Robert's idea of using wxList<wxObject>
// and not wxList<wxClientData> we can't just say
// m_clientList.DeleteContents(TRUE) - this would crash!
- wxNode *node = m_clientList.First();
+ wxList::compatibility_iterator node = m_clientList.GetFirst();
while ( node )
{
- delete (wxClientData *)node->Data();
- node = node->Next();
+ delete (wxClientData *)node->GetData();
+ node = node->GetNext();
}
}
m_clientList.Clear();
gtk_list_remove_items( m_list, list );
g_list_free( list );
- wxNode *node = m_clientList.Nth( n );
+ wxList::compatibility_iterator node = m_clientList.Item( n );
if ( node )
{
if ( m_clientDataItemsType == wxClientData_Object )
{
- wxClientData *cd = (wxClientData*)node->Data();
+ wxClientData *cd = (wxClientData*)node->GetData();
delete cd;
}
- m_clientList.DeleteNode( node );
+ m_clientList.Erase( node );
}
if ( m_strings )
- m_strings->Remove(n);
+ m_strings->RemoveAt(n);
+}
+
+// ----------------------------------------------------------------------------
+// client data
+// ----------------------------------------------------------------------------
+
+void wxListBox::DoSetItemClientData( int n, void* 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::DoSetItemClientData") );
+
+ node->SetData( (wxObject*) clientData );
+}
+
+void* wxListBox::DoGetItemClientData( int n ) const
+{
+ wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid listbox control") );
+
+ wxList::compatibility_iterator node = m_clientList.Item( n );
+ wxCHECK_MSG( node, NULL, wxT("invalid index in wxListBox::DoGetItemClientData") );
+
+ 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
// ----------------------------------------------------------------------------
+wxString wxListBox::GetRealLabel(GList *item) const
+{
+ GtkBin *bin = GTK_BIN( item->data );
+ GtkLabel *label = GTK_LABEL( bin->child );
+
+ 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
+ //
+ // NB: 4 below is the length of wxCHECKLBOX_STRING from wx/gtk/checklst.h
+ if ( m_hasCheckBoxes )
+ str.erase(0, 4);
+#endif // wxUSE_CHECKLISTBOX
+
+ return str;
+}
+
void wxListBox::SetString( int n, const wxString &string )
{
wxCHECK_RET( m_list != NULL, wxT("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 = wxGTK_CONV_BACK( GET_REAL_LABEL(label->label) );
-
- return str;
+ return GetRealLabel(child);
}
wxFAIL_MSG(wxT("wrong listbox index"));
int count = 0;
while (child)
{
- GtkBin *bin = GTK_BIN( child->data );
- GtkLabel *label = GTK_LABEL( bin->child );
-
- wxString str = wxGTK_CONV_BACK( GET_REAL_LABEL(label->label) );
-
- if (str == item)
+ if ( GetRealLabel(child) == item )
return count;
count++;
else
gtk_list_unselect_item( m_list, n );
- m_blockEvent = FALSE;
+ m_blockEvent = FALSE;
}
void wxListBox::DoSetFirstItem( int n )
float y = item->allocation.y;
if (y > adjustment->upper - adjustment->page_size)
y = adjustment->upper - adjustment->page_size;
- gtk_adjustment_set_value( adjustment, y );
+ gtk_adjustment_set_value( adjustment, y );
}
// ----------------------------------------------------------------------------
bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
{
+ if (m_widget->window == window) return TRUE;
+
if (GTK_WIDGET(m_list)->window == window) return TRUE;
GList *child = m_list->children;
}
}
- UpdateWindowUI();
+ if (wxUpdateUIEvent::CanUpdate(this))
+ UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
}
wxSize wxListBox::DoGetBestSize() const
// And just a bit more
int cx, cy;
- GetTextExtent("X", &cx, &cy);
+ GetTextExtent( wxT("X"), &cx, &cy);
lbWidth += 3 * cx;
// don't make the listbox too tall (limit height to around 10 items) but don't
projects / wxWidgets.git / blobdiff