Changed two conflicting defines in defs.h

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

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 818775ee732b711ab18e00b7cf69e01b3bc3bf29..b4652068770b5345fb3f6dce4d1a1162bd505e23 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -12,11 +12,15 @@
 #pragma implementation "listbox.h"
 #endif
 
 #pragma implementation "listbox.h"
 #endif
 

-#include "wx/dynarray.h"

 #include "wx/listbox.h"
 #include "wx/listbox.h"

+
+#if wxUSE_LISTBOX
+
+#include "wx/dynarray.h"

 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/checklst.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/checklst.h"

+#include "wx/settings.h"

 
 #if wxUSE_TOOLTIPS
 #include "wx/tooltip.h"
 
 #if wxUSE_TOOLTIPS
 #include "wx/tooltip.h"


@@ -29,18 +33,27 @@
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 

+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+

 //-------------------------------------------------------------------------
 // conditional compilation
 //-------------------------------------------------------------------------
 
 #if (GTK_MINOR_VERSION > 0)
 //-------------------------------------------------------------------------
 // conditional compilation
 //-------------------------------------------------------------------------
 
 #if (GTK_MINOR_VERSION > 0)

-#define NEW_GTK_SCROLL_CODE
+    #define NEW_GTK_SCROLL_CODE

 #endif
 
 //-----------------------------------------------------------------------------
 // private functions
 //-----------------------------------------------------------------------------
 
 #endif
 
 //-----------------------------------------------------------------------------
 // private functions
 //-----------------------------------------------------------------------------
 

+#if wxUSE_CHECKLISTBOX
+

 #define CHECKBOX_STRING "[-] "
 
 // checklistboxes have "[±] " prepended to their lables, this macro removes it
 #define CHECKBOX_STRING "[-] "
 
 // checklistboxes have "[±] " prepended to their lables, this macro removes it


@@ -49,41 +62,46 @@
 // the argument to it is a "const char *" pointer
 #define GET_REAL_LABEL(label) ((m_hasCheckBoxes)?(label)+4 : (label))
 
 // the argument to it is a "const char *" pointer
 #define GET_REAL_LABEL(label) ((m_hasCheckBoxes)?(label)+4 : (label))
 

+#else // !wxUSE_CHECKLISTBOX
+
+#define GET_REAL_LABEL(label) (label)
+
+#endif // wxUSE_CHECKLISTBOX
+

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 

-extern bool   g_blockEventsOnDrag;
-extern bool   g_blockEventsOnScroll;
+extern bool       g_blockEventsOnDrag;
+extern bool       g_blockEventsOnScroll;
+extern wxCursor   g_globalCursor;
+
+static bool       g_hasDoubleClicked = FALSE;

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// "button_press_event"
+// "button_release_event"

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

+/* we would normally emit a wxEVT_COMMAND_LISTBOX_DOUBLECLICKED event once
+   a GDK_2BUTTON_PRESS occurs, but this has the particular problem of the
+   listbox keeping the focus until it receives a GDK_BUTTON_RELEASE 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 */
+

 static gint
 static gint

-gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox )
+gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget),
+                                     GdkEventButton * WXUNUSED(gdk_event),
+                                     wxListBox *listbox )

 {
 {

+    if (g_isIdle) wxapp_install_idle_handler();
+

     if (g_blockEventsOnDrag) return FALSE;
     if (g_blockEventsOnScroll) return FALSE;
 
     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;
+    if (!listbox->m_hasVMT) return FALSE;

 
 

-        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 (!g_hasDoubleClicked) return FALSE;

 
 

-    if (gdk_event->type == GDK_2BUTTON_PRESS)
-    {

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


@@ -104,7 +122,43 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event,
 
         listbox->GetEventHandler()->ProcessEvent( event );
 
 
         listbox->GetEventHandler()->ProcessEvent( event );
 

+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "button_press_event"
+//-----------------------------------------------------------------------------
+
+static gint
+gtk_listbox_button_press_callback( GtkWidget *widget,
+                                   GdkEventButton *gdk_event,
+                                   wxListBox *listbox )
+{
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    if (g_blockEventsOnDrag) return FALSE;
+    if (g_blockEventsOnScroll) return FALSE;
+
+    if (!listbox->m_hasVMT) return FALSE;
+
+    int sel = listbox->GetIndex( widget );
+
+#if wxUSE_CHECKLISTBOX
+    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 );

     }
     }

+#endif // wxUSE_CHECKLISTBOX
+
+    /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */
+    g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS);

 
     return FALSE;
 }
 
     return FALSE;
 }


