Cleanup

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

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 492a1d6a02c91758071074a3d92380e03ee6c3aa..e6190604055dc272d8640b39b321693118940be1 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -7,21 +7,24 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "combobox.h"
 #endif
 
 #pragma implementation "combobox.h"
 #endif
 

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

 #include "wx/combobox.h"
 
 #if wxUSE_COMBOBOX
 
 #include "wx/settings.h"
 #include "wx/combobox.h"
 
 #if wxUSE_COMBOBOX
 
 #include "wx/settings.h"

+#include "wx/arrstr.h"

 #include "wx/intl.h"
 
 #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
 
 #include "wx/intl.h"
 
 #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
 

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

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


@@ -37,11 +40,11 @@ extern bool g_isIdle;
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------

-// "select"
+// "select-child" - click/cursor get select-child, changed, select-child

 //-----------------------------------------------------------------------------
 
 static void
 //-----------------------------------------------------------------------------
 
 static void

-gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
+gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(widget), wxComboBox *combo )

 {
     if (g_isIdle) wxapp_install_idle_handler();
 
 {
     if (g_isIdle) wxapp_install_idle_handler();
 


@@ -49,16 +52,17 @@ gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 
     if (g_blockEventsOnDrag) return;
 
 
     if (g_blockEventsOnDrag) return;
 

-    if (combo->m_alreadySent)
+    int curSelection = combo->GetSelection();
+
+    if (combo->m_prevSelection != curSelection)

     {
     {

-        combo->m_alreadySent = FALSE;
-        return;
+        GtkWidget *list = GTK_COMBO(combo->m_widget)->list;
+        gtk_list_unselect_item( GTK_LIST(list), combo->m_prevSelection );

     }
     }

-
-    combo->m_alreadySent = TRUE;
+    combo->m_prevSelection = curSelection;

 
     wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
 
     wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );

-    event.SetInt( combo->GetSelection() );
+    event.SetInt( curSelection );

     event.SetString( combo->GetStringSelection() );
     event.SetEventObject( combo );
 
     event.SetString( combo->GetStringSelection() );
     event.SetEventObject( combo );
 


@@ -66,7 +70,8 @@ gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-//  "changed"
+//  "changed" - typing and list item matches get changed, select-child
+//              if it doesn't match an item then just get a single changed

 //-----------------------------------------------------------------------------
 
 static void
 //-----------------------------------------------------------------------------
 
 static void


@@ -82,6 +87,11 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
     combo->GetEventHandler()->ProcessEvent( event );
 }
 
     combo->GetEventHandler()->ProcessEvent( event );
 }
 

+static void
+gtk_dummy_callback(GtkEntry *WXUNUSED(entry), GtkCombo *WXUNUSED(combo))
+{
+}
+

 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------


@@ -93,6 +103,19 @@ BEGIN_EVENT_TABLE(wxComboBox, wxControl)
     EVT_CHAR(wxComboBox::OnChar)
 END_EVENT_TABLE()
 
     EVT_CHAR(wxComboBox::OnChar)
 END_EVENT_TABLE()
 

+bool wxComboBox::Create( wxWindow *parent, wxWindowID id,
+                         const wxString& value,
+                         const wxPoint& pos, const wxSize& size,
+                         const wxArrayString& choices,
+                         long style, const wxValidator& validator,
+                         const wxString& name )
+{
+    wxCArrayString chs(choices);
+
+    return Create( parent, id, value, pos, size, chs.GetCount(),
+                   chs.GetStrings(), style, validator, name );
+}
+

 bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
                          const wxPoint& pos, const wxSize& size,
                          int n, const wxString choices[],
 bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
                          const wxPoint& pos, const wxSize& size,
                          int n, const wxString choices[],


@@ -102,6 +125,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     m_alreadySent = FALSE;
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
     m_alreadySent = FALSE;
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;

+    m_prevSelection = 0;

 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))


