added virtual DoSetSize method in order to allow for MacOSX Listbox bug workaround

[wxWidgets.git] / src / gtk1 / listbox.cpp

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index ea20374c2ded7e221a76daeaa5916771ec3582ae..8e5a52297f84c90154e08d4af36fda72ffc469bb 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -267,9 +267,12 @@ static void gtk_listitem_select_cb( GtkWidget *widget, wxListBox *listbox, bool
 
     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 );
 
@@ -333,7 +336,9 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 {
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
+    m_isListBox = TRUE;
     m_prevSelection = 0;  // or -1 ??
+    m_blockEvent = FALSE;
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
@@ -662,6 +667,12 @@ 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.
+        GTK_LIST(m_list)->last_focus_child = NULL;
+    }
 
     if ( HasClientObjectData() )
     {
@@ -855,7 +866,7 @@ void wxListBox::SetSelection( int n, bool select )
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
-    GtkDisableEvents();
+    m_blockEvent = TRUE;
 
     if (select)
     {
@@ -867,7 +878,7 @@ void wxListBox::SetSelection( int n, bool select )
     else
         gtk_list_unselect_item( m_list, n );
 
-    GtkEnableEvents();
+    m_blockEvent = FALSE;    
 }
 
 void wxListBox::DoSetFirstItem( int n )
@@ -939,38 +950,6 @@ void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
 }
 #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);