Add doc for wxGraphicsContext.Create(), which is a lightweight context with no target...

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

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index a0a91e6a58e58e6aeca1a7dfa29d89af546b139b..609811eb65846ae5022fda5937a68e3867d0909b 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -7,657 +7,419 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "combobox.h"
-#endif
-
-#include "wx/combobox.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #if wxUSE_COMBOBOX
 
 
 #if wxUSE_COMBOBOX
 

-#include "wx/settings.h"
-#include "wx/intl.h"
-
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+#include "wx/combobox.h"

 
 

-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/settings.h"
+    #include "wx/textctrl.h"    // for wxEVT_TEXT
+    #include "wx/arrstr.h"
+#endif

 
 

-extern bool   g_blockEventsOnDrag;
+#include <gtk/gtk.h>
+#include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"

 
 

-//-----------------------------------------------------------------------------
-// "select"
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// GTK callbacks
+// ----------------------------------------------------------------------------

 
 

+extern "C" {

 static void
 static void

-gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
+gtkcombobox_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!combo->m_hasVMT) return;
-
-    if (g_blockEventsOnDrag) return;
-
-    if (combo->m_alreadySent)
-    {
-        combo->m_alreadySent = FALSE;
-        return;
-    }
-
-    combo->m_alreadySent = TRUE;
-
-    wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
-    event.SetInt( combo->GetSelection() );
-    event.SetString( combo->GetStringSelection() );
+    wxCommandEvent event( wxEVT_TEXT, combo->GetId() );
+    event.SetString( combo->GetValue() );

     event.SetEventObject( combo );
     event.SetEventObject( combo );

-
-    combo->GetEventHandler()->ProcessEvent( event );
+    combo->HandleWindowEvent( event );

 }
 
 }
 

-//-----------------------------------------------------------------------------
-//  "changed"
-//-----------------------------------------------------------------------------
-

 static void
 static void

-gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
+gtkcombobox_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!combo->m_hasVMT) return;
+    combo->SendSelectionChangedEvent(wxEVT_COMBOBOX);
+}

 
 

-    wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
-    event.SetString( combo->GetValue() );
+static void
+gtkcombobox_popupshown_callback(GObject *WXUNUSED(gobject),
+                                GParamSpec *WXUNUSED(param_spec),
+                                wxComboBox *combo)
+{
+    gboolean isShown;
+    g_object_get( combo->m_widget, "popup-shown", &isShown, NULL );
+    wxCommandEvent event( isShown ? wxEVT_COMBOBOX_DROPDOWN
+                                  : wxEVT_COMBOBOX_CLOSEUP,
+                          combo->GetId() );

     event.SetEventObject( combo );
     event.SetEventObject( combo );

-    combo->GetEventHandler()->ProcessEvent( event );
+    combo->HandleWindowEvent( event );
+}
+

 }
 
 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
-
-BEGIN_EVENT_TABLE(wxComboBox, wxControl)
-    EVT_SIZE(wxComboBox::OnSize)
+BEGIN_EVENT_TABLE(wxComboBox, wxChoice)

     EVT_CHAR(wxComboBox::OnChar)
     EVT_CHAR(wxComboBox::OnChar)

+
+    EVT_MENU(wxID_CUT, wxComboBox::OnCut)
+    EVT_MENU(wxID_COPY, wxComboBox::OnCopy)
+    EVT_MENU(wxID_PASTE, wxComboBox::OnPaste)
+    EVT_MENU(wxID_UNDO, wxComboBox::OnUndo)
+    EVT_MENU(wxID_REDO, wxComboBox::OnRedo)
+    EVT_MENU(wxID_CLEAR, wxComboBox::OnDelete)
+    EVT_MENU(wxID_SELECTALL, wxComboBox::OnSelectAll)
+
+    EVT_UPDATE_UI(wxID_CUT, wxComboBox::OnUpdateCut)
+    EVT_UPDATE_UI(wxID_COPY, wxComboBox::OnUpdateCopy)
+    EVT_UPDATE_UI(wxID_PASTE, wxComboBox::OnUpdatePaste)
+    EVT_UPDATE_UI(wxID_UNDO, wxComboBox::OnUpdateUndo)
+    EVT_UPDATE_UI(wxID_REDO, wxComboBox::OnUpdateRedo)
+    EVT_UPDATE_UI(wxID_CLEAR, wxComboBox::OnUpdateDelete)
+    EVT_UPDATE_UI(wxID_SELECTALL, wxComboBox::OnUpdateSelectAll)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

