Removed warnings

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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index b00f00aae13930fd0af3e32eed547ebb348b8268..4732b2814d36a9d46f85eb764f805b2af9382788 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -25,7 +25,7 @@
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------

-// wxListBox
+// "select" and "deselect"

 //-----------------------------------------------------------------------------
 
 static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox )
 //-----------------------------------------------------------------------------
 
 static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox )


@@ -57,6 +57,8 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox
   if (event.m_commandString) delete[] event.m_commandString ;
 }
 
   if (event.m_commandString) delete[] event.m_commandString ;
 }
 

+//-----------------------------------------------------------------------------
+// wxListBox

 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl)
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl)


@@ -83,11 +85,10 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
   
   m_list = GTK_LIST( gtk_list_new() );
   
   
   m_list = GTK_LIST( gtk_list_new() );
   

-  // @@ what's the difference between BROWSE and SINGLE?

   GtkSelectionMode mode = GTK_SELECTION_BROWSE;
   GtkSelectionMode mode = GTK_SELECTION_BROWSE;

-  if ( style & wxLB_MULTIPLE )
+  if (style & wxLB_MULTIPLE)

     mode = GTK_SELECTION_MULTIPLE;
     mode = GTK_SELECTION_MULTIPLE;

-  else if ( style & wxLB_EXTENDED )
+  else if (style & wxLB_EXTENDED)

     mode = GTK_SELECTION_EXTENDED;
 
   gtk_list_set_selection_mode( GTK_LIST(m_list), mode );
     mode = GTK_SELECTION_EXTENDED;
 
   gtk_list_set_selection_mode( GTK_LIST(m_list), mode );


@@ -95,6 +96,11 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
   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;


@@ -105,7 +111,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     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 );
   

-    if ( style & wxLB_MULTIPLE )
+    if (style & wxLB_MULTIPLE)

       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 );
   


@@ -143,7 +149,7 @@ void wxListBox::Append( const wxString &item, char *clientData )
   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 );
   

-  if ( GetWindowStyleFlag() & wxLB_MULTIPLE )
+  if (GetWindowStyleFlag() & wxLB_MULTIPLE)

     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 );
   


@@ -152,6 +158,11 @@ void wxListBox::Append( const wxString &item, char *clientData )
   gtk_container_add( GTK_CONTAINER(m_list), list_item );
   
   gtk_widget_show( list_item );
   gtk_container_add( GTK_CONTAINER(m_list), list_item );
   
   gtk_widget_show( list_item );

+  
+  ConnectWidget( list_item );
+  
+  ConnectDnDWidget( list_item );
+  

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


@@ -216,19 +227,14 @@ char *wxListBox::GetClientData( int n ) const
 
 int wxListBox::GetSelection(void) const
 {
 
 int wxListBox::GetSelection(void) const
 {

-  GList *selection = m_list->selection;
-  if (selection)
+  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;
 }
 
   return -1;
 }
 


@@ -381,6 +387,25 @@ int wxListBox::GetIndex( GtkWidget *item ) const
   return -1;
 }
 
   return -1;
 }
 

+void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
+{
+  GList *child = m_list->children;
+  while (child)
+  {
+    DisconnectDnDWidget( GTK_WIDGET( child->data ) );
+    child = child->next;
+  }
+  
+  wxWindow::SetDropTarget( dropTarget  );
+  
+  child = m_list->children;
+  while (child)
+  {
+    ConnectDnDWidget( GTK_WIDGET( child->data ) );
+    child = child->next;
+  }
+}
+

 GtkWidget *wxListBox::GetConnectWidget(void)
 {
   return GTK_WIDGET(m_list);
 GtkWidget *wxListBox::GetConnectWidget(void)
 {
   return GTK_WIDGET(m_list);


@@ -389,7 +414,7 @@ GtkWidget *wxListBox::GetConnectWidget(void)
 void wxListBox::SetFont( const wxFont &font )
 {
   wxWindow::SetFont( font );
 void wxListBox::SetFont( const wxFont &font )
 {
   wxWindow::SetFont( font );

-   
+

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


@@ -401,4 +426,19 @@ void wxListBox::SetFont( const wxFont &font )
   }
 }
 
   }
 }
 

+bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
+{
+  if (wxWindow::IsOwnGtkWindow( window )) return TRUE;
+  
+  GList *child = m_list->children;
+  while (child)
+  {
+    GtkBin *bin = (GtkBin*) child->data;
+    if (bin->child->window == window) return TRUE;
+    child = child->next;
+  }
+  
+  return FALSE;
+}
+