@@ -111,48 +135,59 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     }
 
     m_widget = gtk_combo_new();
     }
 
     m_widget = gtk_combo_new();

+    GtkCombo *combo = GTK_COMBO(m_widget);
+
+    // Disable GTK's broken events ...
+    gtk_signal_disconnect( GTK_OBJECT(combo->entry), combo->entry_change_id );
+    // ... and add surogate handler.
+    combo->entry_change_id = gtk_signal_connect (GTK_OBJECT (combo->entry), "changed",
+                             (GtkSignalFunc) gtk_dummy_callback, combo);

 
     // make it more useable
     gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE );
 
     // make it more useable
     gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE );

-    
+

     // and case-sensitive
     gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
 
     // and case-sensitive
     gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
 

-

     GtkWidget *list = GTK_COMBO(m_widget)->list;
 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 

+#ifndef __WXGTK20__
+    // gtk_list_set_selection_mode( GTK_LIST(list), GTK_SELECTION_MULTIPLE );
+#endif
+

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

-        /* don't send first event, which GTK sends aways when
-           inserting the first item */
-        m_alreadySent = TRUE;
-
-        GtkWidget *list_item = gtk_list_item_new_with_label( choices[i].mbc_str() );
+        GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( choices[i] ) );

 
         m_clientDataList.Append( (wxObject*)NULL );
         m_clientObjectList.Append( (wxObject*)NULL );
 
         gtk_container_add( GTK_CONTAINER(list), list_item );
 
 
         m_clientDataList.Append( (wxObject*)NULL );
         m_clientObjectList.Append( (wxObject*)NULL );
 
         gtk_container_add( GTK_CONTAINER(list), list_item );
 

-        gtk_signal_connect( GTK_OBJECT(list_item), "select",
-           GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-

         gtk_widget_show( list_item );
     }
 
     m_parent->DoAddChild( this );
 
         gtk_widget_show( list_item );
     }
 
     m_parent->DoAddChild( this );
 

+    m_focusWidget = combo->entry;
+

     PostCreation();
     PostCreation();

+    InheritAttributes();

 
 

-    ConnectWidget( GTK_COMBO(m_widget)->button );
+    ConnectWidget( combo->button );

 
 

-    if (!value.IsNull()) SetValue( value );
+    // MSW's combo box shows the value and the selection is -1
+    gtk_entry_set_text( GTK_ENTRY(combo->entry), wxGTK_CONV(value) );
+    gtk_list_unselect_all( GTK_LIST(combo->list) );

 
     if (style & wxCB_READONLY)
 
     if (style & wxCB_READONLY)

-        gtk_entry_set_editable( GTK_ENTRY( GTK_COMBO(m_widget)->entry ), FALSE );
+        gtk_entry_set_editable( GTK_ENTRY( combo->entry ), FALSE );

 
 

-    gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+    gtk_signal_connect( GTK_OBJECT(combo->entry), "changed",
+      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );
+
+    gtk_signal_connect( GTK_OBJECT(combo->list), "select-child",
+      GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );

 
     wxSize size_best( DoGetBestSize() );
     wxSize new_size( size );
 
     wxSize size_best( DoGetBestSize() );
     wxSize new_size( size );


@@ -163,10 +198,12 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     if (new_size.y > size_best.y)
         new_size.y = size_best.y;
     if ((new_size.x != size.x) || (new_size.y != size.y))
     if (new_size.y > size_best.y)
         new_size.y = size_best.y;
     if ((new_size.x != size.x) || (new_size.y != size.y))

+    {

         SetSize( new_size.x, new_size.y );
 
         SetSize( new_size.x, new_size.y );
 

-    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) );
-    SetForegroundColour( parent->GetForegroundColour() );
+        // This is required for tool bar support
+        gtk_widget_set_usize( m_widget, new_size.x, new_size.y );
+    }

 
     Show( TRUE );
 
 
     Show( TRUE );
 


