Added missing include

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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index a2cf2b46aa71a73a0cca0c3727ab09df57c5e78a..cd1a4016372eaeafe151c1720b949f7934503a0f 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        listbox.cpp
+// Name:        src/gtk/listbox.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,11 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "listbox.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -67,7 +62,8 @@ struct wxlistbox_idle_struct
     gint         m_tag;
 };
 
     gint         m_tag;
 };
 

-extern "C" gint wxlistbox_idle_callback( gpointer gdata )
+extern "C" {
+static 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();


@@ -88,11 +84,13 @@ extern "C" gint wxlistbox_idle_callback( gpointer gdata )
 
     return TRUE;
 }
 
     return TRUE;
 }

+}

 
 //-----------------------------------------------------------------------------
 // "focus_in_event"
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "focus_in_event"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static gint gtk_listitem_focus_in_callback( GtkWidget *widget,
                                           GdkEvent *WXUNUSED(event),
                                           wxWindow *win )
 static gint gtk_listitem_focus_in_callback( GtkWidget *widget,
                                           GdkEvent *WXUNUSED(event),
                                           wxWindow *win )


@@ -108,7 +106,7 @@ static gint gtk_listitem_focus_in_callback( GtkWidget *widget,
     {
         // not yet, notify it
         win->m_hasFocus = TRUE;
     {
         // not yet, notify it
         win->m_hasFocus = TRUE;

-        
+

         wxChildFocusEvent eventChildFocus(win);
         (void)win->GetEventHandler()->ProcessEvent(eventChildFocus);
 
         wxChildFocusEvent eventChildFocus(win);
         (void)win->GetEventHandler()->ProcessEvent(eventChildFocus);
 


@@ -120,11 +118,13 @@ static gint gtk_listitem_focus_in_callback( GtkWidget *widget,
 
     return FALSE;
 }
 
     return FALSE;
 }

+}

 
 //-----------------------------------------------------------------------------
 // "focus_out_event"
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "focus_out_event"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static gint gtk_listitem_focus_out_callback( GtkWidget *widget, GdkEventFocus *gdk_event, wxWindowGTK *win )
 {
     if (g_isIdle)
 static gint gtk_listitem_focus_out_callback( GtkWidget *widget, GdkEventFocus *gdk_event, wxWindowGTK *win )
 {
     if (g_isIdle)


@@ -150,6 +150,7 @@ static gint gtk_listitem_focus_out_callback( GtkWidget *widget, GdkEventFocus *g
 
     return FALSE;
 }
 
     return FALSE;
 }

+}

 
 //-----------------------------------------------------------------------------
 // "button_release_event"
 
 //-----------------------------------------------------------------------------
 // "button_release_event"


@@ -161,6 +162,7 @@ static gint gtk_listitem_focus_out_callback( GtkWidget *widget, GdkEventFocus *g
    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 */
 
    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 */
 

+extern "C" {

 static gint
 gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget),
                                      GdkEventButton * WXUNUSED(gdk_event),
 static gint
 gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget),
                                      GdkEventButton * WXUNUSED(gdk_event),


@@ -200,11 +202,13 @@ gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget),
 
     return FALSE;
 }
 
     return FALSE;
 }

+}

 
 //-----------------------------------------------------------------------------
 // "button_press_event"
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "button_press_event"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static gint
 gtk_listbox_button_press_callback( GtkWidget *widget,
                                    GdkEventButton *gdk_event,
 static gint
 gtk_listbox_button_press_callback( GtkWidget *widget,
                                    GdkEventButton *gdk_event,


@@ -233,16 +237,34 @@ gtk_listbox_button_press_callback( GtkWidget *widget,
     }
 #endif // wxUSE_CHECKLISTBOX
 
     }
 #endif // wxUSE_CHECKLISTBOX
 

+    if ((gdk_event->state == 0) &&
+         (((listbox->GetWindowStyleFlag() & wxLB_MULTIPLE) != 0) ||
+          ((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) )
+    {
+            listbox->m_blockEvent = TRUE;
+
+            int i;
+            for (i = 0; i < (int)listbox->GetCount(); i++)
+                if (i != sel)
+                    gtk_list_unselect_item( GTK_LIST(listbox->m_list), i );
+
+            listbox->m_blockEvent = FALSE;
+
+            return false;
+    }
+

     /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */
     g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS);
 
     return FALSE;
 }
     /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */
     g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS);
 
     return FALSE;
 }

