Made wxGTK dataobj.cpp compile; removed flashing from wxGLCanvas samples;

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

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 2793afeb92834d7d244ba69768ebeba5a623436f..32cf66671e2e3169d8ecb0c60e2ce98a65446050 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -15,7 +15,15 @@
 #include "wx/dynarray.h"
 #include "wx/listbox.h"
 #include "wx/utils.h"
 #include "wx/dynarray.h"
 #include "wx/listbox.h"
 #include "wx/utils.h"

-#include <wx/intl.h>
+#include "wx/intl.h"
+#include "wx/checklst.h"
+
+#if wxUSE_DRAG_AND_DROP
+#include "wx/dnd.h"
+#endif
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"

 
 //-------------------------------------------------------------------------
 // conditional compilation
 
 //-------------------------------------------------------------------------
 // conditional compilation


@@ -32,6 +40,88 @@
 //-----------------------------------------------------------------------------
 
 extern bool   g_blockEventsOnDrag;
 //-----------------------------------------------------------------------------
 
 extern bool   g_blockEventsOnDrag;

+extern bool   g_blockEventsOnScroll;
+
+//-----------------------------------------------------------------------------
+// "button_press_event"
+//-----------------------------------------------------------------------------
+
+static gint 
+gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox )
+{
+    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) );
+    
+        wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() );
+        event.SetEventObject( listbox );
+        event.SetInt( sel );
+        listbox->GetEventHandler()->ProcessEvent( event );
+    }
+    
+    if (gdk_event->type == GDK_2BUTTON_PRESS)
+    {
+        wxCommandEvent event( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
+        event.SetEventObject( listbox );
+       
+        wxArrayInt aSelections;
+        int count = listbox->GetSelections(aSelections);
+        if ( count > 0 )
+        {
+            event.m_commandInt = aSelections[0] ;
+            event.m_clientData = listbox->GetClientData( event.m_commandInt );
+            wxString str(listbox->GetString(event.m_commandInt));
+            if (str != "") event.m_commandString = copystring((char *)(const char *)str);
+        }
+        else
+        {
+            event.m_commandInt = -1 ;
+            event.m_commandString = copystring("") ;
+        }
+
+        listbox->GetEventHandler()->ProcessEvent( event );
+       
+        if (event.m_commandString) delete[] event.m_commandString ;
+    }
+
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "key_press_event"
+//-----------------------------------------------------------------------------
+
+static gint 
+gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox )
+{
+    if (g_blockEventsOnDrag) return FALSE;
+
+    if (!listbox->HasVMT()) return FALSE;
+
+    if (gdk_event->keyval != ' ') return FALSE;
+    
+    int sel = listbox->GetIndex( widget );
+    
+    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 );
+       
+    return FALSE;
+}

 
 //-----------------------------------------------------------------------------
 // "select" and "deselect"
 
 //-----------------------------------------------------------------------------
 // "select" and "deselect"


@@ -74,6 +164,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl)
 wxListBox::wxListBox()
 {
     m_list = (GtkList *) NULL;
 wxListBox::wxListBox()
 {
     m_list = (GtkList *) NULL;

+    m_hasCheckBoxes = FALSE;

 }
 
 bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 }
 
 bool wxListBox::Create( wxWindow *parent, wxWindowID id,


@@ -82,6 +173,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
                         long style, const wxValidator& validator, const wxString &name )
 {
     m_needParent = TRUE;
                         long style, const wxValidator& validator, const wxString &name )
 {
     m_needParent = TRUE;

+    m_acceptsFocus = TRUE;

 
     PreCreation( parent, id, pos, size, style, name );
 
 
     PreCreation( parent, id, pos, size, style, name );
 


@@ -90,7 +182,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL );
     gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget),
       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
     m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL );
     gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget),
       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );

-
+      

     m_list = GTK_LIST( gtk_list_new() );
 
     GtkSelectionMode mode = GTK_SELECTION_BROWSE;
     m_list = GTK_LIST( gtk_list_new() );
 
     GtkSelectionMode mode = GTK_SELECTION_BROWSE;


@@ -107,6 +199,25 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_list) );
 #endif
 
     gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_list) );
 #endif
 

