// data
//-----------------------------------------------------------------------------
-extern bool g_blockEventsOnDrag;
-extern bool g_blockEventsOnScroll;
+extern bool g_blockEventsOnDrag;
+extern bool g_blockEventsOnScroll;
+extern wxCursor g_globalCursor;
-static bool g_hasDoubleClicked = FALSE;
+static bool g_hasDoubleClicked = FALSE;
//-----------------------------------------------------------------------------
// "button_release_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 )
+gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget),
+ GdkEventButton * WXUNUSED(gdk_event),
+ wxListBox *listbox )
{
if (g_isIdle) wxapp_install_idle_handler();
//-----------------------------------------------------------------------------
static gint
-gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox )
+gtk_listbox_button_press_callback( GtkWidget *widget,
+ GdkEventButton *gdk_event,
+ wxListBox *listbox )
{
if (g_isIdle) wxapp_install_idle_handler();
listbox->GetEventHandler()->ProcessEvent( event );
}
#endif // wxUSE_CHECKLISTBOX
-
+
/* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */
g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS);
// "select" and "deselect"
//-----------------------------------------------------------------------------
+static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox );
+
+static void gtk_listitem_deselect_callback( GtkWidget *widget, wxListBox *listbox )
+{
+ gtk_listitem_select_callback( widget, listbox );
+}
+
static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox )
{
if (g_isIdle) wxapp_install_idle_handler();
m_needParent = TRUE;
m_acceptsFocus = TRUE;
- PreCreation( parent, id, pos, size, style, name );
-
-#if wxUSE_VALIDATORS
- SetValidator( validator );
-#endif
+ if (!PreCreation( parent, pos, size ) ||
+ !CreateBase( parent, id, pos, size, style, validator, name ))
+ {
+ wxFAIL_MSG( wxT("wxListBox creation failed") );
+ return FALSE;
+ }
m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL );
if (style & wxLB_ALWAYS_SB)
gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_list) );
#endif
+ /* make list scroll when moving the focus down using cursor keys */
+ gtk_container_set_focus_vadjustment(
+ GTK_CONTAINER(m_list),
+ gtk_scrolled_window_get_vadjustment(
+ GTK_SCROLLED_WINDOW(m_widget)));
+
gtk_widget_show( GTK_WIDGET(m_list) );
wxSize newSize = size;
if (style & wxLB_MULTIPLE)
gtk_signal_connect( GTK_OBJECT(list_item), "deselect",
- GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
+ GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
gtk_signal_connect( GTK_OBJECT(list_item),
"button_press_event",
void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
{
- wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+ wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
GList *children = m_list->children;
int length = g_list_length(children);
- wxCHECK_RET( pos <= length, _T("invalid index in wxListBox::InsertItems") );
+ wxCHECK_RET( pos <= length, wxT("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
return;
}
-
+
wxArrayString deletedLabels;
wxArrayPtrVoid deletedData;
wxArrayInt deletedChecks; // only for check list boxes
// save data
void *clientData = NULL;
wxNode *node = NULL;
-
+
if ( n < (int)m_clientObjectList.GetCount() )
node = m_clientObjectList.Nth( n );
if ( !clientData )
{
if ( n < (int)m_clientDataList.GetCount() )
- node = m_clientDataList.Nth( n );
+ node = m_clientDataList.Nth( n );
if ( node )
{
void wxListBox::AppendCommon( const wxString &item )
{
- wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+ wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
GtkWidget *list_item;
if (HasFlag(wxLB_MULTIPLE))
gtk_signal_connect( GTK_OBJECT(list_item), "deselect",
- GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
+ GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
gtk_signal_connect( GTK_OBJECT(list_item),
"button_press_event",
{
gtk_widget_realize( list_item );
gtk_widget_realize( GTK_BIN(list_item)->child );
-
- if (m_widgetStyle) ApplyWidgetStyle();
+
+ //if (m_widgetStyle) ApplyWidgetStyle();
+ if (m_widgetStyle) {
+ // Apply current widget style to the new list_item
+ gtk_widget_set_style( GTK_WIDGET( list_item ), m_widgetStyle );
+ GtkBin *bin = GTK_BIN( list_item );
+ GtkWidget *label = GTK_WIDGET( bin->child );
+ gtk_widget_set_style( label, m_widgetStyle );
+ }
#if wxUSE_DRAG_AND_DROP
#ifndef NEW_GTK_DND_CODE
void wxListBox::SetClientData( int n, void* clientData )
{
- wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
wxNode *node = m_clientDataList.Nth( n );
if (!node) return;
void* wxListBox::GetClientData( int n )
{
- wxCHECK_MSG( m_widget != NULL, NULL, _T("invalid combobox") );
+ wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") );
wxNode *node = m_clientDataList.Nth( n );
if (!node) return NULL;
void wxListBox::SetClientObject( int n, wxClientData* clientData )
{
- wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
wxNode *node = m_clientObjectList.Nth( n );
if (!node) return;
wxClientData* wxListBox::GetClientObject( int n )
{
- wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, _T("invalid combobox") );
+ wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );
wxNode *node = m_clientObjectList.Nth( n );
if (!node) return (wxClientData*) NULL;
void wxListBox::Clear()
{
- wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+ wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
gtk_list_clear_items( m_list, 0, Number() );
void wxListBox::Delete( int n )
{
- wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+ wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
GList *child = g_list_nth( m_list->children, n );
- wxCHECK_RET( child, _T("wrong listbox index") );
+ wxCHECK_RET( child, wxT("wrong listbox index") );
GList *list = g_list_append( (GList*) NULL, child->data );
gtk_list_remove_items( m_list, list );
void wxListBox::Deselect( int n )
{
- wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+ wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
DisableEvents();
gtk_list_unselect_item( m_list, n );
-
+
EnableEvents();
}
int wxListBox::FindString( const wxString &item ) const
{
- wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") );
+ wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
GList *child = m_list->children;
int count = 0;
int wxListBox::GetSelection() const
{
- wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") );
+ wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
GList *child = m_list->children;
int count = 0;
int wxListBox::GetSelections( wxArrayInt& aSelections ) const
{
- wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") );
+ wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
// get the number of selected items first
GList *child = m_list->children;
wxString wxListBox::GetString( int n ) const
{
- wxCHECK_MSG( m_list != NULL, _T(""), _T("invalid listbox") );
+ wxCHECK_MSG( m_list != NULL, wxT(""), wxT("invalid listbox") );
GList *child = g_list_nth( m_list->children, n );
if (child)
return str;
}
-
- wxFAIL_MSG(_T("wrong listbox index"));
- return _T("");
+ wxFAIL_MSG(wxT("wrong listbox index"));
+
+ return wxT("");
}
wxString wxListBox::GetStringSelection() const
{
- wxCHECK_MSG( m_list != NULL, _T(""), _T("invalid listbox") );
+ wxCHECK_MSG( m_list != NULL, wxT(""), wxT("invalid listbox") );
GList *selection = m_list->selection;
if (selection)
return str;
}
- wxFAIL_MSG(_T("no listbox selection available"));
- return _T("");
+ wxFAIL_MSG(wxT("no listbox selection available"));
+ return wxT("");
}
int wxListBox::Number()
{
- wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") );
+ wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
GList *child = m_list->children;
int count = 0;
bool wxListBox::Selected( int n )
{
- wxCHECK_MSG( m_list != NULL, FALSE, _T("invalid listbox") );
+ wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid listbox") );
GList *target = g_list_nth( m_list->children, n );
if (target)
child = child->next;
}
}
- wxFAIL_MSG(_T("wrong listbox index"));
+ wxFAIL_MSG(wxT("wrong listbox index"));
return FALSE;
}
void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) )
{
- wxFAIL_MSG(_T("wxListBox::Set not implemented"));
+ wxFAIL_MSG(wxT("wxListBox::Set not implemented"));
}
void wxListBox::SetFirstItem( int WXUNUSED(n) )
{
- wxFAIL_MSG(_T("wxListBox::SetFirstItem not implemented"));
+ wxFAIL_MSG(wxT("wxListBox::SetFirstItem not implemented"));
}
void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) )
{
- wxFAIL_MSG(_T("wxListBox::SetFirstItem not implemented"));
+ wxFAIL_MSG(wxT("wxListBox::SetFirstItem not implemented"));
}
void wxListBox::SetSelection( int n, bool select )
{
- wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+ wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
DisableEvents();
gtk_list_select_item( m_list, n );
else
gtk_list_unselect_item( m_list, n );
-
+
EnableEvents();
}
void wxListBox::SetString( int n, const wxString &string )
{
- wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+ wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
GList *child = g_list_nth( m_list->children, n );
if (child)
}
else
{
- wxFAIL_MSG(_T("wrong listbox index"));
+ wxFAIL_MSG(wxT("wrong listbox index"));
}
}
void wxListBox::SetStringSelection( const wxString &string, bool select )
{
- wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+ wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
SetSelection( FindString(string), select );
}
#if wxUSE_DRAG_AND_DROP
void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
{
- wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+ wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
#ifndef NEW_GTK_DND_CODE
if (m_dropTarget)
if (HasFlag(wxLB_MULTIPLE))
gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
- GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
+ GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
child = child->next;
}
if (HasFlag(wxLB_MULTIPLE))
gtk_signal_connect( GTK_OBJECT(child->data), "deselect",
- GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
-
+ GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
+
child = child->next;
}
}
}
}
-#endif
\ No newline at end of file
+void wxListBox::OnInternalIdle()
+{
+ wxCursor cursor = m_cursor;
+ if (g_globalCursor.Ok()) cursor = g_globalCursor;
+
+ if (GTK_WIDGET(m_list)->window && cursor.Ok())
+ {
+ /* I now set the cursor the anew in every OnInternalIdle call
+ as setting the cursor in a parent window also effects the
+ windows above so that checking for the current cursor is
+ not possible. */
+
+ gdk_window_set_cursor( GTK_WIDGET(m_list)->window, cursor.GetCursor() );
+
+ GList *child = m_list->children;
+ while (child)
+ {
+ GtkBin *bin = GTK_BIN( child->data );
+ GtkWidget *label = GTK_WIDGET( bin->child );
+
+ if (!label->window)
+ break;
+ else
+ gdk_window_set_cursor( label->window, cursor.GetCursor() );
+
+ child = child->next;
+ }
+ }
+
+ UpdateWindowUI();
+}
+
+#endif
projects / wxWidgets.git / blobdiff