]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/combobox.cpp
Add doc for wxGraphicsContext.Create(), which is a lightweight context with no target...
[wxWidgets.git] / src / gtk / combobox.cpp
index ebc9849d38424dd516f93eb3dc811ce3ab2965be..609811eb65846ae5022fda5937a68e3867d0909b 100644 (file)
 /////////////////////////////////////////////////////////////////////////////
-// Name:        combobox.cpp
+// Name:        src/gtk/combobox.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "combobox.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_COMBOBOX
 
 #include "wx/combobox.h"
-#include <wx/intl.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
+gtkcombobox_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
+{
+    wxCommandEvent event( wxEVT_TEXT, combo->GetId() );
+    event.SetString( combo->GetValue() );
+    event.SetEventObject( combo );
+    combo->HandleWindowEvent( event );
+}
 
-static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
+static void
+gtkcombobox_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
-  if (!combo->HasVMT()) return;
-  if (g_blockEventsOnDrag) return;
-  
-  if (combo->m_alreadySent)
-  {
-    combo->m_alreadySent = FALSE;
-    return;
-  }
+    combo->SendSelectionChangedEvent(wxEVT_COMBOBOX);
+}
+
+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 );
+    combo->HandleWindowEvent( event );
+}
 
-  combo->m_alreadySent = TRUE;
-  
-  wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, combo->GetId());
-  event.SetInt( combo->GetSelection() );
-  wxString tmp( combo->GetStringSelection() );
-  event.SetString( WXSTRINGCAST(tmp) );
-  event.SetEventObject(combo);
-  combo->GetEventHandler()->ProcessEvent(event);
 }
 
 //-----------------------------------------------------------------------------
 // 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_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()
 