+wxComboBox::~wxComboBox()
+{
+    if (m_entry)
+        GTKDisconnect(m_entry);
+}
+
+void wxComboBox::Init()
+{
+    m_entry = NULL;
+}
+
+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[],
                          long style, const wxValidator& validator,
                          const wxString& name )
 {
 bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
                          const wxPoint& pos, const wxSize& size,
                          int n, const wxString choices[],
                          long style, const wxValidator& validator,
                          const wxString& name )
 {

-    m_alreadySent = FALSE;
-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
-

     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxComboBox creation failed") );
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxComboBox creation failed") );

-       return FALSE;
+        return false;

     }
 
     }
 

-    m_widget = gtk_combo_new();
-
-    // make it more useable
-    gtk_combo_set_use_arrows_always(GTK_COMBO(m_widget), TRUE);
-
-    wxSize newSize = size;
-    if (newSize.x == -1)
-        newSize.x = 100;
-    if (newSize.y == -1)
-        newSize.y = 26;
-    SetSize( newSize.x, newSize.y );
+    if (HasFlag(wxCB_SORT))
+        m_strings = new wxGtkCollatedArrayString();

 
 

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

 
 

-    for (int i = 0; i < n; i++)
+    if (HasFlag(wxBORDER_NONE))

     {
     {

-        /* 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() );
-
-        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 );
+        // Doesn't seem to work
+        // g_object_set (m_widget, "has-frame", FALSE, NULL);

     }
 
     }
 

-    m_parent->DoAddChild( this );
-
-    PostCreation();
+    GtkEntry * const entry = GetEntry();

 
 

-    ConnectWidget( GTK_COMBO(m_widget)->button );
-
-    if (!value.IsNull()) SetValue( value );
+    if ( entry )
+    {
+        // Set it up to trigger default item on enter key press
+        gtk_entry_set_activates_default( entry,
+                                         !HasFlag(wxTE_PROCESS_ENTER) );

 
 

-    if (style & wxCB_READONLY)
-        gtk_entry_set_editable( GTK_ENTRY( GTK_COMBO(m_widget)->entry ), FALSE );
+        gtk_editable_set_editable(GTK_EDITABLE(entry), true);
+    }

 
 

-    gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+    Append(n, choices);

 
 

-    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) );
-    SetForegroundColour( parent->GetForegroundColour() );
-    SetFont( parent->GetFont() );
+    m_parent->DoAddChild( this );

 
 

-    Show( TRUE );
+    if ( entry )
+        m_focusWidget = GTK_WIDGET( entry );

 
 

-    return TRUE;
-}
+    PostCreation(size);

 
 

-wxComboBox::~wxComboBox()
-{
-    wxNode *node = m_clientObjectList.First();
-    while (node)
+    if ( entry )

     {
     {

-        wxClientData *cd = (wxClientData*)node->Data();
-        if (cd) delete cd;
-        node = node->Next();
-    }
-    m_clientObjectList.Clear();
-
-    m_clientDataList.Clear();
-}
-
-void wxComboBox::AppendCommon( const wxString &item )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
+        if (style & wxCB_READONLY)
+        {
+            // this will assert and do nothing if the value is not in our list
+            // of strings which is the desired behaviour (for consistency with
+            // wxMSW and also because it doesn't make sense to have a string
+            // which is not a possible choice in a read-only combobox)
+            SetStringSelection(value);
+            gtk_editable_set_editable(GTK_EDITABLE(entry), false);
+        }
+        else // editable combobox
+        {
+            // any value is accepted, even if it's not in our list
+            gtk_entry_set_text( entry, wxGTK_CONV(value) );
+        }

 
 

-    GtkWidget *list_item = gtk_list_item_new_with_label( item.mbc_str() );
+        g_signal_connect_after (entry, "changed",
+                                G_CALLBACK (gtkcombobox_text_changed_callback), this);

 
 

-    gtk_container_add( GTK_CONTAINER(list), list_item );
+        GTKConnectInsertTextSignal(entry);
+        GTKConnectClipboardSignals(GTK_WIDGET(entry));
+    }

 
 

-    gtk_signal_connect( GTK_OBJECT(list_item), "select",
-      GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
+    g_signal_connect_after (m_widget, "changed",
+                        G_CALLBACK (gtkcombobox_changed_callback), this);

 
 

-    if (GTK_WIDGET_REALIZED(m_widget))
+#ifndef __WXGTK3__
+    if ( !gtk_check_version(2,10,0) )
+#endif

     {
     {

-        gtk_widget_realize( list_item );
-        gtk_widget_realize( GTK_BIN(list_item)->child );
-
-        if (m_widgetStyle) ApplyWidgetStyle();
+        g_signal_connect (m_widget, "notify::popup-shown",
+                          G_CALLBACK (gtkcombobox_popupshown_callback), this);

     }
 
     }
 

-    gtk_widget_show( list_item );
-}
-
-void wxComboBox::Append( const wxString &item )
-{
-    m_clientDataList.Append( (wxObject*) NULL );
-    m_clientObjectList.Append( (wxObject*) NULL );
-
-    AppendCommon( item );
-}
-
-void wxComboBox::Append( const wxString &item, void *clientData )
-{
-    m_clientDataList.Append( (wxObject*) clientData );
-    m_clientObjectList.Append( (wxObject*)NULL );
-
-    AppendCommon( item );
-}
-
-void wxComboBox::Append( const wxString &item, wxClientData *clientData )
-{
-    m_clientDataList.Append( (wxObject*) NULL );
-    m_clientObjectList.Append( (wxObject*) clientData );
-
-    AppendCommon( item );
+    return true;

 }
 
 }
 

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

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    wxNode *node = m_clientDataList.Nth( n );
-    if (!node) return;
-
-    node->SetData( (wxObject*) clientData );
-}
-
-void* wxComboBox::GetClientData( int n )
-{
-    wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") );
-
-    wxNode *node = m_clientDataList.Nth( n );
-    if (!node) return NULL;
-
-    return node->Data();
-}
-
-void wxComboBox::SetClientObject( int n, wxClientData* clientData )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    wxNode *node = m_clientObjectList.Nth( n );
-    if (!node) return;
-
-    wxClientData *cd = (wxClientData*) node->Data();
-    if (cd) delete cd;
+#ifdef __WXGTK3__
+    m_widget = gtk_combo_box_text_new_with_entry();
+#else
+    m_widget = gtk_combo_box_entry_new_text();
+#endif
+    g_object_ref(m_widget);

 
 

-    node->SetData( (wxObject*) clientData );
+    m_entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(m_widget)));

 }
 
 }
 

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

 {
 {

-    wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );
-
-    wxNode *node = m_clientDataList.Nth( n );
-    if (!node) return (wxClientData*) NULL;
-
-    return (wxClientData*) node->Data();
+    return GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(m_widget)));

 }
 
 }
 

-void wxComboBox::Clear()
+void wxComboBox::OnChar( wxKeyEvent &event )

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-    gtk_list_clear_items( GTK_LIST(list), 0, Number() );
-
-    wxNode *node = m_clientObjectList.First();
-    while (node)
+    switch ( event.GetKeyCode() )

     {
     {

-        wxClientData *cd = (wxClientData*)node->Data();
-        if (cd) delete cd;
-        node = node->Next();
+        case WXK_RETURN:
+            if ( HasFlag(wxTE_PROCESS_ENTER) && GetEntry() )
+            {
+                // GTK automatically selects an item if its in the list
+                wxCommandEvent eventEnter(wxEVT_TEXT_ENTER, GetId());
+                eventEnter.SetString( GetValue() );
+                eventEnter.SetInt( GetSelection() );
+                eventEnter.SetEventObject( this );
+
+                if ( HandleWindowEvent(eventEnter) )
+                {
+                    // Catch GTK event so that GTK doesn't open the drop
+                    // down list upon RETURN.
+                    return;
+                }
+            }
+            break;

     }
     }

-    m_clientObjectList.Clear();

 
 

-    m_clientDataList.Clear();
+    event.Skip();

 }
 
 }
 

-void wxComboBox::Delete( int n )
+void wxComboBox::EnableTextChangedEvents(bool enable)

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list );
-
-    GList *child = g_list_nth( listbox->children, n );
-
-    if (!child)
-    {
-        wxFAIL_MSG(wxT("wrong index"));
+    if ( !GetEntry() )

         return;
         return;

-    }

 
 

-    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 );
-    if (node)
+    if ( enable )

     {
     {

-        wxClientData *cd = (wxClientData*)node->Data();
-        if (cd) delete cd;
-        m_clientObjectList.DeleteNode( node );
+        g_signal_handlers_unblock_by_func(gtk_bin_get_child(GTK_BIN(m_widget)),
+            (gpointer)gtkcombobox_text_changed_callback, this);

     }
     }

-
-    node = m_clientDataList.Nth( n );
-    if (node)
+    else // disable

     {
     {

-        m_clientDataList.DeleteNode( node );
+        g_signal_handlers_block_by_func(gtk_bin_get_child(GTK_BIN(m_widget)),
+            (gpointer)gtkcombobox_text_changed_callback, this);

     }
 }
 
     }
 }
 

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

 {
 {

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

 
 

-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-
-    GList *child = GTK_LIST(list)->children;
-    int count = 0;
-    while (child)
-    {
-        GtkBin *bin = GTK_BIN( child->data );
-        GtkLabel *label = GTK_LABEL( bin->child );
-        if (item == wxString(label->label,*wxConvCurrent))
-            return count;
-        count++;
-        child = child->next;
-    }
-
-    return wxNOT_FOUND;
+    g_signal_handlers_block_by_func(m_widget,
+        (gpointer)gtkcombobox_changed_callback, this);
+    g_signal_handlers_block_by_func(m_widget,
+        (gpointer)gtkcombobox_popupshown_callback, this);

 }
 
 }
 

-int wxComboBox::GetSelection() const
+void wxComboBox::GTKEnableEvents()

 {
 {

-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
+    EnableTextChangedEvents(true);

 
 

-    GList *selection = GTK_LIST(list)->selection;
-    if (selection)
-    {
-        GList *child = GTK_LIST(list)->children;
-        int count = 0;
-        while (child)
-        {
-            if (child->data == selection->data) return count;
-            count++;
-            child = child->next;
-        }
-    }
-
-    return -1;
+    g_signal_handlers_unblock_by_func(m_widget,
+        (gpointer)gtkcombobox_changed_callback, this);
+    g_signal_handlers_unblock_by_func(m_widget,
+        (gpointer)gtkcombobox_popupshown_callback, this);

 }
 
 }
 

-wxString wxComboBox::GetString( int n ) const
+GtkWidget* wxComboBox::GetConnectWidget()

 {
 {

-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-
-    wxString str;
-    GList *child = g_list_nth( GTK_LIST(list)->children, n );
-    if (child)
-    {
-        GtkBin *bin = GTK_BIN( child->data );
-        GtkLabel *label = GTK_LABEL( bin->child );
-        str = wxString(label->label,*wxConvCurrent);
-    }
-    else
-    {
-        wxFAIL_MSG( wxT("wxComboBox: wrong index") );
-    }
-
-    return str;
+    return GTK_WIDGET( GetEntry() );

 }
 
 }
 

-wxString wxComboBox::GetStringSelection() const
+GdkWindow* wxComboBox::GTKGetWindow(wxArrayGdkWindows& /* windows */) const

 {
 {

-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-
-    GList *selection = GTK_LIST(list)->selection;
-    if (selection)
-    {
-        GtkBin *bin = GTK_BIN( selection->data );
-        wxString tmp = wxString(GTK_LABEL( bin->child )->label,*wxConvCurrent);
-        return tmp;
-    }
-
-    wxFAIL_MSG( wxT("wxComboBox: no selection") );
-
-    return wxT("");
+#ifdef __WXGTK3__
+    // no access to internal GdkWindows
+    return NULL;
+#else
+    return gtk_entry_get_text_window(GetEntry());
+#endif

 }
 
 }
 

-int wxComboBox::Number() const
+// static
+wxVisualAttributes
+wxComboBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))

 {
 {

-    wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-
-    GList *child = GTK_LIST(list)->children;
-    int count = 0;
-    while (child) { count++; child = child->next; }
-    return count;
+#ifdef __WXGTK3__
+    return GetDefaultAttributesFromGTKWidget(gtk_combo_box_new_with_entry(), true);
+#else
+    return GetDefaultAttributesFromGTKWidget(gtk_combo_box_entry_new(), true);
+#endif

 }
 
 }
 