@@ -113,12 +167,15 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event,
 // "key_press_event"
 //-----------------------------------------------------------------------------
 
 // "key_press_event"
 //-----------------------------------------------------------------------------
 

+#if wxUSE_CHECKLISTBOX

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

+    if (g_isIdle) wxapp_install_idle_handler();
+

     if (g_blockEventsOnDrag) return FALSE;
 
     if (g_blockEventsOnDrag) return FALSE;
 

-    if (!listbox->HasVMT()) return FALSE;
+    if (!listbox->m_hasVMT) return FALSE;

 
     if (gdk_event->keyval != ' ') return FALSE;
 
 
     if (gdk_event->keyval != ' ') return FALSE;
 


@@ -135,14 +192,24 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
 
     return FALSE;
 }
 
     return FALSE;
 }

+#endif // wxUSE_CHECKLISTBOX

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

+static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox );
+
+static void gtk_listitem_deselect_callback( GtkWidget *widget, wxListBox *listbox )
+{
+    gtk_listitem_select_callback( widget, listbox );
+}
+

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

-    if (!listbox->HasVMT()) return;
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    if (!listbox->m_hasVMT) return;

     if (g_blockEventsOnDrag) return;
 
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
     if (g_blockEventsOnDrag) return;
 
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );


@@ -176,7 +243,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl)
 wxListBox::wxListBox()
 {
     m_list = (GtkList *) NULL;
 wxListBox::wxListBox()
 {
     m_list = (GtkList *) NULL;

+#if wxUSE_CHECKLISTBOX

     m_hasCheckBoxes = FALSE;
     m_hasCheckBoxes = FALSE;

+#endif // wxUSE_CHECKLISTBOX

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


@@ -187,13 +256,24 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
 
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
 

-    PreCreation( parent, id, pos, size, style, name );
-
-    SetValidator( validator );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxListBox creation failed") );
+       return FALSE;
+    }

 
     m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL );
 
     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 );
+    if (style & wxLB_ALWAYS_SB)
+    {
+      gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget),
+        GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS );
+    }
+    else
+    {
+      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() );
 


@@ -211,24 +291,11 @@ 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( GTK_BIN(s_window)->child );
-#else
-    GtkViewport *viewport = GTK_VIEWPORT(s_window->viewport);
-#endif
-
-    debug_focus_in( GTK_WIDGET(viewport), "wxWindow::viewport", name );
-#endif
+    /* make list scroll when moving the focus down using cursor keys */
+    gtk_container_set_focus_vadjustment(
+        GTK_CONTAINER(m_list),
+        gtk_scrolled_window_get_vadjustment(
+           GTK_SCROLLED_WINDOW(m_widget)));

 
     gtk_widget_show( GTK_WIDGET(m_list) );
 
 
     gtk_widget_show( GTK_WIDGET(m_list) );
 


@@ -245,16 +312,14 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
         GtkWidget *list_item;
 
         wxString str(choices[i]);
         GtkWidget *list_item;
 
         wxString str(choices[i]);

+#if wxUSE_CHECKLISTBOX

         if (m_hasCheckBoxes)
         {
             str.Prepend(CHECKBOX_STRING);
         }
         if (m_hasCheckBoxes)
         {
             str.Prepend(CHECKBOX_STRING);
         }

+#endif // wxUSE_CHECKLISTBOX

 
 

-        list_item = gtk_list_item_new_with_label( str );
-
-#ifdef __WXDEBUG__
-        debug_focus_in( list_item, "wxListBox::list_item", name );
-#endif
+        list_item = gtk_list_item_new_with_label( str.mbc_str() );

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


@@ -263,13 +328,19 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
         if (style & wxLB_MULTIPLE)
             gtk_signal_connect( GTK_OBJECT(list_item), "deselect",
 
         if (style & wxLB_MULTIPLE)
             gtk_signal_connect( GTK_OBJECT(list_item), "deselect",

-              GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
+              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( 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 );
+
+#if wxUSE_CHECKLISTBOX

         if (m_hasCheckBoxes)
         {
             gtk_signal_connect( GTK_OBJECT(list_item),
         if (m_hasCheckBoxes)
         {
             gtk_signal_connect( GTK_OBJECT(list_item),


@@ -277,21 +348,18 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
                             (GtkSignalFunc)gtk_listbox_key_press_callback,
                             (gpointer)this );
         }
                             (GtkSignalFunc)gtk_listbox_key_press_callback,
                             (gpointer)this );
         }

+#endif // wxUSE_CHECKLISTBOX

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

-    m_parent->AddChild( this );
-
-    (m_parent->m_insertCallback)( m_parent, this );
+    m_parent->DoAddChild( this );

 
     PostCreation();
 
 
     PostCreation();
 

-    gtk_widget_realize( GTK_WIDGET(m_list) );
-
-    SetBackgroundColour( parent->GetBackgroundColour() );
+    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) );

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