@@ -175,31 +212,41 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
 
 wxComboBox::~wxComboBox()
 {
 
 wxComboBox::~wxComboBox()
 {

-    wxNode *node = m_clientObjectList.First();
+    wxList::compatibility_iterator node = m_clientObjectList.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxClientData *cd = (wxClientData*)node->Data();
+        wxClientData *cd = (wxClientData*)node->GetData();

         if (cd) delete cd;
         if (cd) delete cd;

-        node = node->Next();
+        node = node->GetNext();

     }
     m_clientObjectList.Clear();
 
     m_clientDataList.Clear();
 }
 
     }
     m_clientObjectList.Clear();
 
     m_clientDataList.Clear();
 }
 

-void wxComboBox::AppendCommon( const wxString &item )
+void wxComboBox::SetFocus()

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+    if ( m_hasFocus )
+    {
+        // don't do anything if we already have focus
+        return;
+    }
+
+    gtk_widget_grab_focus( m_focusWidget );
+}
+
+int wxComboBox::DoAppend( const wxString &item )
+{
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
+
+    DisableEvents();

 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 
 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 

-    GtkWidget *list_item = gtk_list_item_new_with_label( item.mbc_str() );
+    GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( item ) );

 
     gtk_container_add( GTK_CONTAINER(list), list_item );
 
 
     gtk_container_add( GTK_CONTAINER(list), list_item );
 

-    gtk_signal_connect( GTK_OBJECT(list_item), "select",
-      GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-

     if (GTK_WIDGET_REALIZED(m_widget))
     {
         gtk_widget_realize( list_item );
     if (GTK_WIDGET_REALIZED(m_widget))
     {
         gtk_widget_realize( list_item );


@@ -209,92 +256,126 @@ void wxComboBox::AppendCommon( const wxString &item )
     }
 
     gtk_widget_show( list_item );
     }
 
     gtk_widget_show( list_item );

-}

 
 

-void wxComboBox::Append( const wxString &item )
-{
+    const int count = GetCount();
+
+    if ( (int)m_clientDataList.GetCount() < count )

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

+    if ( (int)m_clientObjectList.GetCount() < count )

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

-    AppendCommon( item );
+    EnableEvents();
+
+    return count - 1;

 }
 
 }
 

-void wxComboBox::Append( const wxString &item, void *clientData )
+int wxComboBox::DoInsert( const wxString &item, int pos )

 {
 {

-    m_clientDataList.Append( (wxObject*) clientData );
-    m_clientObjectList.Append( (wxObject*)NULL );
+    wxCHECK_MSG( !(GetWindowStyle() & wxCB_SORT), -1,
+                    wxT("can't insert into sorted list"));

 
 

-    AppendCommon( item );
-}
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );

 
 

-void wxComboBox::Append( const wxString &item, wxClientData *clientData )
-{
-    m_clientDataList.Append( (wxObject*) NULL );
-    m_clientObjectList.Append( (wxObject*) clientData );
+    int count = GetCount();
+    wxCHECK_MSG( (pos >= 0) && (pos <= count), -1, wxT("invalid index") );
+
+    if (pos == count)
+        return Append(item);
+
+    DisableEvents();
+
+    GtkWidget *list = GTK_COMBO(m_widget)->list;
+
+    GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( item ) );
+
+    GList *gitem_list = g_list_alloc ();
+    gitem_list->data = list_item;
+    gtk_list_insert_items( GTK_LIST (list), gitem_list, pos );
+
+    if (GTK_WIDGET_REALIZED(m_widget))
+    {
+        gtk_widget_realize( list_item );
+        gtk_widget_realize( GTK_BIN(list_item)->child );
+
+        if (m_widgetStyle)
+            ApplyWidgetStyle();
+    }
+
+    gtk_widget_show( list_item );
+
+    count = GetCount();
+
+    if ( (int)m_clientDataList.GetCount() < count )
+    m_clientDataList.Insert( pos, (wxObject*) NULL );
+    if ( (int)m_clientObjectList.GetCount() < count )
+    m_clientObjectList.Insert( pos, (wxObject*) NULL );

 
 