+#ifdef __WXDEBUG__
+    debug_focus_in( m_widget, "wxListBox::m_widget", name );
+    
+    debug_focus_in( GTK_WIDGET(m_list), "wxListBox::m_list", name );
+
+    GtkScrolledWindow *s_window = GTK_SCROLLED_WINDOW(m_widget);
+
+    debug_focus_in( s_window->hscrollbar, "wxWindow::hsrcollbar", name );
+    debug_focus_in( s_window->vscrollbar, "wxWindow::vsrcollbar", name );
+
+#ifdef NEW_GTK_SCROLL_CODE
+    GtkViewport *viewport = GTK_VIEWPORT(s_window->child);
+#else
+    GtkViewport *viewport = GTK_VIEWPORT(s_window->viewport);
+#endif
+
+    debug_focus_in( GTK_WIDGET(viewport), "wxWindow::viewport", name );
+#endif
+

     gtk_widget_show( GTK_WIDGET(m_list) );
 
     wxSize newSize = size;
     gtk_widget_show( GTK_WIDGET(m_list) );
 
     wxSize newSize = size;


@@ -120,8 +231,22 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
         m_clientObjectList.Append( (wxObject*) NULL );
   
         GtkWidget *list_item;
         m_clientObjectList.Append( (wxObject*) NULL );
   
         GtkWidget *list_item;

