fixes

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

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index fa5a38a225c8c6dfeb86e32faa1d8d832cde5e21..bca38181d53126a97ffac0e31d8735c4ae188764 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -2,9 +2,8 @@
 // Name:        listbox.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        listbox.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -32,9 +31,9 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox
 {
   if (!listbox->HasVMT()) return;
   if (g_blockEventsOnDrag) return;
 {
   if (!listbox->HasVMT()) return;
   if (g_blockEventsOnDrag) return;

-  
+

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

-  
+

     wxArrayInt aSelections;
     int count = listbox->GetSelections(aSelections);
     if ( count > 0 )
     wxArrayInt aSelections;
     int count = listbox->GetSelections(aSelections);
     if ( count > 0 )


@@ -68,59 +67,69 @@ wxListBox::wxListBox(void)
   m_list = (GtkList *) NULL;
 }
 
   m_list = (GtkList *) NULL;
 }
 

-bool wxListBox::Create( wxWindow *parent, wxWindowID id, 
-      const wxPoint &pos, const wxSize &size, 
+bool wxListBox::Create( wxWindow *parent, wxWindowID id,
+      const wxPoint &pos, const wxSize &size,

       int n, const wxString choices[],
       long style, const wxValidator& validator, const wxString &name )
 {
   m_needParent = TRUE;
       int n, const wxString choices[],
       long style, const wxValidator& validator, const wxString &name )
 {
   m_needParent = TRUE;

-  
+

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

-  
+

   SetValidator( validator );
 
   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 );
   SetValidator( validator );
 
   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() );
   m_list = GTK_LIST( gtk_list_new() );

-  
-  GtkSelectionMode mode = GTK_SELECTION_SINGLE;
+
+  GtkSelectionMode mode = GTK_SELECTION_BROWSE;

   if (style & wxLB_MULTIPLE)
     mode = GTK_SELECTION_MULTIPLE;
   else if (style & wxLB_EXTENDED)
     mode = GTK_SELECTION_EXTENDED;
 
   gtk_list_set_selection_mode( GTK_LIST(m_list), mode );
   if (style & wxLB_MULTIPLE)
     mode = GTK_SELECTION_MULTIPLE;
   else if (style & wxLB_EXTENDED)
     mode = GTK_SELECTION_EXTENDED;
 
   gtk_list_set_selection_mode( GTK_LIST(m_list), mode );

-  
+

   gtk_container_add (GTK_CONTAINER(m_widget), GTK_WIDGET(m_list) );
   gtk_widget_show( GTK_WIDGET(m_list) );
   gtk_container_add (GTK_CONTAINER(m_widget), GTK_WIDGET(m_list) );
   gtk_widget_show( GTK_WIDGET(m_list) );