-    AppendCommon( item );
+    EnableEvents();
+
+    return pos;

 }
 
 }
 

-void wxComboBox::SetClientData( int n, void* clientData )
+void wxComboBox::DoSetItemClientData( int n, void* clientData )

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

-    wxNode *node = m_clientDataList.Nth( n );
+    wxList::compatibility_iterator node = m_clientDataList.Item( n );

     if (!node) return;
 
     node->SetData( (wxObject*) clientData );
 }
 
     if (!node) return;
 
     node->SetData( (wxObject*) clientData );
 }
 

-void* wxComboBox::GetClientData( int n )
+void* wxComboBox::DoGetItemClientData( int n ) const

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

-    wxNode *node = m_clientDataList.Nth( n );
-    if (!node) return NULL;
+    wxList::compatibility_iterator node = m_clientDataList.Item( n );

 
 

-    return node->Data();
+    return node ? node->GetData() : NULL;

 }
 
 }
 

-void wxComboBox::SetClientObject( int n, wxClientData* clientData )
+void wxComboBox::DoSetItemClientObject( int n, wxClientData* clientData )

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

-    wxNode *node = m_clientObjectList.Nth( n );
+    wxList::compatibility_iterator node = m_clientObjectList.Item( n );

     if (!node) return;
 
     if (!node) return;
 

-    wxClientData *cd = (wxClientData*) node->Data();
-    if (cd) delete cd;
+    // wxItemContainer already deletes data for us

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

-wxClientData* wxComboBox::GetClientObject( int n )
+wxClientData* wxComboBox::DoGetItemClientObject( int n ) const

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

-    wxNode *node = m_clientDataList.Nth( n );
-    if (!node) return (wxClientData*) NULL;
+    wxList::compatibility_iterator node = m_clientObjectList.Item( n );

 
 

-    return (wxClientData*) node->Data();
+    return node ? (wxClientData*) node->GetData() : NULL;

 }
 
 void wxComboBox::Clear()
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
 }
 
 void wxComboBox::Clear()
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 

+    DisableEvents();
+

     GtkWidget *list = GTK_COMBO(m_widget)->list;
     GtkWidget *list = GTK_COMBO(m_widget)->list;

-    gtk_list_clear_items( GTK_LIST(list), 0, Number() );
+    gtk_list_clear_items( GTK_LIST(list), 0, GetCount() );

 
 

-    wxNode *node = m_clientObjectList.First();
+    wxList::compatibility_iterator node = m_clientObjectList.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxClientData *cd = (wxClientData*)node->Data();
+        wxClientData *cd = (wxClientData*)node->GetData();

         if (cd) delete cd;
         if (cd) delete cd;

-        node = node->Next();
+        node = node->GetNext();

     }
     m_clientObjectList.Clear();
 
     m_clientDataList.Clear();
     }
     m_clientObjectList.Clear();
 
     m_clientDataList.Clear();

+
+    EnableEvents();

 }
 
 void wxComboBox::Delete( int n )
 }
 
 void wxComboBox::Delete( int n )


@@ -311,26 +392,47 @@ void wxComboBox::Delete( int n )
         return;
     }
 
         return;
     }
 

+    DisableEvents();
+

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

-    wxNode *node = m_clientObjectList.Nth( n );
+    wxList::compatibility_iterator node = m_clientObjectList.Item( n );

     if (node)
     {
     if (node)
     {

-        wxClientData *cd = (wxClientData*)node->Data();
+        wxClientData *cd = (wxClientData*)node->GetData();

         if (cd) delete cd;
         if (cd) delete cd;

-        m_clientObjectList.DeleteNode( node );
+        m_clientObjectList.Erase( node );

     }
 
     }
 

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

     if (node)
     if (node)