-void wxComboBox::SetSelection( int n )
+void wxComboBox::SetValue(const wxString& value)

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    DisableEvents();
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-    gtk_list_select_item( GTK_LIST(list), n );
-
-    EnableEvents();
+    if ( HasFlag(wxCB_READONLY) )
+        SetStringSelection(value);
+    else
+        wxTextEntry::SetValue(value);

 }
 
 }
 

-void wxComboBox::SetStringSelection( const wxString &string )
+void wxComboBox::SetString(unsigned int n, const wxString& text)

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+    wxChoice::SetString(n, text);

 
 

-    int res = FindString( string );
-    if (res == -1) return;
-    SetSelection( res );
+    if ( static_cast<int>(n) == GetSelection() )
+    {
+        // We also need to update the currently shown text, for consistency
+        // with wxMSW and also because it makes sense as leaving the old string
+        // in the text but not in the list would be confusing to the user.
+        SetValue(text);
+
+        // And we need to keep the selection unchanged, modifying the item is
+        // not supposed to deselect it.
+        SetSelection(n);
+    }

 }
 
 }
 

-wxString wxComboBox::GetValue() const
-{
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    wxString tmp = wxString(gtk_entry_get_text( GTK_ENTRY(entry) ),*wxConvCurrent);
-    return tmp;
-}
+// ----------------------------------------------------------------------------
+// standard event handling
+// ----------------------------------------------------------------------------

 
 

