Attempt to add primary selection support, but doesn't work.

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

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 138fc38d96d1ed72ff6195f22c375807ebb055e9..d529cd166943726e9d019fffdc58e592c1629bc6 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -17,6 +17,7 @@
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/checklst.h"
+#include "wx/settings.h"
 
 #if wxUSE_TOOLTIPS
 #include "wx/tooltip.h"
@@ -29,18 +30,27 @@
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
 //-------------------------------------------------------------------------
 // conditional compilation
 //-------------------------------------------------------------------------
 
 #if (GTK_MINOR_VERSION > 0)
-#define NEW_GTK_SCROLL_CODE
+    #define NEW_GTK_SCROLL_CODE
 #endif
 
 //-----------------------------------------------------------------------------
 // private functions
 //-----------------------------------------------------------------------------
 
+#if wxUSE_CHECKLISTBOX
+
 #define CHECKBOX_STRING "[-] "
 
 // checklistboxes have "[±] " prepended to their lables, this macro removes it
@@ -49,6 +59,12 @@
 // the argument to it is a "const char *" pointer
 #define GET_REAL_LABEL(label) ((m_hasCheckBoxes)?(label)+4 : (label))
 
+#else // !wxUSE_CHECKLISTBOX
+
+#define GET_REAL_LABEL(label) (label)
+
+#endif // wxUSE_CHECKLISTBOX
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -56,34 +72,30 @@
 extern bool   g_blockEventsOnDrag;
 extern bool   g_blockEventsOnScroll;
 
+static bool   g_hasDoubleClicked = FALSE;
+
 //-----------------------------------------------------------------------------
-// "button_press_event"
+// "button_release_event"
 //-----------------------------------------------------------------------------
 
+/* we would normally emit a wxEVT_COMMAND_LISTBOX_DOUBLECLICKED event once
+   a GDK_2BUTTON_PRESS occurs, but this has the particular problem of the
+   listbox keeping the focus until it receives a GDK_BUTTON_RELEASE event.
+   this can lead to race conditions so that we emit the dclick event
+   after the GDK_BUTTON_RELEASE event after the GDK_2BUTTON_PRESS event */
+
 static gint
-gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox )
+gtk_listbox_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox )
 {
+    if (g_isIdle) wxapp_install_idle_handler();
+
     if (g_blockEventsOnDrag) return FALSE;
     if (g_blockEventsOnScroll) return FALSE;
 
-    if (!listbox->HasVMT()) return FALSE;
-
-    int sel = listbox->GetIndex( widget );
-
-    if ((listbox->m_hasCheckBoxes) && (gdk_event->x < 15) && (gdk_event->type != GDK_2BUTTON_PRESS))
-    {
-        wxCheckListBox *clb = (wxCheckListBox *)listbox;
-
-        clb->Check( sel, !clb->IsChecked(sel) );
+    if (!listbox->m_hasVMT) return FALSE;
 
-        wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() );
-        event.SetEventObject( listbox );
-        event.SetInt( sel );
-        listbox->GetEventHandler()->ProcessEvent( event );
-    }
+    if (!g_hasDoubleClicked) return FALSE;
 
-    if (gdk_event->type == GDK_2BUTTON_PRESS)
-    {
         wxCommandEvent event( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
         event.SetEventObject( listbox );
 
@@ -104,7 +116,41 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event,
 
         listbox->GetEventHandler()->ProcessEvent( event );
 
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "button_press_event"
+//-----------------------------------------------------------------------------
+
+static gint
+gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox )
+{
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    if (g_blockEventsOnDrag) return FALSE;
+    if (g_blockEventsOnScroll) return FALSE;
+
+    if (!listbox->m_hasVMT) return FALSE;
+
+    int sel = listbox->GetIndex( widget );
+
+#if wxUSE_CHECKLISTBOX
+    if ((listbox->m_hasCheckBoxes) && (gdk_event->x < 15) && (gdk_event->type != GDK_2BUTTON_PRESS))
+    {
+        wxCheckListBox *clb = (wxCheckListBox *)listbox;
+
+        clb->Check( sel, !clb->IsChecked(sel) );
+
+        wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() );
+        event.SetEventObject( listbox );
+        event.SetInt( sel );
+        listbox->GetEventHandler()->ProcessEvent( event );
     }
+#endif // wxUSE_CHECKLISTBOX
+    
+    /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */
+    g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS);
 
     return FALSE;
 }
@@ -116,12 +162,15 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event,
 static gint
 gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox )
 {
+    if (g_isIdle) wxapp_install_idle_handler();
+
     if (g_blockEventsOnDrag) return FALSE;
 
-    if (!listbox->HasVMT()) return FALSE;
+    if (!listbox->m_hasVMT) return FALSE;
 
     if (gdk_event->keyval != ' ') return FALSE;
 
+#if wxUSE_CHECKLISTBOX
     int sel = listbox->GetIndex( widget );
 
     wxCheckListBox *clb = (wxCheckListBox *)listbox;
@@ -132,6 +181,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
     event.SetEventObject( listbox );
     event.SetInt( sel );
     listbox->GetEventHandler()->ProcessEvent( event );
+#endif // wxUSE_CHECKLISTBOX
 
     return FALSE;
 }
