no more _ftime instead of ftime

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

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 54d5f9edfdb5810ebdadda1058f281c184fc0dea..c140ad2ddf39f34a32a83a19803482f8d573bbed 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -26,9 +26,9 @@
 #include "wx/tooltip.h"
 #endif
 
 #include "wx/tooltip.h"
 #endif
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "gdk/gdkkeysyms.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -190,7 +190,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
     }
     
 #if wxUSE_CHECKLISTBOX
     }
     
 #if wxUSE_CHECKLISTBOX

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

     {
         int sel = listbox->GtkGetIndex( widget );
 
     {
         int sel = listbox->GtkGetIndex( widget );
 


@@ -231,7 +231,7 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox
 
     if (!listbox->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     if (!listbox->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;

-
+    

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


@@ -349,7 +349,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     PostCreation();
 
 
     PostCreation();
 

-    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) );
+    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );

     SetForegroundColour( parent->GetForegroundColour() );
     SetFont( parent->GetFont() );
 
     SetForegroundColour( parent->GetForegroundColour() );
     SetFont( parent->GetFont() );
 


@@ -756,19 +756,10 @@ bool wxListBox::IsSelected( int n ) const
     wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid listbox") );
 
     GList *target = g_list_nth( m_list->children, n );
     wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid listbox") );
 
     GList *target = g_list_nth( m_list->children, n );

-    if (target)
-    {
-        GList *child = m_list->selection;
-        while (child)
-        {
-            if (child->data == target->data) return TRUE;
-            child = child->next;
-        }
-    }
-
-    wxFAIL_MSG(wxT("wrong listbox index"));
-
-    return FALSE;
+    
+    wxCHECK_MSG( target, FALSE, wxT("invalid listbox index") );
+    
+    return (GTK_WIDGET(target->data)->state == GTK_STATE_SELECTED) ;

 }
 
 void wxListBox::SetSelection( int n, bool select )
 }
 
 void wxListBox::SetSelection( int n, bool select )