-void wxComboBox::SetValue( const wxString& value )
+void wxComboBox::OnCut(wxCommandEvent& WXUNUSED(event))

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    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() );
+    Cut();

 }
 
 }
 

-void wxComboBox::Copy()
+void wxComboBox::OnCopy(wxCommandEvent& WXUNUSED(event))

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if (GTK_MINOR_VERSION > 0)
-    gtk_editable_copy_clipboard( GTK_EDITABLE(entry) );
-#else
-    gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 );
-#endif
+    Copy();

 }
 
 }
 

-void wxComboBox::Cut()
+void wxComboBox::OnPaste(wxCommandEvent& WXUNUSED(event))

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if (GTK_MINOR_VERSION > 0)
-    gtk_editable_cut_clipboard( GTK_EDITABLE(entry) );
-#else
-    gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 );
-#endif
+    Paste();

 }
 
 }
 

-void wxComboBox::Paste()
+void wxComboBox::OnUndo(wxCommandEvent& WXUNUSED(event))

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if (GTK_MINOR_VERSION > 0)
-    gtk_editable_paste_clipboard( GTK_EDITABLE(entry) );
-#else
-    gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );
-#endif
+    Undo();

 }
 
 }
 

-void wxComboBox::SetInsertionPoint( long pos )
+void wxComboBox::OnRedo(wxCommandEvent& WXUNUSED(event))

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_entry_set_position( GTK_ENTRY(entry), (int)pos );
+    Redo();

 }
 
 }
 