@@ -307,11 +375,11 @@ wxListBox::~wxListBox()
 
 void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
 {
 
 void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
 {

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

 
     GList *children = m_list->children;
     int length = g_list_length(children);
 
     GList *children = m_list->children;
     int length = g_list_length(children);

-    wxCHECK_RET( pos <= length, "invalid index in wxListBox::InsertItems" );
+    wxCHECK_RET( pos <= length, wxT("invalid index in wxListBox::InsertItems") );

 
     // VZ: it seems that GTK 1.0.6 doesn't has a function to insert an item
     //     into a listbox at the given position, this is why we first delete
 
     // VZ: it seems that GTK 1.0.6 doesn't has a function to insert an item
     //     into a listbox at the given position, this is why we first delete


@@ -331,7 +399,7 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
 
         return;
     }
 
         return;
     }

-    
+

     wxArrayString deletedLabels;
     wxArrayPtrVoid deletedData;
     wxArrayInt deletedChecks;   // only for check list boxes
     wxArrayString deletedLabels;
     wxArrayPtrVoid deletedData;
     wxArrayInt deletedChecks;   // only for check list boxes


@@ -343,13 +411,13 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 

-        wxString str(GET_REAL_LABEL(label->label));
+        wxString str(GET_REAL_LABEL(label->label),*wxConvCurrent);

         deletedLabels.Add(str);
 
         // save data
         void *clientData = NULL;
         wxNode *node = NULL;
         deletedLabels.Add(str);
 
         // save data
         void *clientData = NULL;
         wxNode *node = NULL;

-       
+

         if ( n < (int)m_clientObjectList.GetCount() )
             node = m_clientObjectList.Nth( n );
 
         if ( n < (int)m_clientObjectList.GetCount() )
             node = m_clientObjectList.Nth( n );
 


