Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make mouseless use of wxListBox possible for non single style.

Browse Source 
Make wxListBox report click on background.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2004-09-26 15:29:24 +00:00
parent 431a3edc64
commit fec195b2c1
2 changed files with 88 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/gtk/listbox.cpp
View File

@@ -223,6 +223,44 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
} }
#endif // wxUSE_CHECKLISTBOX #endif // wxUSE_CHECKLISTBOX
// Check or uncheck item with SPACE
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;
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() );
new_event.SetEventObject( listbox );
wxArrayInt aSelections;
int n, count = listbox->GetSelections(aSelections);
if ( count > 0 )
{
n = aSelections[0];
if ( listbox->HasClientObjectData() )
new_event.SetClientObject( listbox->GetClientObject(n) );
else if ( listbox->HasClientUntypedData() )
new_event.SetClientData( listbox->GetClientData(n) );
new_event.SetString( listbox->GetString(n) );
}
else
{
n = -1;
}
new_event.m_commandInt = n;
listbox->GetEventHandler()->ProcessEvent( new_event );
}
}
if (ret) if (ret)
{ {
gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
@@ -967,11 +1005,15 @@ void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
GtkWidget *wxListBox::GetConnectWidget() GtkWidget *wxListBox::GetConnectWidget()
{ {
return GTK_WIDGET(m_list); // return GTK_WIDGET(m_list);
return m_widget;
} }
bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
{ {
return TRUE;
#if 0
if (m_widget->window == window) return TRUE; if (m_widget->window == window) return TRUE;
if (GTK_WIDGET(m_list)->window == window) return TRUE; if (GTK_WIDGET(m_list)->window == window) return TRUE;
@@ -985,6 +1027,7 @@ bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
} }
return FALSE; return FALSE;
#endif
} }
void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style) void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style)

45
src/gtk1/listbox.cpp
View File

@@ -223,6 +223,44 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
} }
#endif // wxUSE_CHECKLISTBOX #endif // wxUSE_CHECKLISTBOX
// Check or uncheck item with SPACE
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;
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() );
new_event.SetEventObject( listbox );
wxArrayInt aSelections;
int n, count = listbox->GetSelections(aSelections);
if ( count > 0 )
{
n = aSelections[0];
if ( listbox->HasClientObjectData() )
new_event.SetClientObject( listbox->GetClientObject(n) );
else if ( listbox->HasClientUntypedData() )
new_event.SetClientData( listbox->GetClientData(n) );
new_event.SetString( listbox->GetString(n) );
}
else
{
n = -1;
}
new_event.m_commandInt = n;
listbox->GetEventHandler()->ProcessEvent( new_event );
}
}
if (ret) if (ret)
{ {
gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
@@ -967,11 +1005,15 @@ void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
GtkWidget *wxListBox::GetConnectWidget() GtkWidget *wxListBox::GetConnectWidget()
{ {
return GTK_WIDGET(m_list); // return GTK_WIDGET(m_list);
return m_widget;
} }
bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
{ {
return TRUE;
#if 0
if (m_widget->window == window) return TRUE; if (m_widget->window == window) return TRUE;
if (GTK_WIDGET(m_list)->window == window) return TRUE; if (GTK_WIDGET(m_list)->window == window) return TRUE;
@@ -985,6 +1027,7 @@ bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
} }
return FALSE; return FALSE;
#endif
} }
void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style) void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style)