-void wxComboBox::SetInsertionPointEnd()
+void wxComboBox::OnDelete(wxCommandEvent& WXUNUSED(event))

 {
 {

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

 }
 
 }
 

-long wxComboBox::GetInsertionPoint() const
+void wxComboBox::OnSelectAll(wxCommandEvent& WXUNUSED(event))

 {
 {

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

 }
 
 }
 

-long wxComboBox::GetLastPosition() const
+void wxComboBox::OnUpdateCut(wxUpdateUIEvent& event)

 {
 {

-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    int pos = GTK_ENTRY(entry)->text_length;
-    return (long) pos-1;
+    event.Enable( CanCut() );

 }
 
 }
 

-void wxComboBox::Replace( long from, long to, const wxString& value )
+void wxComboBox::OnUpdateCopy(wxUpdateUIEvent& event)

 {
 {

-    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;
-    gtk_editable_insert_text( GTK_EDITABLE(entry), value.mbc_str(), value.Length(), &pos );
+    event.Enable( CanCopy() );

 }
 
 }
 

-void wxComboBox::Remove(long from, long to)
+void wxComboBox::OnUpdatePaste(wxUpdateUIEvent& event)

 {
 {

-    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 );
+    event.Enable( CanPaste() );

 }
 
 }
 

-void wxComboBox::SetSelection( long from, long to )
+void wxComboBox::OnUpdateUndo(wxUpdateUIEvent& event)

 {
 {

-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_editable_select_region( GTK_EDITABLE(entry), (gint)from, (gint)to );
+    event.Enable( CanUndo() );

 }
 
 }
 