@@ -142,7 +192,9 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
 
 static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox )
 {
-    if (!listbox->HasVMT()) return;
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    if (!listbox->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
@@ -176,7 +228,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl)
 wxListBox::wxListBox()
 {
     m_list = (GtkList *) NULL;
+#if wxUSE_CHECKLISTBOX
     m_hasCheckBoxes = FALSE;
+#endif // wxUSE_CHECKLISTBOX
 }
 
 bool wxListBox::Create( wxWindow *parent, wxWindowID id,
@@ -234,10 +288,12 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
         GtkWidget *list_item;
 
         wxString str(choices[i]);
+#if wxUSE_CHECKLISTBOX
         if (m_hasCheckBoxes)
         {
             str.Prepend(CHECKBOX_STRING);
         }
+#endif // wxUSE_CHECKLISTBOX
 
         list_item = gtk_list_item_new_with_label( str.mbc_str() );
 
@@ -255,6 +311,12 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
                             (GtkSignalFunc)gtk_listbox_button_press_callback,
                             (gpointer) this );
 
+        gtk_signal_connect_after( GTK_OBJECT(list_item),
+                            "button_release_event",
+                            (GtkSignalFunc)gtk_listbox_button_release_callback,
+                            (gpointer) this );
+
+#if wxUSE_CHECKLISTBOX
         if (m_hasCheckBoxes)
         {
             gtk_signal_connect( GTK_OBJECT(list_item),
@@ -262,19 +324,18 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
                             (GtkSignalFunc)gtk_listbox_key_press_callback,
                             (gpointer)this );
         }
+#endif // wxUSE_CHECKLISTBOX
 
         ConnectWidget( list_item );
 
         gtk_widget_show( list_item );
     }
 
-    m_parent->AddChild( this );
-
-    (m_parent->m_insertCallback)( m_parent, this );
+    m_parent->DoAddChild( this );
 
     PostCreation();
 
-    SetBackgroundColour( parent->GetBackgroundColour() );
+    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) );
     SetForegroundColour( parent->GetForegroundColour() );
     SetFont( parent->GetFont() );
 
@@ -356,11 +417,13 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
 
         deletedData.Add(clientData);
 
+#if wxUSE_CHECKLISTBOX
         // save check state
         if ( m_hasCheckBoxes )
         {
             deletedChecks.Add(((wxCheckListBox *)this)->IsChecked(pos + n));
         }
+#endif // wxUSE_CHECKLISTBOX
     }
 
     int nDeletedCount = n;
@@ -379,10 +442,12 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
     {
         Append(deletedLabels[n], deletedData[n]);
 
+#if wxUSE_CHECKLISTBOX
         if ( m_hasCheckBoxes )
         {
             ((wxCheckListBox *)this)->Check(pos + n, (bool)deletedChecks[n]);
         }
+#endif // wxUSE_CHECKLISTBOX
     }
 }
 
@@ -393,10 +458,12 @@ void wxListBox::AppendCommon( const wxString &item )
     GtkWidget *list_item;
 
     wxString label(item);
+#if wxUSE_CHECKLISTBOX
     if (m_hasCheckBoxes)
     {
         label.Prepend(CHECKBOX_STRING);
     }
+#endif // wxUSE_CHECKLISTBOX
 
     list_item = gtk_list_item_new_with_label( label.mbc_str() );
 
@@ -405,7 +472,7 @@ void wxListBox::AppendCommon( const wxString &item )
     gtk_signal_connect( GTK_OBJECT(list_item), "select",
       GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
 
-    if (GetWindowStyleFlag() & wxLB_MULTIPLE)
+    if (HasFlag(wxLB_MULTIPLE))
         gtk_signal_connect( GTK_OBJECT(list_item), "deselect",
           GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
 
@@ -414,6 +481,12 @@ void wxListBox::AppendCommon( const wxString &item )
                         (GtkSignalFunc)gtk_listbox_button_press_callback,
                         (gpointer) this );
 
+    gtk_signal_connect_after( GTK_OBJECT(list_item),
+                        "button_release_event",
+                        (GtkSignalFunc)gtk_listbox_button_release_callback,
+                        (gpointer) this );
+
+#if wxUSE_CHECKLISTBOX
     if (m_hasCheckBoxes)
     {
        gtk_signal_connect( GTK_OBJECT(list_item),
@@ -421,6 +494,7 @@ void wxListBox::AppendCommon( const wxString &item )
                            (GtkSignalFunc)gtk_listbox_key_press_callback,
                            (gpointer)this );
     }
+#endif // wxUSE_CHECKLISTBOX
 
     gtk_widget_show( list_item );
 
@@ -440,7 +514,7 @@ void wxListBox::AppendCommon( const wxString &item )
 #endif
 
 #if wxUSE_TOOLTIPS
-        if (m_toolTip) m_toolTip->Apply( this );
+        if (m_tooltip) m_tooltip->Apply( this );
 #endif
     }
 }
@@ -737,8 +811,10 @@ void wxListBox::SetString( int n, const wxString &string )
         GtkLabel *label = GTK_LABEL( bin->child );
 
         wxString str;
+#if wxUSE_CHECKLISTBOX
         if (m_hasCheckBoxes)
             str += CHECKBOX_STRING;
+#endif // wxUSE_CHECKLISTBOX
         str += string;
 
         gtk_label_set( label, str.mbc_str() );
@@ -844,9 +920,12 @@ void wxListBox::ApplyWidgetStyle()
     if (m_backgroundColour.Ok())
     {
         GdkWindow *window = GTK_WIDGET(m_list)->window;
-        m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
-        gdk_window_set_background( window, m_backgroundColour.GetColor() );
-        gdk_window_clear( window );
+        if ( window )
+        {
+            m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
+            gdk_window_set_background( window, m_backgroundColour.GetColor() );
+            gdk_window_clear( window );
+        }
     }
 
     GList *child = m_list->children;