-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;
-  
-  PreCreation( parent, id, pos, size, style, name );
-  
-  SetValidator( validator );
-
-  m_widget = gtk_combo_new();
-  
-  wxSize newSize = size;
-  if (newSize.x == -1) newSize.x = 100;
-  if (newSize.y == -1) newSize.y = 26;
-  SetSize( newSize.x, newSize.y );
-  
-  GtkWidget *list = GTK_COMBO(m_widget)->list;
-  
-  for (int i = 0; i < n; i++)
-  {
-    GtkWidget *list_item = gtk_list_item_new_with_label( choices[i] ); 
-  
-    m_clientData.Append( (wxObject*)NULL );
-    
-    gtk_container_add( GTK_CONTAINER(list), list_item );
-    
-    gtk_widget_realize( list_item );
-    gtk_widget_realize( GTK_BIN(list_item)->child );
-    
-    gtk_widget_show( list_item );
-    
-    gtk_signal_connect( GTK_OBJECT(list_item), "select", 
-      GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-  }
-  
-  m_parent->AddChild( this );
-
-  (m_parent->m_insertCallback)( m_parent, this );
-  
-  PostCreation();
-
-  ConnectWidget( GTK_COMBO(m_widget)->button );
-  
-  if (!value.IsNull()) SetValue( value );
-    
-  gtk_widget_realize( GTK_COMBO(m_widget)->list );
-  gtk_widget_realize( GTK_COMBO(m_widget)->entry );
-  gtk_widget_realize( GTK_COMBO(m_widget)->button );
-  
-  SetBackgroundColour( parent->GetBackgroundColour() );
-  SetForegroundColour( parent->GetForegroundColour() );
-
-  Show( TRUE );
-    
-  return TRUE;
-}
-
-void wxComboBox::Clear(void)
-{
-  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
-  GtkWidget *list = GTK_COMBO(m_widget)->list;
-  gtk_list_clear_items( GTK_LIST(list), 0, Number() );
-  
-  m_clientData.Clear();
-}
-
-void wxComboBox::Append( const wxString &item )
-{
-  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
-  Append( item, (char*)NULL );
-}
-
-void wxComboBox::Append( const wxString &item, char *clientData )
-{
-  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
-  GtkWidget *list = GTK_COMBO(m_widget)->list;
-  
-  GtkWidget *list_item = gtk_list_item_new_with_label( item ); 
-  
-  gtk_signal_connect( GTK_OBJECT(list_item), "select", 
-    GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-  
-  m_clientData.Append( (wxObject*)clientData );
-  
-  gtk_container_add( GTK_CONTAINER(list), list_item );
-    
-  if (m_widgetStyle) ApplyWidgetStyle();
-  
-  gtk_widget_show( list_item );
-}
-
-void wxComboBox::Delete( int n )
-{
-  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
-  GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list );
-  
-  GList *child = g_list_nth( listbox->children, n );
-  
-  if (!child)
-  {
-    wxFAIL_MSG("wrong index");
-    return;
-  }
-  
-  GList *list = g_list_append( NULL, child->data );
-  gtk_list_remove_items( listbox, list );
-  g_list_free( list );
-  
-  wxNode *node = m_clientData.Nth( n );
-  if (!node)
-  {
-    wxFAIL_MSG( "wrong index" );
-  }
-  else
-    m_clientData.DeleteNode( node );
-}
-
-int wxComboBox::FindString( const wxString &item )
-{
-  wxCHECK_MSG( m_widget != NULL, -1, "invalid combobox" );
-  
-  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 == label->label) return count;
-    count++;
-    child = child->next;
-  }
-  
-  wxFAIL_MSG( "wxComboBox: string not found" );
-  
-  return -1;
-}
-
-char* wxComboBox::GetClientData( int n )
-{
-  wxCHECK_MSG( m_widget != NULL, (char*)NULL, "invalid combobox" );
-  
-  wxNode *node = m_clientData.Nth( n );
-  if (node) return (char*)node->Data();
-  
-  wxFAIL_MSG( "wxComboBox: wrong index" );
-  
-  return (char *) NULL;
-}
-
-void wxComboBox::SetClientData( int n, char * clientData )
-{
-  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
-  wxNode *node = m_clientData.Nth( n );
-  if (node) node->SetData( (wxObject*) clientData );
-  
-  wxFAIL_MSG( "wxComboBox: wrong index" );
-}
-
-int wxComboBox::GetSelection(void) const
-{
-  wxCHECK_MSG( m_widget != NULL, -1, "invalid combobox" );
-  
-  GtkWidget *list = GTK_COMBO(m_widget)->list;
-  
-  GList *selection = GTK_LIST(list)->selection;
-  if (selection)
-  {
-    GList *child = GTK_LIST(list)->children;
-    int count = 0;
-    while (child)
+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 )
+{
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxComboBox creation failed") );
+        return false;
+    }
+
+    if (HasFlag(wxCB_SORT))
+        m_strings = new wxGtkCollatedArrayString();
+
+    GTKCreateComboBoxWidget();
+
+    if (HasFlag(wxBORDER_NONE))
     {
-      if (child->data == selection->data) return count;
-      count++;
-      child = child->next;
+        // Doesn't seem to work
+        // g_object_set (m_widget, "has-frame", FALSE, NULL);
     }
-  }
-  
-  wxFAIL_MSG( "wxComboBox: no selection" );
-  
-  return -1;
+
+    GtkEntry * const entry = GetEntry();
+
+    if ( entry )
+    {
+        // Set it up to trigger default item on enter key press
+        gtk_entry_set_activates_default( entry,
+                                         !HasFlag(wxTE_PROCESS_ENTER) );
+
+        gtk_editable_set_editable(GTK_EDITABLE(entry), true);
+    }
+
+    Append(n, choices);
+
+    m_parent->DoAddChild( this );
+
+    if ( entry )
+        m_focusWidget = GTK_WIDGET( entry );
+
+    PostCreation(size);
+
+    if ( entry )
+    {
+        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) );
+        }
+
+        g_signal_connect_after (entry, "changed",
+                                G_CALLBACK (gtkcombobox_text_changed_callback), this);
+
+        GTKConnectInsertTextSignal(entry);
+        GTKConnectClipboardSignals(GTK_WIDGET(entry));
+    }
+
+    g_signal_connect_after (m_widget, "changed",
+                        G_CALLBACK (gtkcombobox_changed_callback), this);
+
+#ifndef __WXGTK3__
+    if ( !gtk_check_version(2,10,0) )
+#endif
+    {
+        g_signal_connect (m_widget, "notify::popup-shown",
+                          G_CALLBACK (gtkcombobox_popupshown_callback), this);
+    }
+
+    return true;
 }
 