-void wxComboBox::SetEditable( bool editable )
+void wxComboBox::OnUpdateRedo(wxUpdateUIEvent& event)

 {
 {

-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_entry_set_editable( GTK_ENTRY(entry), editable );
+    event.Enable( CanRedo() );

 }
 
 }
 

-void wxComboBox::OnChar( wxKeyEvent &event )
+void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event)

 {
 {

-    if ( event.KeyCode() == WXK_RETURN )
-    {
-        wxString value = GetValue();
-
-        if ( Number() == 0 )
-        {
-            // 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 )
-            {
-                Append(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 );
-            }
-            //else: do nothing, this will open the listbox
-        }
-    }
-
-    event.Skip();
+    event.Enable(HasSelection() && IsEditable()) ;

 }
 
 }
 

-void wxComboBox::DisableEvents()
+void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event)

 {
 {

-    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;
-    }
+    event.Enable(!wxTextEntry::IsEmpty());

 }
 
 }
 

-void wxComboBox::EnableEvents()
+void wxComboBox::Popup()

 {
 {

-    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_combo_box_popup( GTK_COMBO_BOX(m_widget) );

 }
 
 }
 

-void wxComboBox::OnSize( wxSizeEvent &event )
+void wxComboBox::Dismiss()

 {
 {

-    event.Skip();
-
-    return;
-
-    int w = 21;
-    gtk_widget_set_usize( GTK_COMBO(m_widget)->entry, m_width-w-1, m_height );
-
-    gtk_widget_set_uposition( GTK_COMBO(m_widget)->button, m_x+m_width-w, m_y );
-    gtk_widget_set_usize( GTK_COMBO(m_widget)->button, w, m_height );
+    gtk_combo_box_popdown( GTK_COMBO_BOX(m_widget) );

 }
 
 }
 

-void wxComboBox::ApplyWidgetStyle()
+wxSize wxComboBox::DoGetSizeFromTextSize(int xlen, int ylen) const

 {
 {

-    SetWidgetStyle();
-
-//    gtk_widget_set_style( GTK_COMBO(m_widget)->button, m_widgetStyle );
-    gtk_widget_set_style( GTK_COMBO(m_widget)->entry, m_widgetStyle );
-    gtk_widget_set_style( GTK_COMBO(m_widget)->list, m_widgetStyle );
+    wxSize tsize( wxChoice::DoGetSizeFromTextSize(xlen, ylen) );

 
 

-    GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
-    GList *child = list->children;
-    while (child)
+    GtkEntry* entry = GetEntry();
+    if (entry)

     {
     {

-        gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle );
-
-        GtkBin *bin = GTK_BIN(child->data);
-        gtk_widget_set_style( bin->child, m_widgetStyle );
-
-        child = child->next;
+        // Add the margins we have previously set, but only the horizontal border
+        // as vertical one has been taken account in the previous call.
+        // Also get other GTK+ margins.
+        tsize.IncBy(GTKGetEntryMargins(entry).x, 0);

     }
     }

-}

 
 

-GtkWidget* wxComboBox::GetConnectWidget()
-{
-    return GTK_COMBO(m_widget)->entry;
-}
-
-bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
-{
-    return ( (window == GTK_ENTRY( GTK_COMBO(m_widget)->entry )->text_area) ||
-             (window == GTK_COMBO(m_widget)->button->window ) );
+    return tsize;

 }
 
 }
 

-#endif
+#endif // wxUSE_COMBOBOX