@@ -362,7 +430,7 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
         if ( !clientData )
         {
             if ( n < (int)m_clientDataList.GetCount() )
         if ( !clientData )
         {
             if ( n < (int)m_clientDataList.GetCount() )

-                node = m_clientDataList.Nth( n );        
+                node = m_clientDataList.Nth( n );

 
             if ( node )
             {
 
             if ( node )
             {


@@ -373,11 +441,13 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
 
         deletedData.Add(clientData);
 
 
         deletedData.Add(clientData);
 

+#if wxUSE_CHECKLISTBOX

         // save check state
         if ( m_hasCheckBoxes )
         {
             deletedChecks.Add(((wxCheckListBox *)this)->IsChecked(pos + n));
         }
         // save check state
         if ( m_hasCheckBoxes )
         {
             deletedChecks.Add(((wxCheckListBox *)this)->IsChecked(pos + n));
         }

+#endif // wxUSE_CHECKLISTBOX

     }
 
     int nDeletedCount = n;
     }
 
     int nDeletedCount = n;


@@ -396,43 +466,51 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
     {
         Append(deletedLabels[n], deletedData[n]);
 
     {
         Append(deletedLabels[n], deletedData[n]);
 

+#if wxUSE_CHECKLISTBOX

         if ( m_hasCheckBoxes )
         {
             ((wxCheckListBox *)this)->Check(pos + n, (bool)deletedChecks[n]);
         }
         if ( m_hasCheckBoxes )
         {
             ((wxCheckListBox *)this)->Check(pos + n, (bool)deletedChecks[n]);
         }

+#endif // wxUSE_CHECKLISTBOX

     }
 }
 
 void wxListBox::AppendCommon( const wxString &item )
 {
     }
 }
 
 void wxListBox::AppendCommon( const wxString &item )
 {

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

 
     GtkWidget *list_item;
 
     wxString label(item);
 
     GtkWidget *list_item;
 
     wxString label(item);

+#if wxUSE_CHECKLISTBOX

     if (m_hasCheckBoxes)
     {
         label.Prepend(CHECKBOX_STRING);
     }
     if (m_hasCheckBoxes)
     {
         label.Prepend(CHECKBOX_STRING);
     }

+#endif // wxUSE_CHECKLISTBOX

 
 

-    list_item = gtk_list_item_new_with_label( label );
+    list_item = gtk_list_item_new_with_label( label.mbc_str() );

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

-    if (GetWindowStyleFlag() & wxLB_MULTIPLE)
+    if (HasFlag(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 );
-
-    if (m_widgetStyle) ApplyWidgetStyle();
+          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( 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 );
+
+#if wxUSE_CHECKLISTBOX

     if (m_hasCheckBoxes)
     {
        gtk_signal_connect( GTK_OBJECT(list_item),
     if (m_hasCheckBoxes)
     {
        gtk_signal_connect( GTK_OBJECT(list_item),


@@ -440,20 +518,36 @@ void wxListBox::AppendCommon( const wxString &item )
                            (GtkSignalFunc)gtk_listbox_key_press_callback,
                            (gpointer)this );
     }
                            (GtkSignalFunc)gtk_listbox_key_press_callback,
                            (gpointer)this );
     }

+#endif // wxUSE_CHECKLISTBOX

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

+    if (GTK_WIDGET_REALIZED(m_widget))
+    {
+        gtk_widget_realize( list_item );
+        gtk_widget_realize( GTK_BIN(list_item)->child );
+
+        //if (m_widgetStyle) ApplyWidgetStyle();
+        if (m_widgetStyle) {
+            // Apply current widget style to the new list_item
+            gtk_widget_set_style( GTK_WIDGET( list_item ), m_widgetStyle );
+            GtkBin *bin = GTK_BIN( list_item );
+            GtkWidget *label = GTK_WIDGET( bin->child );
+            gtk_widget_set_style( label, m_widgetStyle );
+        }
+

 #if wxUSE_DRAG_AND_DROP
 #ifndef NEW_GTK_DND_CODE
 #if wxUSE_DRAG_AND_DROP
 #ifndef NEW_GTK_DND_CODE

-    if (m_dropTarget) m_dropTarget->RegisterWidget( list_item );
+        if (m_dropTarget) m_dropTarget->RegisterWidget( list_item );

 #endif
 #endif
 
 #if wxUSE_TOOLTIPS
 #endif
 #endif
 
 #if wxUSE_TOOLTIPS

-    if (m_toolTip) m_toolTip->Apply( this );
+        if (m_tooltip) m_tooltip->Apply( this );

 #endif
 #endif

+    }

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


@@ -482,7 +576,7 @@ void wxListBox::Append( const wxString &item, wxClientData *clientData )
 
 void wxListBox::SetClientData( int n, void* clientData )
 {
 
 void wxListBox::SetClientData( int n, void* clientData )
 {

-    wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );

 
     wxNode *node = m_clientDataList.Nth( n );
     if (!node) return;
 
     wxNode *node = m_clientDataList.Nth( n );
     if (!node) return;


@@ -492,7 +586,7 @@ void wxListBox::SetClientData( int n, void* clientData )
 
 void* wxListBox::GetClientData( int n )
 {
 
 void* wxListBox::GetClientData( int n )
 {

-    wxCHECK_MSG( m_widget != NULL, NULL, "invalid combobox" );
+    wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") );

 
     wxNode *node = m_clientDataList.Nth( n );
     if (!node) return NULL;
 
     wxNode *node = m_clientDataList.Nth( n );
     if (!node) return NULL;


@@ -502,7 +596,7 @@ void* wxListBox::GetClientData( int n )
 
 void wxListBox::SetClientObject( int n, wxClientData* clientData )
 {
 
 void wxListBox::SetClientObject( int n, wxClientData* clientData )
 {

-    wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );

 
     wxNode *node = m_clientObjectList.Nth( n );
     if (!node) return;
 
     wxNode *node = m_clientObjectList.Nth( n );
     if (!node) return;


@@ -515,7 +609,7 @@ void wxListBox::SetClientObject( int n, wxClientData* clientData )
 
 wxClientData* wxListBox::GetClientObject( int n )
 {
 
 wxClientData* wxListBox::GetClientObject( int n )
 {

-    wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, "invalid combobox" );
+    wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );

 
     wxNode *node = m_clientObjectList.Nth( n );
     if (!node) return (wxClientData*) NULL;
 
     wxNode *node = m_clientObjectList.Nth( n );
     if (!node) return (wxClientData*) NULL;


@@ -525,7 +619,7 @@ wxClientData* wxListBox::GetClientObject( int n )
 
 void wxListBox::Clear()
 {
 
 void wxListBox::Clear()
 {

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

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


@@ -543,11 +637,11 @@ void wxListBox::Clear()
 
 void wxListBox::Delete( int n )
 {
 
 void wxListBox::Delete( int n )
 {

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

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

-    wxCHECK_RET( child, "wrong listbox index" );
+    wxCHECK_RET( child, wxT("wrong listbox index") );

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


@@ -570,14 +664,18 @@ void wxListBox::Delete( int n )
 
 void wxListBox::Deselect( int n )
 {
 
 void wxListBox::Deselect( int n )
 {

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

 
     gtk_list_unselect_item( m_list, n );
 
     gtk_list_unselect_item( m_list, n );

+
+    EnableEvents();

 }
 
 int wxListBox::FindString( const wxString &item ) const
 {
 }
 
 int wxListBox::FindString( const wxString &item ) const
 {

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

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


@@ -586,7 +684,7 @@ 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 );
 

-        wxString str = GET_REAL_LABEL(label->label);
+        wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent);

 
         if (str == item)
             return count;
 
         if (str == item)
             return count;


@@ -602,7 +700,7 @@ int wxListBox::FindString( const wxString &item ) const
 
 int wxListBox::GetSelection() const
 {
 
 int wxListBox::GetSelection() const
 {

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

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


@@ -617,7 +715,7 @@ int wxListBox::GetSelection() const
 
 int wxListBox::GetSelections( wxArrayInt& aSelections ) const
 {
 
 int wxListBox::GetSelections( wxArrayInt& aSelections ) const
 {

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

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


@@ -647,7 +745,7 @@ int wxListBox::GetSelections( wxArrayInt& aSelections ) const
 
 wxString wxListBox::GetString( int n ) const
 {
 
 wxString wxListBox::GetString( int n ) const
 {

-    wxCHECK_MSG( m_list != NULL, "", "invalid listbox" );
+    wxCHECK_MSG( m_list != NULL, wxT(""), 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)


@@ -655,19 +753,19 @@ 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 );
 

-        wxString str = GET_REAL_LABEL(label->label);
+        wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent);

 
         return str;
     }
 
         return str;
     }

-    
-    wxFAIL_MSG("wrong listbox index");

 
 

-    return "";
+    wxFAIL_MSG(wxT("wrong listbox index"));
+
+    return wxT("");

 }
 
 wxString wxListBox::GetStringSelection() const
 {
 }
 
 wxString wxListBox::GetStringSelection() const
 {

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

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


@@ -675,18 +773,18 @@ wxString wxListBox::GetStringSelection() const
         GtkBin *bin = GTK_BIN( selection->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
         GtkBin *bin = GTK_BIN( selection->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 

-        wxString str = GET_REAL_LABEL(label->label);
+        wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent);

 
         return str;
     }
 
 
         return str;
     }
 

-    wxFAIL_MSG("no listbox selection available");
-    return "";
+    wxFAIL_MSG(wxT("no listbox selection available"));
+    return wxT("");

 }
 
 int wxListBox::Number()
 {
 }
 
 int wxListBox::Number()
 {

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

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


@@ -696,7 +794,7 @@ int wxListBox::Number()
 
 bool wxListBox::Selected( int n )
 {
 
 bool wxListBox::Selected( int n )
 {

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

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


@@ -708,38 +806,42 @@ bool wxListBox::Selected( int n )
             child = child->next;
         }
     }
             child = child->next;
         }
     }

-    wxFAIL_MSG("wrong listbox index");
+    wxFAIL_MSG(wxT("wrong listbox index"));

     return FALSE;
 }
 
 void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) )
 {
     return FALSE;
 }
 
 void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) )
 {

-    wxFAIL_MSG("wxListBox::Set not implemented");
+    wxFAIL_MSG(wxT("wxListBox::Set not implemented"));

 }
 
 void wxListBox::SetFirstItem( int WXUNUSED(n) )
 {
 }
 
 void wxListBox::SetFirstItem( int WXUNUSED(n) )
 {

-    wxFAIL_MSG("wxListBox::SetFirstItem not implemented");
+    wxFAIL_MSG(wxT("wxListBox::SetFirstItem not implemented"));

 }
 
 void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) )
 {
 }
 
 void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) )
 {

-    wxFAIL_MSG("wxListBox::SetFirstItem not implemented");
+    wxFAIL_MSG(wxT("wxListBox::SetFirstItem not implemented"));

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

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

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

+
+    EnableEvents();

 }
 
 void wxListBox::SetString( int n, const wxString &string )
 {
 }
 
 void wxListBox::SetString( int n, const wxString &string )
 {

-    wxCHECK_RET( m_list != NULL, "invalid listbox" );
+    wxCHECK_RET( m_list != NULL, 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)


@@ -748,21 +850,23 @@ void wxListBox::SetString( int n, const wxString &string )
         GtkLabel *label = GTK_LABEL( bin->child );
 
         wxString str;
         GtkLabel *label = GTK_LABEL( bin->child );
 
         wxString str;

+#if wxUSE_CHECKLISTBOX

         if (m_hasCheckBoxes)
             str += CHECKBOX_STRING;
         if (m_hasCheckBoxes)
             str += CHECKBOX_STRING;

+#endif // wxUSE_CHECKLISTBOX

         str += string;
 
         str += string;
 

-        gtk_label_set( label, str );
+        gtk_label_set( label, str.mbc_str() );

     }
     else
     {
     }
     else
     {

-        wxFAIL_MSG("wrong listbox index");
+        wxFAIL_MSG(wxT("wrong listbox index"));

     }
 }
 
 void wxListBox::SetStringSelection( const wxString &string, bool select )
 {
     }
 }
 
 void wxListBox::SetStringSelection( const wxString &string, bool select )
 {

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

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


@@ -784,12 +888,12 @@ int wxListBox::GetIndex( GtkWidget *item ) const
 }
 
 #if wxUSE_TOOLTIPS
 }
 
 #if wxUSE_TOOLTIPS