-  
+
+  wxSize newSize = size;
+  if (newSize.x == -1) newSize.x = 100;
+  if (newSize.y == -1) newSize.y = 110;
+  SetSize( newSize.x, newSize.y );
+

   for (int i = 0; i < n; i++)
   {
     GtkWidget *list_item;
   for (int i = 0; i < n; i++)
   {
     GtkWidget *list_item;

-    list_item = gtk_list_item_new_with_label( choices[i] ); 
-  
+    list_item = gtk_list_item_new_with_label( choices[i] );
+

     gtk_container_add( GTK_CONTAINER(m_list), list_item );
     gtk_container_add( GTK_CONTAINER(m_list), list_item );

-    
-    gtk_signal_connect( GTK_OBJECT(list_item), "select", 
+
+    gtk_signal_connect( GTK_OBJECT(list_item), "select",

       GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
       GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );

-  
+

     if (style & wxLB_MULTIPLE)
     if (style & wxLB_MULTIPLE)

-      gtk_signal_connect( GTK_OBJECT(list_item), "deselect", 
+      gtk_signal_connect( GTK_OBJECT(list_item), "deselect",

         GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
         GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );

-  
+
+    ConnectWidget( list_item );        
+       

     m_clientData.Append( (wxObject*)NULL );
     m_clientData.Append( (wxObject*)NULL );

-    
+

     gtk_widget_show( list_item );
   }
     gtk_widget_show( list_item );
   }

- 
+

   PostCreation();
   PostCreation();

-  
+

   gtk_widget_realize( GTK_WIDGET(m_list) );
   gtk_widget_realize( GTK_WIDGET(m_list) );

-  
+
+  SetBackgroundColour( parent->GetBackgroundColour() );
+  SetForegroundColour( parent->GetForegroundColour() );
+

   Show( TRUE );
   Show( TRUE );

-  
+

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -131,56 +140,57 @@ void wxListBox::Append( const wxString &item )
 
 void wxListBox::Append( const wxString &item, char *clientData )
 {
 
 void wxListBox::Append( const wxString &item, char *clientData )
 {

-  GtkWidget *list_item = gtk_list_item_new_with_label( item ); 
-  
-  if (m_hasOwnStyle)
-  {
-    GtkBin *bin = GTK_BIN( list_item );
-    gtk_widget_set_style( bin->child, 
-      gtk_style_ref(
-        gtk_widget_get_style( m_widget ) ) ); 
-  }
-  
-  gtk_signal_connect( GTK_OBJECT(list_item), "select", 
+  wxCHECK_RET( m_list != NULL, "invalid listbox" );
+
+  GtkWidget *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_FUNC(gtk_listitem_select_callback), (gpointer)this );

-  
+

   if (GetWindowStyleFlag() & wxLB_MULTIPLE)
   if (GetWindowStyleFlag() & wxLB_MULTIPLE)

-    gtk_signal_connect( GTK_OBJECT(list_item), "deselect", 
+    gtk_signal_connect( GTK_OBJECT(list_item), "deselect",

       GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
       GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );

-  
+
+  ConnectWidget( list_item );  
+       

   m_clientData.Append( (wxObject*)clientData );
   m_clientData.Append( (wxObject*)clientData );

-  
+

   gtk_container_add( GTK_CONTAINER(m_list), list_item );
   gtk_container_add( GTK_CONTAINER(m_list), list_item );

+
+  if (m_widgetStyle) ApplyWidgetStyle();

   
   gtk_widget_show( list_item );
   
   gtk_widget_show( list_item );

-  
+

   ConnectWidget( list_item );
   ConnectWidget( list_item );

-  
+

   ConnectDnDWidget( list_item );
   ConnectDnDWidget( list_item );

-  

 }
 
 void wxListBox::Clear(void)
 {
 }
 
 void wxListBox::Clear(void)
 {

+  wxCHECK_RET( m_list != NULL, "invalid listbox" );
+

   gtk_list_clear_items( m_list, 0, Number() );
   gtk_list_clear_items( m_list, 0, Number() );

-  
+

   m_clientData.Clear();
 }
 
 void wxListBox::Delete( int n )
 {
   m_clientData.Clear();
 }
 
 void wxListBox::Delete( int n )
 {

+  wxCHECK_RET( m_list != NULL, "invalid listbox" );
+

   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;
   }
   if (!child)
   {
     wxFAIL_MSG("wrong listbox index");
     return;
   }

-  
+

   GList *list = g_list_append( NULL, child->data );
   gtk_list_remove_items( m_list, list );
   g_list_free( list );
   GList *list = g_list_append( NULL, child->data );
   gtk_list_remove_items( m_list, list );
   g_list_free( list );

-  
+

   wxNode *node = m_clientData.Nth( n );
   if (!node)
   {
   wxNode *node = m_clientData.Nth( n );
   if (!node)
   {


@@ -192,11 +202,15 @@ void wxListBox::Delete( int n )
 
 void wxListBox::Deselect( int n )
 {
 
 void wxListBox::Deselect( int n )
 {

+  wxCHECK_RET( m_list != NULL, "invalid listbox" );
+

   gtk_list_unselect_item( m_list, n );
 }
 
 int wxListBox::FindString( const wxString &item ) const
 {
   gtk_list_unselect_item( m_list, n );
 }
 
 int wxListBox::FindString( const wxString &item ) const
 {

+  wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" );
+  

   GList *child = m_list->children;
   int count = 0;
   while (child)
   GList *child = m_list->children;
   int count = 0;
   while (child)


@@ -207,66 +221,73 @@ int wxListBox::FindString( const wxString &item ) const
     count++;
     child = child->next;
   }
     count++;
     child = child->next;
   }

-  wxFAIL_MSG("wrong listbox index");
+
+  // it's not an error if the string is not found - this function may be used to
+  // test for existence of the string in the listbox, so don't give any
+  // errors/assert failures.
+

   return -1;
 }
 
 char *wxListBox::GetClientData( int n ) const
 {
   return -1;
 }
 
 char *wxListBox::GetClientData( int n ) const
 {

+  wxCHECK_MSG( m_list != NULL, (char*) NULL, "invalid listbox" );
+  

   wxNode *node = m_clientData.Nth( n );
   if (node) return ((char*)node->Data());
   wxNode *node = m_clientData.Nth( n );
   if (node) return ((char*)node->Data());

-  
+

   wxFAIL_MSG("wrong listbox index");
   return (char *) NULL;
 }
 
 int wxListBox::GetSelection(void) const
 {
   wxFAIL_MSG("wrong listbox index");
   return (char *) NULL;
 }
 
 int wxListBox::GetSelection(void) const
 {

-  GList *selection = m_list->selection;
-  if (selection)
+  wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" );
+  
+  GList *child = m_list->children;
+  int count = 0;
+  while (child)

   {
   {

-    GList *child = m_list->children;
-    int count = 0;
-    while (child)
-    {
-      if (child->data == selection->data) return count;
-      count++;
-      child = child->next;
-    }
+    if (GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED) return count;
+    count++;
+    child = child->next;

   }
   }

-  wxFAIL_MSG("wrong listbox index");

   return -1;
 }
 
 int wxListBox::GetSelections(wxArrayInt& aSelections) const
 {
   return -1;
 }
 
 int wxListBox::GetSelections(wxArrayInt& aSelections) const
 {

+  wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" );
+  

   // get the number of selected items first
   GList *child = m_list->children;
   int count = 0;
   // get the number of selected items first
   GList *child = m_list->children;
   int count = 0;

-  for ( child = m_list->children; child != NULL; child = child->next ) 
+  for ( child = m_list->children; child != NULL; child = child->next )

   {
   {

-    if ( GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED ) 
+    if ( GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED )

       count++;
   }
 
   aSelections.Empty();
       count++;
   }
 
   aSelections.Empty();

-  
+

   if ( count > 0 ) {
     // now fill the list
     aSelections.Alloc(count); // optimization attempt
     int i = 0;
   if ( count > 0 ) {
     // now fill the list
     aSelections.Alloc(count); // optimization attempt
     int i = 0;

-    for ( child = m_list->children; child != NULL; child = child->next, i++ ) 
+    for ( child = m_list->children; child != NULL; child = child->next, i++ )

     {
     {

-      if ( GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED ) 
+      if ( GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED )

         aSelections.Add(i);
     }
   }
         aSelections.Add(i);
     }
   }

-  
+

   return count;
 }
 
 wxString wxListBox::GetString( int n ) const
 {
   return count;
 }
 
 wxString wxListBox::GetString( int n ) const
 {

+  wxCHECK_MSG( m_list != NULL, "", "invalid listbox" );
+  

   GList *child = g_list_nth( m_list->children, n );
   if (child)
   {
   GList *child = g_list_nth( m_list->children, n );
   if (child)
   {


@@ -280,6 +301,8 @@ wxString wxListBox::GetString( int n ) const
 
 wxString wxListBox::GetStringSelection(void) const
 {
 
 wxString wxListBox::GetStringSelection(void) const
 {

+  wxCHECK_MSG( m_list != NULL, "", "invalid listbox" );
+  

   GList *selection = m_list->selection;
   if (selection)
   {
   GList *selection = m_list->selection;
   if (selection)
   {


@@ -293,6 +316,8 @@ wxString wxListBox::GetStringSelection(void) const
 
 int wxListBox::Number(void)
 {
 
 int wxListBox::Number(void)
 {

+  wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" );
+  

   GList *child = m_list->children;
   int count = 0;
   while (child) { count++; child = child->next; }
   GList *child = m_list->children;
   int count = 0;
   while (child) { count++; child = child->next; }


@@ -301,6 +326,8 @@ int wxListBox::Number(void)
 
 bool wxListBox::Selected( int n )
 {
 
 bool wxListBox::Selected( int n )
 {

+  wxCHECK_MSG( m_list != NULL, FALSE, "invalid listbox" );
+  

   GList *target = g_list_nth( m_list->children, n );
   if (target)
   {
   GList *target = g_list_nth( m_list->children, n );
   if (target)
   {


@@ -322,9 +349,11 @@ void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) )
 
 void wxListBox::SetClientData( int n, char *clientData )
 {
 
 void wxListBox::SetClientData( int n, char *clientData )
 {

+  wxCHECK_RET( m_list != NULL, "invalid listbox" );
+  

   wxNode *node = m_clientData.Nth( n );
   if (node)
   wxNode *node = m_clientData.Nth( n );
   if (node)

-  { 
+  {

     node->SetData( (wxObject*)clientData );
   }
   else
     node->SetData( (wxObject*)clientData );
   }
   else


@@ -345,6 +374,8 @@ void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) )
 
 void wxListBox::SetSelection( int n, bool select )
 {
 
 void wxListBox::SetSelection( int n, bool select )
 {

+  wxCHECK_RET( m_list != NULL, "invalid listbox" );
+  

   if (select)
     gtk_list_select_item( m_list, n );
   else
   if (select)
     gtk_list_select_item( m_list, n );
   else


@@ -353,6 +384,8 @@ void wxListBox::SetSelection( int n, bool select )
 
 void wxListBox::SetString( int n, const wxString &string )
 {
 
 void wxListBox::SetString( int n, const wxString &string )
 {

+  wxCHECK_RET( m_list != NULL, "invalid listbox" );
+  

   GList *child = g_list_nth( m_list->children, n );
   if (child)
   {
   GList *child = g_list_nth( m_list->children, n );
   if (child)
   {


@@ -368,6 +401,8 @@ void wxListBox::SetString( int n, const wxString &string )
 
 void wxListBox::SetStringSelection( const wxString &string, bool select )
 {
 
 void wxListBox::SetStringSelection( const wxString &string, bool select )
 {

+  wxCHECK_RET( m_list != NULL, "invalid listbox" );
+  

   SetSelection( FindString(string), select );
 }
 
   SetSelection( FindString(string), select );
 }
 


@@ -389,15 +424,17 @@ int wxListBox::GetIndex( GtkWidget *item ) const
 
 void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
 {
 
 void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
 {

+  wxCHECK_RET( m_list != NULL, "invalid listbox" );
+  

   GList *child = m_list->children;
   while (child)
   {
     DisconnectDnDWidget( GTK_WIDGET( child->data ) );
     child = child->next;
   }
   GList *child = m_list->children;
   while (child)
   {
     DisconnectDnDWidget( GTK_WIDGET( child->data ) );
     child = child->next;
   }

-  
+

   wxWindow::SetDropTarget( dropTarget  );
   wxWindow::SetDropTarget( dropTarget  );

-  
+

   child = m_list->children;
   while (child)
   {
   child = m_list->children;
   while (child)
   {


@@ -411,19 +448,35 @@ GtkWidget *wxListBox::GetConnectWidget(void)
   return GTK_WIDGET(m_list);
 }
 
   return GTK_WIDGET(m_list);
 }
 

-void wxListBox::SetFont( const wxFont &font )
+bool wxListBox::IsOwnGtkWindow( GdkWindow *window )

 {
 {

-  wxWindow::SetFont( font );
+  if (wxWindow::IsOwnGtkWindow( window )) return TRUE;

 
   GList *child = m_list->children;
   while (child)
   {
 
   GList *child = m_list->children;
   while (child)
   {

-    GtkBin *bin = (GtkBin*) child->data;
-    gtk_widget_set_style( bin->child, 
-      gtk_style_ref(
-        gtk_widget_get_style( m_widget ) ) ); 
+    GtkWidget *bin = GTK_WIDGET( child->data );
+    if (bin->window == window) return TRUE;

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

-}

 
 

+  return FALSE;
+}

 
 

+void wxListBox::ApplyWidgetStyle()
+{
+  SetWidgetStyle();
+  
+  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 );
+      
+  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 );
+    child = child->next;
+  }
+}