+        m_clientDataList.Erase( node );
+    
+    EnableEvents();
+}
+
+void wxComboBox::SetString(int n, const wxString &text)
+{
+    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+
+    GtkWidget *list = GTK_COMBO(m_widget)->list;
+
+    GList *child = g_list_nth( GTK_LIST(list)->children, n );
+    if (child)

     {
     {

-        m_clientDataList.DeleteNode( node );
+        GtkBin *bin = GTK_BIN( child->data );
+        GtkLabel *label = GTK_LABEL( bin->child );
+        gtk_label_set_text(label, wxGTK_CONV(text));
+    }
+    else
+    {
+        wxFAIL_MSG( wxT("wxComboBox: wrong index") );

     }
 }
 
     }
 }
 

-int wxComboBox::FindString( const wxString &item )
+int wxComboBox::FindString( const wxString &item ) const

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


@@ -342,8 +444,14 @@ int wxComboBox::FindString( const wxString &item )
     {
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
     {
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );

-        if (item == wxString(label->label,*wxConvCurrent))
+#ifdef __WXGTK20__
+        wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
+#else
+        wxString str( label->label );
+#endif
+        if (item == str)

             return count;
             return count;

+

         count++;
         child = child->next;
     }
         count++;
         child = child->next;
     }


@@ -385,7 +493,11 @@ wxString wxComboBox::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 );

-        str = wxString(label->label,*wxConvCurrent);
+#ifdef __WXGTK20__
+        str = wxGTK_CONV_BACK( gtk_label_get_text(label) );
+#else
+        str = wxString( label->label );
+#endif

     }
     else
     {
     }
     else
     {


@@ -405,7 +517,12 @@ wxString wxComboBox::GetStringSelection() const
     if (selection)
     {
         GtkBin *bin = GTK_BIN( selection->data );
     if (selection)
     {
         GtkBin *bin = GTK_BIN( selection->data );

-        wxString tmp = wxString(GTK_LABEL( bin->child )->label,*wxConvCurrent);
+        GtkLabel *label = GTK_LABEL( bin->child );
+#ifdef __WXGTK20__
+        wxString tmp( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
+#else
+        wxString tmp( label->label );
+#endif

         return tmp;
     }
 
         return tmp;
     }
 


@@ -414,7 +531,7 @@ wxString wxComboBox::GetStringSelection() const
     return wxT("");
 }
 
     return wxT("");
 }
 

-int wxComboBox::Number() const
+int wxComboBox::GetCount() const

 {
     wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid combobox") );
 
 {
     wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid combobox") );
 


@@ -433,7 +550,9 @@ void wxComboBox::SetSelection( int n )
     DisableEvents();
 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
     DisableEvents();
 
     GtkWidget *list = GTK_COMBO(m_widget)->list;

+    gtk_list_unselect_item( GTK_LIST(list), m_prevSelection );

     gtk_list_select_item( GTK_LIST(list), n );
     gtk_list_select_item( GTK_LIST(list), n );

+    m_prevSelection = n;

 
     EnableEvents();
 }
 
     EnableEvents();
 }


@@ -449,8 +568,18 @@ void wxComboBox::SetStringSelection( const wxString &string )
 
 wxString wxComboBox::GetValue() const
 {
 
 wxString wxComboBox::GetValue() const
 {

-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    wxString tmp = wxString(gtk_entry_get_text( GTK_ENTRY(entry) ),*wxConvCurrent);
+    GtkEntry *entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
+    wxString tmp( wxGTK_CONV_BACK( gtk_entry_get_text( entry ) ) );
+
+#if 0
+    for (int i = 0; i < wxStrlen(tmp.c_str()) +1; i++)
+    {
+        wxChar c = tmp[i];
+        printf( "%d ", (int) (c) );
+    }
+    printf( "\n" );
+#endif
+

     return tmp;
 }
 
     return tmp;
 }
 


