#include "wx/intl.h"
#include "wx/checklst.h"
#include "wx/settings.h"
+#include "wx/gtk/private.h"
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
extern void wxapp_install_idle_handler();
extern bool g_isIdle;
-//-------------------------------------------------------------------------
-// conditional compilation
-//-------------------------------------------------------------------------
-
-#if (GTK_MINOR_VERSION > 0)
- #define NEW_GTK_SCROLL_CODE
-#endif
-
//-----------------------------------------------------------------------------
// private functions
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
-extern bool g_blockEventsOnDrag;
-extern bool g_blockEventsOnScroll;
-extern wxCursor g_globalCursor;
+extern bool g_blockEventsOnDrag;
+extern bool g_blockEventsOnScroll;
+extern wxCursor g_globalCursor;
+extern wxWindowGTK *g_delayedFocus;
static bool g_hasDoubleClicked = FALSE;
gint m_tag;
};
-static gint wxlistbox_idle_callback( gpointer gdata )
+extern "C" gint wxlistbox_idle_callback( gpointer gdata )
{
wxlistbox_idle_struct* data = (wxlistbox_idle_struct*) gdata;
gdk_threads_enter();
gtk_idle_remove( data->m_tag );
- data->m_listbox->SetFirstItem( data->m_item );
+ // 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() )
+ {
+ lbox->SetFirstItem( data->m_item );
+ }
delete data;
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 );
m_needParent = TRUE;
m_acceptsFocus = TRUE;
m_prevSelection = 0; // or -1 ??
+ m_blockEvent = FALSE;
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
gtk_list_set_selection_mode( GTK_LIST(m_list), mode );
-#ifdef NEW_GTK_SCROLL_CODE
gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(m_widget), GTK_WIDGET(m_list) );
-#else
- 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_widget_show( GTK_WIDGET(m_list) );
- SetBestSize( size );
-
if ( style & wxLB_SORT )
{
// this will change DoAppend() behaviour
DoAppend(choices[i]);
}
+ // call it after appending the strings to the listbox, otherwise it doesn't
+ // work correctly
+ SetBestSize( size );
+
m_parent->DoAddChild( this );
PostCreation();
- SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );
+ SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX ) );
SetForegroundColour( parent->GetForegroundColour() );
SetFont( parent->GetFont() );
}
#endif // wxUSE_CHECKLISTBOX
- list_item = gtk_list_item_new_with_label( label.mbc_str() );
+ list_item = gtk_list_item_new_with_label( wxGTK_CONV( label ) );
GList *gitem_list = g_list_alloc ();
gitem_list->data = list_item;
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.
+ GTK_LIST(m_list)->last_focus_child = NULL;
+ }
if ( HasClientObjectData() )
{
#endif // wxUSE_CHECKLISTBOX
str += string;
- gtk_label_set( label, str.mbc_str() );
+ gtk_label_set( label, wxGTK_CONV( str ) );
}
else
{
GtkBin *bin = GTK_BIN( child->data );
GtkLabel *label = GTK_LABEL( bin->child );
- wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent);
+#ifdef __WXGTK20__
+ wxString str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );
+#else
+ wxString str = wxString( label->label );
+#endif
return str;
}
GtkBin *bin = GTK_BIN( child->data );
GtkLabel *label = GTK_LABEL( bin->child );
- wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent);
+#ifdef __WXGTK20__
+ wxString str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );
+#else
+ wxString str = wxString( label->label );
+#endif
if (str == item)
return count;
{
wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
- GtkDisableEvents();
+ m_blockEvent = TRUE;
if (select)
{
else
gtk_list_unselect_item( m_list, n );
- GtkEnableEvents();
+ m_blockEvent = FALSE;
}
void wxListBox::DoSetFirstItem( int n )
}
#endif // wxUSE_TOOLTIPS
-void wxListBox::GtkDisableEvents()
-{
- GList *child = m_list->children;
- while (child)
- {
- gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
- GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
-
- if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED))
- gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
- GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
-
- child = child->next;
- }
-}
-
-void wxListBox::GtkEnableEvents()
-{
- GList *child = m_list->children;
- while (child)
- {
- gtk_signal_connect( GTK_OBJECT(child->data), "select",
- GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
-
- if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED))
- gtk_signal_connect( GTK_OBJECT(child->data), "deselect",
- GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
-
- child = child->next;
- }
-}
-
GtkWidget *wxListBox::GetConnectWidget()
{
return GTK_WIDGET(m_list);
}
}
+ if (g_delayedFocus == this)
+ {
+ if (GTK_WIDGET_REALIZED(m_widget))
+ {
+ gtk_widget_grab_focus( m_widget );
+ g_delayedFocus = NULL;
+ }
+ }
+
UpdateWindowUI();
}
}
// Add room for the scrollbar
- lbWidth += wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X);
+ lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
// And just a bit more
int cx, cy;
return wxSize(lbWidth, lbHeight);
}
-#endif
+void wxListBox::FixUpMouseEvent(GtkWidget *widget, wxCoord& x, wxCoord& y)
+{
+ // the mouse event coords are relative to the listbox items, we need to
+ // translate them to the normal client coords
+ x += widget->allocation.x;
+ y += widget->allocation.y;
+}
+
+#endif // wxUSE_LISTBOX
+
projects / wxWidgets.git / blobdiff