-wxString wxComboBox::GetString( int n ) const
+void wxComboBox::GTKCreateComboBoxWidget()
 {
-  wxCHECK_MSG( m_widget != NULL, "", "invalid combobox" );
-  
-  GtkWidget *list = GTK_COMBO(m_widget)->list;
-  
-  GList *child = g_list_nth( GTK_LIST(list)->children, n );
-  if (child)
-  {
-    GtkBin *bin = GTK_BIN( child->data );
-    GtkLabel *label = GTK_LABEL( bin->child );
-    return label->label;
-  }
-  
-  wxFAIL_MSG( "wxComboBox: wrong index" );
-  
-  return "";
+#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);
+
+    m_entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(m_widget)));
 }
 
-wxString wxComboBox::GetStringSelection(void) const
+GtkEditable *wxComboBox::GetEditable() const
 {
-  wxCHECK_MSG( m_widget != NULL, "", "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 = GTK_LABEL( bin->child )->label;
-    return tmp;
-  }
-  
-  wxFAIL_MSG( "wxComboBox: no selection" );
-  
-  return "";
+    return GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(m_widget)));
 }
 
-int wxComboBox::Number(void) const
+void wxComboBox::OnChar( wxKeyEvent &event )
 {
-  wxCHECK_MSG( m_widget != NULL, 0, "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;
+    switch ( event.GetKeyCode() )
+    {
+        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;
+    }
+
+    event.Skip();
 }
 
-void wxComboBox::SetSelection( int n )
+void wxComboBox::EnableTextChangedEvents(bool enable)
 {
-  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
-  GtkWidget *list = GTK_COMBO(m_widget)->list;
-  gtk_list_select_item( GTK_LIST(list), n );
+    if ( !GetEntry() )
+        return;
+
+    if ( enable )
+    {
+        g_signal_handlers_unblock_by_func(gtk_bin_get_child(GTK_BIN(m_widget)),
+            (gpointer)gtkcombobox_text_changed_callback, this);
+    }
+    else // disable
+    {
+        g_signal_handlers_block_by_func(gtk_bin_get_child(GTK_BIN(m_widget)),
+            (gpointer)gtkcombobox_text_changed_callback, this);
+    }
 }
 
-void wxComboBox::SetStringSelection( const wxString &string )
+void wxComboBox::GTKDisableEvents()
 {
-  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
-  int res = FindString( string );
-  if (res == -1) return;
-  SetSelection( res );
+    EnableTextChangedEvents(false);
+
+    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);
 }
 
-wxString wxComboBox::GetValue(void) const
+void wxComboBox::GTKEnableEvents()
 {
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  wxString tmp = gtk_entry_get_text( GTK_ENTRY(entry) );
-  return tmp;
+    EnableTextChangedEvents(true);
+
+    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);
 }
 
-void wxComboBox::SetValue( const wxString& value )
+GtkWidget* wxComboBox::GetConnectWidget()
 {
-  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  wxString tmp = "";
-  if (!value.IsNull()) tmp = value;
-  gtk_entry_set_text( GTK_ENTRY(entry), tmp );
+    return GTK_WIDGET( GetEntry() );
 }
 
-void wxComboBox::Copy(void)
+GdkWindow* wxComboBox::GTKGetWindow(wxArrayGdkWindows& /* windows */) const
 {
-  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if (GTK_MINOR_VERSION == 1)
-  gtk_editable_copy_clipboard( GTK_EDITABLE(entry) );
+#ifdef __WXGTK3__
+    // no access to internal GdkWindows
+    return NULL;
 #else
-  gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 );
+    return gtk_entry_get_text_window(GetEntry());
 #endif
 }
 
-void wxComboBox::Cut(void)
+// static
+wxVisualAttributes
+wxComboBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if (GTK_MINOR_VERSION == 1)
-  gtk_editable_cut_clipboard( GTK_EDITABLE(entry) );
+#ifdef __WXGTK3__
+    return GetDefaultAttributesFromGTKWidget(gtk_combo_box_new_with_entry(), true);
 #else
-  gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 );
+    return GetDefaultAttributesFromGTKWidget(gtk_combo_box_entry_new(), true);
 #endif
 }
 
-void wxComboBox::Paste(void)
+void wxComboBox::SetValue(const wxString& value)
 {
-  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if (GTK_MINOR_VERSION == 1)
-  gtk_editable_paste_clipboard( GTK_EDITABLE(entry) );
-#else
-  gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );
-#endif
+    if ( HasFlag(wxCB_READONLY) )
+        SetStringSelection(value);
+    else
+        wxTextEntry::SetValue(value);
 }
 