-void wxListBox::ApplyToolTip( GtkTooltips *tips, const char *tip )
+void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )

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

-        gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), tip, (gchar*) NULL );
+        gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), wxConvCurrent->cWX2MB(tip), (gchar*) NULL );

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


@@ -798,7 +902,7 @@ void wxListBox::ApplyToolTip( GtkTooltips *tips, const char *tip )
 #if wxUSE_DRAG_AND_DROP
 void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
 {
 #if wxUSE_DRAG_AND_DROP
 void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
 {

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

 
 #ifndef NEW_GTK_DND_CODE
     if (m_dropTarget)
 
 #ifndef NEW_GTK_DND_CODE
     if (m_dropTarget)


@@ -828,6 +932,38 @@ void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
 }
 #endif
 
 }
 #endif
 

+void wxListBox::DisableEvents()
+{
+    GList *child = m_list->children;
+    while (child)
+    {
+        gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
+          GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
+
+        if (HasFlag(wxLB_MULTIPLE))
+            gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
+              GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
+
+        child = child->next;
+    }
+}
+
+void wxListBox::EnableEvents()
+{
+    GList *child = m_list->children;
+    while (child)
+    {
+        gtk_signal_connect( GTK_OBJECT(child->data), "select",
+          GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
+
+        if (HasFlag(wxLB_MULTIPLE))
+            gtk_signal_connect( GTK_OBJECT(child->data), "deselect",
+              GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
+
+        child = child->next;
+    }
+}
+

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


@@ -855,9 +991,12 @@ void wxListBox::ApplyWidgetStyle()
     if (m_backgroundColour.Ok())
     {
         GdkWindow *window = GTK_WIDGET(m_list)->window;
     if (m_backgroundColour.Ok())
     {
         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 );
+        if ( 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;
     }
 
     GList *child = m_list->children;


@@ -873,3 +1012,36 @@ void wxListBox::ApplyWidgetStyle()
     }
 }
 
     }
 }
 

+void wxListBox::OnInternalIdle()
+{
+    wxCursor cursor = m_cursor;
+    if (g_globalCursor.Ok()) cursor = g_globalCursor;
+
+    if (GTK_WIDGET(m_list)->window && cursor.Ok())
+    {
+        /* I now set the cursor the anew in every OnInternalIdle call
+          as setting the cursor in a parent window also effects the
+          windows above so that checking for the current cursor is
+          not possible. */
+          
+       gdk_window_set_cursor( GTK_WIDGET(m_list)->window, cursor.GetCursor() );
+
+        GList *child = m_list->children;
+        while (child)
+        {
+            GtkBin *bin = GTK_BIN( child->data );
+            GtkWidget *label = GTK_WIDGET( bin->child );
+           
+           if (!label->window)
+               break;
+           else
+               gdk_window_set_cursor( label->window, cursor.GetCursor() );
+
+            child = child->next;
+        }
+    }
+
+    UpdateWindowUI();
+}
+
+#endif