ignore clicks on a toolbar but outside any button

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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index ea20374c2ded7e221a76daeaa5916771ec3582ae..56089bfd2c1e6a2358c03b5ccd813038bafb1689 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -84,7 +84,7 @@ struct wxlistbox_idle_struct
     gint         m_tag;
 };
 
     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();
 {
     wxlistbox_idle_struct* data = (wxlistbox_idle_struct*) gdata;
     gdk_threads_enter();


@@ -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_hasVMT) return;
     if (g_blockEventsOnDrag) return;

+    
+    if (listbox->m_blockEvent) return;

 
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
     event.SetEventObject( listbox );
 
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
     event.SetEventObject( listbox );

+    

 //    MSW doesn't do that either
 //    event.SetExtraLong( (long) is_selection );
 
 //    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_needParent = TRUE;
     m_acceptsFocus = TRUE;

+    m_isListBox = TRUE;

     m_prevSelection = 0;  // or -1 ??
     m_prevSelection = 0;  // or -1 ??

+    m_blockEvent = FALSE;

 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))


@@ -388,8 +393,6 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     gtk_widget_show( GTK_WIDGET(m_list) );
 
 
     gtk_widget_show( GTK_WIDGET(m_list) );
 

-    SetBestSize( size );
-

     if ( style & wxLB_SORT )
     {
         // this will change DoAppend() behaviour
     if ( style & wxLB_SORT )
     {
         // this will change DoAppend() behaviour


@@ -406,11 +409,15 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
         DoAppend(choices[i]);
     }
 
         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();
 
     m_parent->DoAddChild( this );
 
     PostCreation();
 

-    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );
+    SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX ) );

     SetForegroundColour( parent->GetForegroundColour() );
     SetFont( parent->GetFont() );
 
     SetForegroundColour( parent->GetForegroundColour() );
     SetFont( parent->GetFont() );
 


@@ -662,6 +669,12 @@ void wxListBox::Clear()
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
     gtk_list_clear_items( m_list, 0, GetCount() );
     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() )
     {
 
     if ( HasClientObjectData() )
     {


@@ -855,7 +868,7 @@ void wxListBox::SetSelection( int n, bool select )
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 

-    GtkDisableEvents();
+    m_blockEvent = TRUE;

 
     if (select)
     {
 
     if (select)
     {


@@ -867,7 +880,7 @@ void wxListBox::SetSelection( int n, bool select )
     else
         gtk_list_unselect_item( m_list, n );
 
     else
         gtk_list_unselect_item( m_list, n );
 

-    GtkEnableEvents();
+    m_blockEvent = FALSE;    

 }
 
 void wxListBox::DoSetFirstItem( int n )
 }
 
 void wxListBox::DoSetFirstItem( int n )


@@ -939,38 +952,6 @@ void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
 }
 #endif // wxUSE_TOOLTIPS
 
 }
 #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);
 GtkWidget *wxListBox::GetConnectWidget()
 {
     return GTK_WIDGET(m_list);


@@ -1065,7 +1046,7 @@ wxSize wxListBox::DoGetBestSize() const
     }
 
     // Add room for the scrollbar
     }
 
     // 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;
 
     // And just a bit more
     int cx, cy;