+}

 
 //-----------------------------------------------------------------------------
 // "key_press_event"
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "key_press_event"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static gint
 gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox )
 {
 static gint
 gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox )
 {


@@ -288,21 +310,21 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
 #endif // wxUSE_CHECKLISTBOX
 
     // Check or uncheck item with SPACE
 #endif // wxUSE_CHECKLISTBOX
 
     // Check or uncheck item with SPACE

-    if ((gdk_event->keyval == ' ') && (!ret) && 
+    if ((gdk_event->keyval == ' ') && (!ret) &&

          (((listbox->GetWindowStyleFlag() & wxLB_MULTIPLE) != 0) ||
           ((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) )
     {
         int sel = listbox->GtkGetIndex( widget );
          (((listbox->GetWindowStyleFlag() & wxLB_MULTIPLE) != 0) ||
           ((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) )
     {
         int sel = listbox->GtkGetIndex( widget );

-        
+

         if (sel != -1)
         {
             ret = TRUE;
         if (sel != -1)
         {
             ret = TRUE;

-            
+

             if (listbox->IsSelected( sel ))
                 gtk_list_unselect_item( listbox->m_list, sel );
             else
                 gtk_list_select_item( listbox->m_list, sel );
             if (listbox->IsSelected( sel ))
                 gtk_list_unselect_item( listbox->m_list, sel );
             else
                 gtk_list_select_item( listbox->m_list, sel );

-            
+

             wxCommandEvent new_event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
             new_event.SetEventObject( listbox );
             wxArrayInt aSelections;
             wxCommandEvent new_event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
             new_event.SetEventObject( listbox );
             wxArrayInt aSelections;


@@ -324,32 +346,21 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
             listbox->GetEventHandler()->ProcessEvent( new_event );
         }
     }
             listbox->GetEventHandler()->ProcessEvent( new_event );
         }
     }

-    
+

     if (ret)
     {
     if (ret)
     {

-        gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
+        g_signal_stop_emission_by_name (widget, "key_press_event");

         return TRUE;
     }
 
     return FALSE;
 }
         return TRUE;
     }
 
     return FALSE;
 }

+}

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

-static void gtk_listitem_select_cb( GtkWidget *widget, wxListBox *listbox, bool is_selection );
-
-static void gtk_listitem_select_callback( GtkWidget *widget, wxListBox *listbox )
-{
-    gtk_listitem_select_cb( widget, listbox, TRUE );
-}
-
-static void gtk_listitem_deselect_callback( GtkWidget *widget, wxListBox *listbox )
-{
-    gtk_listitem_select_cb( widget, listbox, FALSE );
-}
-

 static void gtk_listitem_select_cb( GtkWidget *widget,
                                     wxListBox *listbox,
                                     bool is_selection )
 static void gtk_listitem_select_cb( GtkWidget *widget,
                                     wxListBox *listbox,
                                     bool is_selection )


@@ -400,22 +411,38 @@ static void gtk_listitem_select_cb( GtkWidget *widget,
     listbox->GetEventHandler()->ProcessEvent( event );
 }
 
     listbox->GetEventHandler()->ProcessEvent( event );
 }
 

+extern "C" {
+static void gtk_listitem_select_callback( GtkWidget *widget, wxListBox *listbox )
+{
+    gtk_listitem_select_cb( widget, listbox, TRUE );
+}
+}
+
+extern "C" {
+static void gtk_listitem_deselect_callback( GtkWidget *widget, wxListBox *listbox )
+{
+    gtk_listitem_select_cb( widget, listbox, FALSE );
+}
+}
+

 //-----------------------------------------------------------------------------
 // wxListBox
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxListBox
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static gint
 gtk_listbox_realized_callback( GtkWidget *m_widget, wxListBox *win )
 {
     if (g_isIdle)
         wxapp_install_idle_handler();
 static gint
 gtk_listbox_realized_callback( GtkWidget *m_widget, wxListBox *win )
 {
     if (g_isIdle)
         wxapp_install_idle_handler();

-        
+

     GList *child = win->m_list->children;
     for (child = win->m_list->children; child != NULL; child = child->next)
         gtk_widget_show( GTK_WIDGET(child->data) );
     GList *child = win->m_list->children;
     for (child = win->m_list->children; child != NULL; child = child->next)
         gtk_widget_show( GTK_WIDGET(child->data) );

-    
+

     return false;
 }
     return false;
 }

+}

 
 //-----------------------------------------------------------------------------
 // wxListBox
 
 //-----------------------------------------------------------------------------
 // wxListBox