@@ -461,7 +590,7 @@ void wxComboBox::SetValue( const wxString& value )
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
     wxString tmp = wxT("");
     if (!value.IsNull()) tmp = value;
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
     wxString tmp = wxT("");
     if (!value.IsNull()) tmp = value;

-    gtk_entry_set_text( GTK_ENTRY(entry), tmp.mbc_str() );
+    gtk_entry_set_text( GTK_ENTRY(entry), wxGTK_CONV( tmp ) );

 }
 
 void wxComboBox::Copy()
 }
 
 void wxComboBox::Copy()


@@ -469,11 +598,7 @@ void wxComboBox::Copy()
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;

-#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0)
-    gtk_editable_copy_clipboard( GTK_EDITABLE(entry) );
-#else
-    gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 );
-#endif
+    gtk_editable_copy_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG );

 }
 
 void wxComboBox::Cut()
 }
 
 void wxComboBox::Cut()


@@ -481,11 +606,7 @@ void wxComboBox::Cut()
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;

-#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0)
-    gtk_editable_cut_clipboard( GTK_EDITABLE(entry) );
-#else
-    gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 );
-#endif
+    gtk_editable_cut_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG );

 }
 
 void wxComboBox::Paste()
 }
 
 void wxComboBox::Paste()


@@ -493,32 +614,23 @@ void wxComboBox::Paste()
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;

-#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0)
-    gtk_editable_paste_clipboard( GTK_EDITABLE(entry) );
-#else
-    gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );
-#endif
+    gtk_editable_paste_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG);

 }
 
 void wxComboBox::SetInsertionPoint( long pos )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
 }
 
 void wxComboBox::SetInsertionPoint( long pos )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 

+    if ( pos == GetLastPosition() )
+        pos = -1;
+

     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
     gtk_entry_set_position( GTK_ENTRY(entry), (int)pos );
 }
 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
     gtk_entry_set_position( GTK_ENTRY(entry), (int)pos );
 }
 

-void wxComboBox::SetInsertionPointEnd()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    SetInsertionPoint( -1 );
-}
-

 long wxComboBox::GetInsertionPoint() const
 {
 long wxComboBox::GetInsertionPoint() const
 {

-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    return (long) GTK_EDITABLE(entry)->current_pos;
+    return (long) GET_EDITABLE_POS( GTK_COMBO(m_widget)->entry );

 }
 
 long wxComboBox::GetLastPosition() const
 }
 
 long wxComboBox::GetLastPosition() const


@@ -531,21 +643,18 @@ long wxComboBox::GetLastPosition() const
 void wxComboBox::Replace( long from, long to, const wxString& value )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 void wxComboBox::Replace( long from, long to, const wxString& value )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );

-    // FIXME: not quite sure how to do this method right in multibyte mode

 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
     gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
     if (value.IsNull()) return;
     gint pos = (gint)to;
 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
     gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
     if (value.IsNull()) return;
     gint pos = (gint)to;

-    gtk_editable_insert_text( GTK_EDITABLE(entry), value.mbc_str(), value.Length(), &pos );
-}
-
-void wxComboBox::Remove(long from, long to)
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );

 
 

-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
+#if wxUSE_UNICODE
+    wxCharBuffer buffer = wxConvUTF8.cWX2MB( value );
+    gtk_editable_insert_text( GTK_EDITABLE(entry), (const char*) buffer, strlen( (const char*) buffer ), &pos );
+#else
+    gtk_editable_insert_text( GTK_EDITABLE(entry), value.c_str(), value.Length(), &pos );
+#endif

 }
 
 void wxComboBox::SetSelection( long from, long to )
 }
 
 void wxComboBox::SetSelection( long from, long to )