-        list_item = gtk_list_item_new_with_label( choices[i] );
-
+       
+       if (m_hasCheckBoxes)
+       {
+            wxString str = "[-] ";
+           str += choices[i];
+            list_item = gtk_list_item_new_with_label( str );
+       }
+       else
+       {
+            list_item = gtk_list_item_new_with_label( choices[i] );
+       }
+
+#ifdef __WXDEBUG__
+        debug_focus_in( list_item, "wxListBox::list_item", name );
+#endif    
+    

         gtk_container_add( GTK_CONTAINER(m_list), list_item );
 
         gtk_signal_connect( GTK_OBJECT(list_item), "select",
         gtk_container_add( GTK_CONTAINER(m_list), list_item );
 
         gtk_signal_connect( GTK_OBJECT(list_item), "select",


@@ -131,6 +256,19 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
             gtk_signal_connect( GTK_OBJECT(list_item), "deselect",
               GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
 
             gtk_signal_connect( GTK_OBJECT(list_item), "deselect",
               GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
 

+        gtk_signal_connect( GTK_OBJECT(list_item), 
+                           "button_press_event",
+                            (GtkSignalFunc)gtk_listbox_button_press_callback, 
+                           (gpointer) this );
+       
+       if (m_hasCheckBoxes)
+       {
+            gtk_signal_connect( GTK_OBJECT(list_item), 
+                           "key_press_event",
+                            (GtkSignalFunc)gtk_listbox_key_press_callback, 
+                           (gpointer)this );
+       }
+       

         ConnectWidget( list_item );    
        
         gtk_widget_show( list_item );
         ConnectWidget( list_item );    
        
         gtk_widget_show( list_item );


@@ -154,14 +292,25 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
 wxListBox::~wxListBox()
 {
 
 wxListBox::~wxListBox()
 {

-  Clear();
+    Clear();

 }
 
 void wxListBox::AppendCommon( const wxString &item )
 {
     wxCHECK_RET( m_list != NULL, "invalid listbox" );
   
 }
 
 void wxListBox::AppendCommon( const wxString &item )
 {
     wxCHECK_RET( m_list != NULL, "invalid listbox" );
   

-    GtkWidget *list_item = gtk_list_item_new_with_label( item );
+    GtkWidget *list_item;
+    
+    if (m_hasCheckBoxes)
+    {
+        wxString str = "[-] ";
+       str += item;
+        list_item = gtk_list_item_new_with_label( str );
+    }
+    else
+    {
+        list_item = gtk_list_item_new_with_label( item );
+    }

 
     gtk_signal_connect( GTK_OBJECT(list_item), "select",
       GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
 
     gtk_signal_connect( GTK_OBJECT(list_item), "select",
       GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );


@@ -174,13 +323,28 @@ void wxListBox::AppendCommon( const wxString &item )
 
     if (m_widgetStyle) ApplyWidgetStyle();
   
 
     if (m_widgetStyle) ApplyWidgetStyle();
   

+    gtk_signal_connect( GTK_OBJECT(list_item), 
+                       "button_press_event",
+                        (GtkSignalFunc)gtk_listbox_button_press_callback, 
+                       (gpointer) this );
+    
+    if (m_hasCheckBoxes)
+    {
+       gtk_signal_connect( GTK_OBJECT(list_item), 
+                       "key_press_event",
+                        (GtkSignalFunc)gtk_listbox_key_press_callback, 
+                       (gpointer)this );
+    }
+       

     gtk_widget_show( list_item );
 
     ConnectWidget( list_item );
 
     gtk_widget_show( list_item );
 
     ConnectWidget( list_item );
 

+#if wxUSE_DRAG_AND_DROP

 #ifndef NEW_GTK_DND_CODE
     if (m_dropTarget) m_dropTarget->RegisterWidget( list_item );
 #endif
 #ifndef NEW_GTK_DND_CODE
     if (m_dropTarget) m_dropTarget->RegisterWidget( list_item );
 #endif

+#endif

 }
 
 void wxListBox::Append( const wxString &item )
 }
 
 void wxListBox::Append( const wxString &item )


@@ -274,13 +438,9 @@ void wxListBox::Delete( int n )
 
     GList *child = g_list_nth( m_list->children, n );
 
 
     GList *child = g_list_nth( m_list->children, n );
 

-    if (!child)
-    {
-      wxFAIL_MSG("wrong listbox index");
-      return;
-    }
+    wxCHECK_RET( child, "wrong listbox index" );

 
 

-    GList *list = g_list_append( NULL, child->data );
+    GList *list = g_list_append( (GList*) NULL, child->data );

     gtk_list_remove_items( m_list, list );
     g_list_free( list );
 
     gtk_list_remove_items( m_list, list );
     g_list_free( list );
 


@@ -316,7 +476,12 @@ int wxListBox::FindString( const wxString &item ) const
     {
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
     {
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );

-        if (item == label->label) return count;
+       
+       wxString str = label->label;
+       if (m_hasCheckBoxes) str.Remove( 0, 4 );
+       
+        if (str == item) return count;
+       

         count++;
         child = child->next;
     }
         count++;
         child = child->next;
     }


@@ -380,7 +545,11 @@ wxString wxListBox::GetString( int n ) const
     {
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
     {
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );

-        return label->label;
+       
+       wxString str = label->label;
+       if (m_hasCheckBoxes) str.Remove( 0, 4 );
+       
+        return str;

     }
     wxFAIL_MSG("wrong listbox index");
     return "";
     }
     wxFAIL_MSG("wrong listbox index");
     return "";


@@ -394,9 +563,14 @@ wxString wxListBox::GetStringSelection() const
     if (selection)
     {
         GtkBin *bin = GTK_BIN( selection->data );
     if (selection)
     {
         GtkBin *bin = GTK_BIN( selection->data );

-        wxString tmp = GTK_LABEL( bin->child )->label;
-        return tmp;
+        GtkLabel *label = GTK_LABEL( bin->child );
+       
+       wxString str = label->label;
+       if (m_hasCheckBoxes) str.Remove( 0, 4 );
+       
+        return str;

     }
     }

+    

     wxFAIL_MSG("no listbox selection available");
     return "";
 }
     wxFAIL_MSG("no listbox selection available");
     return "";
 }


@@ -463,7 +637,12 @@ void wxListBox::SetString( int n, const wxString &string )
     {
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
     {
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );

-        gtk_label_set( label, string );
+       
+       wxString str;
+       if (m_hasCheckBoxes) str += "[-] ";
+       str += string;
+       
+        gtk_label_set( label, str );

     }
     else
     {
     }
     else
     {


@@ -494,6 +673,7 @@ int wxListBox::GetIndex( GtkWidget *item ) const
     return -1;
 }
 
     return -1;
 }
 

+#if wxUSE_DRAG_AND_DROP

 void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
 {
     wxCHECK_RET( m_list != NULL, "invalid listbox" );
 void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
 {
     wxCHECK_RET( m_list != NULL, "invalid listbox" );


@@ -524,6 +704,7 @@ void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
     }
 #endif
 }
     }
 #endif
 }

+#endif

 
 GtkWidget *wxListBox::GetConnectWidget()
 {
 
 GtkWidget *wxListBox::GetConnectWidget()
 {


@@ -560,8 +741,12 @@ void wxListBox::ApplyWidgetStyle()
     GList *child = m_list->children;
     while (child)
     {
     GList *child = m_list->children;
     while (child)
     {

-        gtk_widget_set_style( GTK_BIN(child->data)->child, m_widgetStyle );

         gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle );
         gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle );

+       
+        GtkBin *bin = GTK_BIN( child->data );
+        GtkWidget *label = GTK_WIDGET( bin->child );
+        gtk_widget_set_style( label, m_widgetStyle );
+       

         child = child->next;
     }
 }
         child = child->next;
     }
 }