@@ -492,7 +519,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     {
         // if style was 0 set single mode
         m_windowStyle |= wxLB_SINGLE;
     {
         // if style was 0 set single mode
         m_windowStyle |= wxLB_SINGLE;

-        mode = GTK_SELECTION_MULTIPLE;
+        mode = GTK_SELECTION_SINGLE;

     }
 
     gtk_list_set_selection_mode( GTK_LIST(m_list), mode );
     }
 
     gtk_list_set_selection_mode( GTK_LIST(m_list), mode );


@@ -507,9 +534,9 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     gtk_widget_show( GTK_WIDGET(m_list) );
 
 
     gtk_widget_show( GTK_WIDGET(m_list) );
 

-    gtk_signal_connect( GTK_OBJECT(m_list), "realize",
-                        GTK_SIGNAL_FUNC(gtk_listbox_realized_callback), (gpointer) this );
-                            
+    g_signal_connect (m_list, "realize",
+                      G_CALLBACK (gtk_listbox_realized_callback), this);
+

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


@@ -669,41 +696,37 @@ void wxListBox::GtkAddItem( const wxString &item, int pos )
     else
         gtk_list_insert_items( GTK_LIST (m_list), gitem_list, pos );
 
     else
         gtk_list_insert_items( GTK_LIST (m_list), gitem_list, pos );
 

-    gtk_signal_connect_after( GTK_OBJECT(list_item), "select",
-      GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
+    g_signal_connect_after (list_item, "select",
+                            G_CALLBACK (gtk_listitem_select_callback),
+                            this);

 
     if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED))
 
     if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED))

-        gtk_signal_connect_after( GTK_OBJECT(list_item), "deselect",
-          GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
-
-    gtk_signal_connect( GTK_OBJECT(list_item),
-                        "button_press_event",
-                        (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 );
-
-    gtk_signal_connect( GTK_OBJECT(list_item),
-                           "key_press_event",
-                           (GtkSignalFunc)gtk_listbox_key_press_callback,
-                           (gpointer)this );
-
-
-    gtk_signal_connect( GTK_OBJECT(list_item), "focus_in_event",
-            GTK_SIGNAL_FUNC(gtk_listitem_focus_in_callback), (gpointer)this );
-
-    gtk_signal_connect( GTK_OBJECT(list_item), "focus_out_event",
-            GTK_SIGNAL_FUNC(gtk_listitem_focus_out_callback), (gpointer)this );
+        g_signal_connect_after (list_item, "deselect",
+                                G_CALLBACK (gtk_listitem_deselect_callback),
+                                this);
+
+    g_signal_connect (list_item, "button_press_event",
+                      G_CALLBACK (gtk_listbox_button_press_callback),
+                      this);
+    g_signal_connect_after (list_item, "button_release_event",
+                            G_CALLBACK (gtk_listbox_button_release_callback),
+                            this);
+    g_signal_connect (list_item, "key_press_event",
+                      G_CALLBACK (gtk_listbox_key_press_callback),
+                           this);
+    g_signal_connect (list_item, "focus_in_event",
+                      G_CALLBACK (gtk_listitem_focus_in_callback),
+                      this);
+    g_signal_connect (list_item, "focus_out_event",
+                      G_CALLBACK (gtk_listitem_focus_out_callback),
+                      this);

 
     ConnectWidget( list_item );
 
     if (GTK_WIDGET_REALIZED(m_widget))
     {
         gtk_widget_show( list_item );
 
     ConnectWidget( list_item );
 
     if (GTK_WIDGET_REALIZED(m_widget))
     {
         gtk_widget_show( list_item );

-        
+

         gtk_widget_realize( list_item );
         gtk_widget_realize( GTK_BIN(list_item)->child );
 
         gtk_widget_realize( list_item );
         gtk_widget_realize( GTK_BIN(list_item)->child );
 


@@ -718,8 +741,7 @@ void wxListBox::GtkAddItem( const wxString &item, int pos )
     {
         gtk_widget_modify_style( GTK_WIDGET( list_item ), style );
         GtkBin *bin = GTK_BIN( list_item );
     {
         gtk_widget_modify_style( GTK_WIDGET( list_item ), style );
         GtkBin *bin = GTK_BIN( list_item );

-        GtkWidget *label = GTK_WIDGET( bin->child );
-        gtk_widget_modify_style( label, style );
+        gtk_widget_modify_style( GTK_WIDGET( bin->child ), style );

         gtk_rc_style_unref( style );
     }
 }
         gtk_rc_style_unref( style );
     }
 }


@@ -861,11 +883,7 @@ wxString wxListBox::GetRealLabel(GList *item) const
 
     wxString str;
 
 
     wxString str;
 

-#ifdef __WXGTK20__

     str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );
     str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );

-#else
-    str = wxString( label->label );
-#endif

 
 #if wxUSE_CHECKLISTBOX
     // checklistboxes have "[±] " prepended to their lables, remove it
 
 #if wxUSE_CHECKLISTBOX
     // checklistboxes have "[±] " prepended to their lables, remove it


@@ -905,7 +923,7 @@ void wxListBox::SetString( int n, const wxString &string )
 
 wxString wxListBox::GetString( int n ) const
 {
 
 wxString wxListBox::GetString( int n ) const
 {

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

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


@@ -915,7 +933,7 @@ wxString wxListBox::GetString( int n ) const
 
     wxFAIL_MSG(wxT("wrong listbox index"));
 
 
     wxFAIL_MSG(wxT("wrong listbox index"));
 

-    return wxT("");
+    return wxEmptyString;

 }
 
 int wxListBox::GetCount() const
 }
 
 int wxListBox::GetCount() const


@@ -926,15 +944,15 @@ int wxListBox::GetCount() const
     return g_list_length(children);
 }
 
     return g_list_length(children);
 }
 

-int wxListBox::FindString( const wxString &item ) const
+int wxListBox::FindString( const wxString &item, bool bCase ) const

 {
 {

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

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

-        if ( GetRealLabel(child) == item )
+        if ( item.IsSameAs( GetRealLabel(child), bCase ) )

             return count;
 
         count++;
             return count;
 
         count++;


@@ -1104,7 +1122,7 @@ bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
 {
     return TRUE;
 
 {
     return TRUE;
 

-#if 0    
+#if 0

     if (m_widget->window == window) return TRUE;
 
     if (GTK_WIDGET(m_list)->window == window) return TRUE;
     if (m_widget->window == window) return TRUE;
 
     if (GTK_WIDGET(m_list)->window == window) return TRUE;


@@ -1215,7 +1233,7 @@ wxSize wxListBox::DoGetBestSize() const
     lbHeight = (cy+4) * wxMin(wxMax(GetCount(), 3), 10);
 
     wxSize best(lbWidth, lbHeight);
     lbHeight = (cy+4) * wxMin(wxMax(GetCount(), 3), 10);
 
     wxSize best(lbWidth, lbHeight);

-    CacheBestSize(best);        
+    CacheBestSize(best);

     return best;
 }
 
     return best;
 }
 


@@ -1236,4 +1254,3 @@ wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 }
 
 #endif // wxUSE_LISTBOX
 }
 
 #endif // wxUSE_LISTBOX

-