@@ -562,38 +671,35 @@ void wxComboBox::SetEditable( bool editable )
 
 void wxComboBox::OnChar( wxKeyEvent &event )
 {
 
 void wxComboBox::OnChar( wxKeyEvent &event )
 {

-    if ( event.KeyCode() == WXK_RETURN )
+    if ( event.GetKeyCode() == WXK_RETURN )

     {
     {

-        wxString value = GetValue();
+        // GTK automatically selects an item if its in the list
+        wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, GetId());
+        event.SetString( GetValue() );
+        event.SetInt( GetSelection() );
+        event.SetEventObject( this );

 
 

-        if ( Number() == 0 )
+        if (!GetEventHandler()->ProcessEvent( event ))

         {
         {

-            // make Enter generate "selected" event if there is only one item
-            // in the combobox - without it, it's impossible to select it at
-            // all!
-            wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
-            event.SetInt( 0 );
-            event.SetString( value );
-            event.SetEventObject( this );
-            GetEventHandler()->ProcessEvent( event );
-        }
-        else
-        {
-            // add the item to the list if it's not there yet
-            if ( FindString(value) == wxNOT_FOUND )
+            // This will invoke the dialog default action, such
+            // as the clicking the default button.
+
+            wxWindow *top_frame = m_parent;
+            while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
+                top_frame = top_frame->GetParent();
+
+            if (top_frame && GTK_IS_WINDOW(top_frame->m_widget))

             {
             {

-                Append(value);
-                SetStringSelection(value);
-
-                // and generate the selected event for it
-                wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
-                event.SetInt( Number() - 1 );
-                event.SetString( value );
-                event.SetEventObject( this );
-                GetEventHandler()->ProcessEvent( event );
+                GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
+
+                if (window->default_widget)
+                    gtk_widget_activate (window->default_widget);

             }
             }

-            //else: do nothing, this will open the listbox

         }
         }

+
+        // Catch GTK event so that GTK doesn't open the drop
+        // down list upon RETURN.
+        return;

     }
 
     event.Skip();
     }
 
     event.Skip();


@@ -601,28 +707,18 @@ void wxComboBox::OnChar( wxKeyEvent &event )
 
 void wxComboBox::DisableEvents()
 {
 
 void wxComboBox::DisableEvents()
 {

-    GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
-    GList *child = list->children;
-    while (child)
-    {
-        gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
-          GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-
-        child = child->next;
-    }
+    gtk_signal_disconnect_by_func( GTK_OBJECT(GTK_COMBO(m_widget)->list),
+      GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
+    gtk_signal_disconnect_by_func( GTK_OBJECT(GTK_COMBO(m_widget)->entry),
+      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );

 }
 
 void wxComboBox::EnableEvents()
 {
 }
 
 void wxComboBox::EnableEvents()
 {

-    GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
-    GList *child = list->children;
-    while (child)
-    {
-        gtk_signal_connect( GTK_OBJECT(child->data), "select",
-          GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-
-        child = child->next;
-    }
+    gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->list), "select-child",
+      GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
+    gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
+      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );

 }
 
 void wxComboBox::OnSize( wxSizeEvent &event )
 }
 
 void wxComboBox::OnSize( wxSizeEvent &event )


@@ -679,13 +775,11 @@ wxSize wxComboBox::DoGetBestSize() const
     ret.x = 0;
     if ( m_widget )
     {
     ret.x = 0;
     if ( m_widget )
     {

-        GdkFont *font = m_font.GetInternalFont();
-
-        wxCoord width;
-        size_t count = Number();
+        int width;
+        size_t count = GetCount();

         for ( size_t n = 0; n < count; n++ )
         {
         for ( size_t n = 0; n < count; n++ )
         {

-            width = (wxCoord)gdk_string_width(font, GetString(n).mbc_str());
+            GetTextExtent( GetString(n), &width, NULL, NULL, NULL, &m_font );

             if ( width > ret.x )
                 ret.x = width;
         }
             if ( width > ret.x )
                 ret.x = width;
         }