-void wxComboBox::SetInsertionPoint( long pos )
+void wxComboBox::SetString(unsigned int n, const wxString& text)
 {
-  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  int tmp = (int) pos;
-  gtk_entry_set_position( GTK_ENTRY(entry), tmp );
+    wxChoice::SetString(n, text);
+
+    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);
+    }
 }
 
-void wxComboBox::SetInsertionPointEnd(void)
+// ----------------------------------------------------------------------------
+// standard event handling
+// ----------------------------------------------------------------------------
+
+void wxComboBox::OnCut(wxCommandEvent& WXUNUSED(event))
 {
-  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  int pos = GTK_ENTRY(entry)->text_length;
-  SetInsertionPoint( pos-1 );
+    Cut();
 }
 
-long wxComboBox::GetInsertionPoint(void) const
+void wxComboBox::OnCopy(wxCommandEvent& WXUNUSED(event))
 {
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  return (long) GTK_EDITABLE(entry)->current_pos;
+    Copy();
 }
 
-long wxComboBox::GetLastPosition(void) const
+void wxComboBox::OnPaste(wxCommandEvent& WXUNUSED(event))
 {
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  int pos = GTK_ENTRY(entry)->text_length;
-  return (long) pos-1;
+    Paste();
 }
 
-void wxComboBox::Replace( long from, long to, const wxString& value )
+void wxComboBox::OnUndo(wxCommandEvent& WXUNUSED(event))
 {
-  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
-  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, value.Length(), &pos );
+    Undo();
 }
 
-void wxComboBox::Remove(long from, long to)
+void wxComboBox::OnRedo(wxCommandEvent& WXUNUSED(event))
 {
-  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
+    Redo();
 }
 
-void wxComboBox::SetSelection( long WXUNUSED(from), long WXUNUSED(to) )
+void wxComboBox::OnDelete(wxCommandEvent& WXUNUSED(event))
 {
-  wxFAIL_MSG( "wxComboBox::SetSelection not implemented" );
+    RemoveSelection();
 }
 
-void wxComboBox::SetEditable( bool WXUNUSED(editable) )
+void wxComboBox::OnSelectAll(wxCommandEvent& WXUNUSED(event))
 {
-  wxFAIL_MSG( "wxComboBox::SetEditable not implemented" );
+    SelectAll();
 }
 
-void wxComboBox::OnSize( wxSizeEvent &event )
+void wxComboBox::OnUpdateCut(wxUpdateUIEvent& event)
 {
-  wxControl::OnSize( event );
-  
-  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 );
+    event.Enable( CanCut() );
 }
 
-void wxComboBox::ApplyWidgetStyle()
+void wxComboBox::OnUpdateCopy(wxUpdateUIEvent& event)
 {
-  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 );
-  
-  GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
-  GList *child = list->children;
-  while (child)
-  {
-    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;
-  }
+    event.Enable( CanCopy() );
 }
 
-GtkWidget* wxComboBox::GetConnectWidget(void)
+void wxComboBox::OnUpdatePaste(wxUpdateUIEvent& event)
 {
-  return GTK_COMBO(m_widget)->entry;
+    event.Enable( CanPaste() );
 }
 
-bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
+void wxComboBox::OnUpdateUndo(wxUpdateUIEvent& event)
 {
-  return ( (window == GTK_ENTRY( GTK_COMBO(m_widget)->entry )->text_area) ||
-           (window == GTK_COMBO(m_widget)->button->window ) );
+    event.Enable( CanUndo() );
 }
+
+void wxComboBox::OnUpdateRedo(wxUpdateUIEvent& event)
+{
+    event.Enable( CanRedo() );
+}
+
+void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event)
+{
+    event.Enable(HasSelection() && IsEditable()) ;
+}
+
+void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event)
+{
+    event.Enable(!wxTextEntry::IsEmpty());
+}
+
+void wxComboBox::Popup()
+{
+     gtk_combo_box_popup( GTK_COMBO_BOX(m_widget) );
+}
+
+void wxComboBox::Dismiss()
+{
+    gtk_combo_box_popdown( GTK_COMBO_BOX(m_widget) );
+}
+
+wxSize wxComboBox::DoGetSizeFromTextSize(int xlen, int ylen) const
+{
+    wxSize tsize( wxChoice::DoGetSizeFromTextSize(xlen, ylen) );
+
+    GtkEntry* entry = GetEntry();
+    if (entry)
+    {
+        // 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);
+    }
+
+    return tsize;
+}
+
+#endif // wxUSE_COMBOBOX