Return NULL from wxWindow::GetCapture() when the capture is being lost.

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

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 3480b849047306342f16d50c08b2a0effd9ee911..27ad2e756c476577ca807ae3a150baadf8f3fe9b 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/combobox.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        src/gtk/combobox.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -10,158 +9,62 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/combobox.h"
-

 #if wxUSE_COMBOBOX
 
 #if wxUSE_COMBOBOX
 

-#include "wx/settings.h"
-#include "wx/arrstr.h"
-#include "wx/intl.h"
+#include "wx/combobox.h"

 
 

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

 
 

+#include <gtk/gtk.h>

 #include "wx/gtk/private.h"
 #include "wx/gtk/private.h"

+#include "wx/gtk/private/gtk2-compat.h"

 
 

-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
-
-extern bool   g_blockEventsOnDrag;
-static int    g_SelectionBeforePopup = wxID_NONE; // this means the popup is hidden
-
-//-----------------------------------------------------------------------------
-//  "changed" - typing and list item matches get changed, select-child
-//              if it doesn't match an item then just get a single changed
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// GTK callbacks
+// ----------------------------------------------------------------------------

 
 extern "C" {
 static void
 
 extern "C" {
 static void

-gtk_text_changed_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_ignoreNextUpdate)
-    {
-        combo->m_ignoreNextUpdate = false;
-        return;
-    }
-
-    if (!combo->m_hasVMT) return;
-
-    wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
+    wxCommandEvent event( wxEVT_TEXT, combo->GetId() );

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

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

 }
 
 }
 

-extern "C" {

 static void
 static void

-gtk_dummy_callback(GtkEntry *WXUNUSED(entry), GtkCombo *WXUNUSED(combo))
+gtkcombobox_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )

 {
 {

-}
+    combo->SendSelectionChangedEvent(wxEVT_COMBOBOX);

 }
 
 }
 

-extern "C" {

 static void
 static void

-gtk_popup_hide_callback(GtkCombo *WXUNUSED(gtk_combo), wxComboBox *combo)
-{
-    // when the popup is hidden, throw a SELECTED event only if the combobox
-    // selection changed.
-    int curSelection = combo->GetCurrentSelection();
-    if (g_SelectionBeforePopup != curSelection)
-    {
-        wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
-        event.SetInt( curSelection );
-        event.SetString( combo->GetStringSelection() );
-        event.SetEventObject( combo );
-        combo->GetEventHandler()->ProcessEvent( event );
-    }
-
-    // reset the selection flag to value meaning that it is hidden
-    g_SelectionBeforePopup = wxID_NONE;
-}
+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 );

 }
 
 }
 

-extern "C" {
-static void
-gtk_popup_show_callback(GtkCombo *WXUNUSED(gtk_combo), wxComboBox *combo)
-{
-    // store the combobox selection value before the popup is shown
-    g_SelectionBeforePopup = combo->GetCurrentSelection();
-}
-}
-
-//-----------------------------------------------------------------------------
-// "select-child" - click/cursor get select-child, changed, select-child
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static void
-gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(widget), wxComboBox *combo )
-{
-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!combo->m_hasVMT) return;
-
-    if (g_blockEventsOnDrag) return;
-
-    int curSelection = combo->GetCurrentSelection();
-
-    if (combo->m_prevSelection == curSelection) return;
-
-    GtkWidget *list = GTK_COMBO(combo->m_widget)->list;
-    gtk_list_unselect_item( GTK_LIST(list), combo->m_prevSelection );
-
-    combo->m_prevSelection = curSelection;
-
-    // Quickly set the value of the combo box
-    // as GTK+ does that only AFTER the event
-    // is sent.
-    gtk_signal_disconnect_by_func( GTK_OBJECT(GTK_COMBO(combo->GetHandle())->entry),
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo );
-    combo->SetValue( combo->GetStringSelection() );
-    gtk_signal_connect_after( GTK_OBJECT(GTK_COMBO(combo->GetHandle())->entry), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo );
-
-    // throw a SELECTED event only if the combobox popup is hidden (wxID_NONE)
-    // because when combobox popup is shown, gtk_combo_select_child_callback is
-    // called each times the mouse is over an item with a pressed button so a lot
-    // of SELECTED event could be generated if the user keep the mouse button down
-    // and select other items ...
-    if (g_SelectionBeforePopup == wxID_NONE)
-    {
-        wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
-        event.SetInt( curSelection );
-        event.SetString( combo->GetStringSelection() );
-        event.SetEventObject( combo );
-        combo->GetEventHandler()->ProcessEvent( event );
-
-        // for consistencu with the other ports, don't generate text update
-        // events while the user is browsing the combobox neither
-        wxCommandEvent event2( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
-        event2.SetString( combo->GetValue() );
-        event2.SetEventObject( combo );
-        combo->GetEventHandler()->ProcessEvent( event2 );
-    }
-}

 }
 
 //-----------------------------------------------------------------------------
 // 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_MENU(wxID_CUT, wxComboBox::OnCut)
     EVT_CHAR(wxComboBox::OnChar)
 
     EVT_MENU(wxID_CUT, wxComboBox::OnCut)


@@ -181,6 +84,17 @@ BEGIN_EVENT_TABLE(wxComboBox, wxControl)
     EVT_UPDATE_UI(wxID_SELECTALL, wxComboBox::OnUpdateSelectAll)
 END_EVENT_TABLE()
 
     EVT_UPDATE_UI(wxID_SELECTALL, wxComboBox::OnUpdateSelectAll)
 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,
 bool wxComboBox::Create( wxWindow *parent, wxWindowID id,
                          const wxString& value,
                          const wxPoint& pos, const wxSize& size,


@@ -200,11 +114,6 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
                          long style, const wxValidator& validator,
                          const wxString& name )
 {
                          long style, const wxValidator& validator,
                          const wxString& name )
 {

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


@@ -212,761 +121,204 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
         return false;
     }
 
         return false;
     }
 

-    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 );
-
-    // and case-sensitive
-    gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
-
-#ifdef __WXGTK20__
-    if (style & wxNO_BORDER)
-        g_object_set( GTK_ENTRY( combo->entry ), "has-frame", FALSE, NULL );
-#endif
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
+    if (HasFlag(wxCB_SORT))
+        m_strings = new wxGtkCollatedArrayString();

 
 

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

 
 

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

     {
     {

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

     }
 
     }
 

-    m_parent->DoAddChild( this );
-
-    m_focusWidget = combo->entry;
-
-    PostCreation(size);
-
-    ConnectWidget( combo->button );
-
-    // 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)
-        gtk_entry_set_editable( GTK_ENTRY( combo->entry ), FALSE );
-
-    // "show" and "hide" events are generated when user click on the combobox button which popups a list
-    // this list is the "popwin" gtk widget
-    gtk_signal_connect( GTK_OBJECT(GTK_COMBO(combo)->popwin), "hide",
-                        GTK_SIGNAL_FUNC(gtk_popup_hide_callback), (gpointer)this );
-    gtk_signal_connect( GTK_OBJECT(GTK_COMBO(combo)->popwin), "show",
-                        GTK_SIGNAL_FUNC(gtk_popup_show_callback), (gpointer)this );
+    GtkEntry * const entry = GetEntry();

 
 

-    gtk_signal_connect_after( GTK_OBJECT(combo->entry), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );
-
-    gtk_signal_connect_after( GTK_OBJECT(combo->list), "select-child",
-      GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
-
-    SetBestSize(size); // need this too because this is a wxControlWithItems
-
-    // This is required for tool bar support
-//    wxSize setsize = GetSize();
-//    gtk_widget_set_usize( m_widget, setsize.x, setsize.y );
-
-    return true;
-}
-
-wxComboBox::~wxComboBox()
-{
-    wxList::compatibility_iterator node = m_clientObjectList.GetFirst();
-    while (node)
+    if ( entry )

     {
     {

-        wxClientData *cd = (wxClientData*)node->GetData();
-        if (cd) delete cd;
-        node = node->GetNext();
-    }
-    m_clientObjectList.Clear();
+        // Set it up to trigger default item on enter key press
+        gtk_entry_set_activates_default( entry,
+                                         !HasFlag(wxTE_PROCESS_ENTER) );

 
 

-    m_clientDataList.Clear();
-}
-
-void wxComboBox::SetFocus()
-{
-    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_item = gtk_list_item_new_with_label( wxGTK_CONV( item ) );
-
-    gtk_container_add( GTK_CONTAINER(list), list_item );
-
-    if (GTK_WIDGET_REALIZED(m_widget))
-    {
-        gtk_widget_realize( list_item );
-        gtk_widget_realize( GTK_BIN(list_item)->child );
-    }
-
-    // Apply current widget style to the new list_item
-    GtkRcStyle *style = CreateWidgetStyle();
-    if (style)
-    {
-        gtk_widget_modify_style( GTK_WIDGET( list_item ), style );
-        GtkBin *bin = GTK_BIN( list_item );
-        GtkWidget *label = GTK_WIDGET( bin->child );
-        gtk_widget_modify_style( label, style );
-        gtk_rc_style_unref( style );
-    }
-
-    gtk_widget_show( list_item );
-
-    const int count = GetCount();
-
-    if ( (int)m_clientDataList.GetCount() < count )
-        m_clientDataList.Append( (wxObject*) NULL );
-    if ( (int)m_clientObjectList.GetCount() < count )
-        m_clientObjectList.Append( (wxObject*) NULL );
-
-    EnableEvents();
-
-    InvalidateBestSize();
-
-    return count - 1;
-}
-
-int wxComboBox::DoInsert( const wxString &item, int pos )
-{
-    wxCHECK_MSG( !(GetWindowStyle() & wxCB_SORT), -1,
-                    wxT("can't insert into sorted list"));
-
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
-
-    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 );
-
-        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 );
-
-    EnableEvents();
-
-    InvalidateBestSize();
-
-    return pos;
-}
-
-void wxComboBox::DoSetItemClientData( int n, void* clientData )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    wxList::compatibility_iterator node = m_clientDataList.Item( n );
-    if (!node) return;
-
-    node->SetData( (wxObject*) clientData );
-}
-
-void* wxComboBox::DoGetItemClientData( int n ) const
-{
-    wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") );
-
-    wxList::compatibility_iterator node = m_clientDataList.Item( n );
-
-    return node ? node->GetData() : NULL;
-}
-
-void wxComboBox::DoSetItemClientObject( int n, wxClientData* clientData )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    wxList::compatibility_iterator node = m_clientObjectList.Item( n );
-    if (!node) return;
-
-    // wxItemContainer already deletes data for us
-
-    node->SetData( (wxObject*) clientData );
-}
-
-wxClientData* wxComboBox::DoGetItemClientObject( int n ) const
-{
-    wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );
-
-    wxList::compatibility_iterator node = m_clientObjectList.Item( n );
-
-    return node ? (wxClientData*) node->GetData() : NULL;
-}
-
-void wxComboBox::Clear()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    DisableEvents();
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-    gtk_list_clear_items( GTK_LIST(list), 0, GetCount() );
-
-    wxList::compatibility_iterator node = m_clientObjectList.GetFirst();
-    while (node)
-    {
-        wxClientData *cd = (wxClientData*)node->GetData();
-        if (cd) delete cd;
-        node = node->GetNext();
+        gtk_editable_set_editable(GTK_EDITABLE(entry), true);

     }
     }

-    m_clientObjectList.Clear();
-
-    m_clientDataList.Clear();
-
-    EnableEvents();

 
 

-    InvalidateBestSize();
-}
+    Append(n, choices);

 
 

-void wxComboBox::Delete( int n )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+    m_parent->DoAddChild( this );

 
 

-    GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list );
+    if ( entry )
+        m_focusWidget = GTK_WIDGET( entry );

 
 

-    GList *child = g_list_nth( listbox->children, n );
+    PostCreation(size);

 
 

-    if (!child)
+    if ( entry )

     {
     {

-        wxFAIL_MSG(wxT("wrong index"));
-        return;
-    }
-
-    DisableEvents();
+        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) );
+        }

 
 

-    GList *list = g_list_append( (GList*) NULL, child->data );
-    gtk_list_remove_items( listbox, list );
-    g_list_free( list );
+        g_signal_connect_after (entry, "changed",
+                                G_CALLBACK (gtkcombobox_text_changed_callback), this);

 
 

-    wxList::compatibility_iterator node = m_clientObjectList.Item( n );
-    if (node)
-    {
-        wxClientData *cd = (wxClientData*)node->GetData();
-        if (cd) delete cd;
-        m_clientObjectList.Erase( node );
+        GTKConnectInsertTextSignal(entry);
+        GTKConnectClipboardSignals(GTK_WIDGET(entry));

     }
 
     }
 

-    node = m_clientDataList.Item( n );
-    if (node)
-        m_clientDataList.Erase( node );
-
-    EnableEvents();
-
-    InvalidateBestSize();
-}
-
-void wxComboBox::SetString(int n, const wxString &text)
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+    g_signal_connect_after (m_widget, "changed",
+                        G_CALLBACK (gtkcombobox_changed_callback), this);

 
 

-    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 );
-        gtk_label_set_text(label, wxGTK_CONV(text));
-    }
-    else
+#ifndef __WXGTK3__
+    if ( !gtk_check_version(2,10,0) )
+#endif

     {
     {

-        wxFAIL_MSG( wxT("wxComboBox: wrong index") );
+        g_signal_connect (m_widget, "notify::popup-shown",
+                          G_CALLBACK (gtkcombobox_popupshown_callback), this);

     }
 
     }
 

-    InvalidateBestSize();
+    return true;

 }
 
 }
 

-int wxComboBox::FindString( const wxString &item, bool bCase ) const
+void wxComboBox::GTKCreateComboBoxWidget()

 {
 {

-    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("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 );
-#ifdef __WXGTK20__
-        wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
+#ifdef __WXGTK3__
+    m_widget = gtk_combo_box_text_new_with_entry();

 #else
 #else

-        wxString str( label->label );
+    m_widget = gtk_combo_box_entry_new_text();

 #endif
 #endif

-        if (item.IsSameAs( str , bCase ) )
-            return count;
+    g_object_ref(m_widget);

 
 

-        count++;
-        child = child->next;
-    }
-
-    return wxNOT_FOUND;
+    m_entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(m_widget)));

 }
 
 }
 

-int wxComboBox::GetSelection() const
+GtkEditable *wxComboBox::GetEditable() const

 {
 {

-    // if the popup is currently opened, use the selection as it had been
-    // before it dropped down
-    return g_SelectionBeforePopup == wxID_NONE ? GetCurrentSelection()
-                                               : g_SelectionBeforePopup;
+    return GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(m_widget)));

 }
 
 }
 

-int wxComboBox::GetCurrentSelection() const
-{
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("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)
-        {
-            if (child->data == selection->data) return count;
-            count++;
-            child = child->next;
-        }
-    }
-
-    return -1;
-}
-
-wxString wxComboBox::GetString( int n ) const
+void wxComboBox::OnChar( wxKeyEvent &event )

 {
 {

-    wxCHECK_MSG( m_widget != NULL, wxEmptyString, 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 );
-#ifdef __WXGTK20__
-        str = wxGTK_CONV_BACK( gtk_label_get_text(label) );
-#else
-        str = wxString( label->label );
-#endif
-    }
-    else
+    switch ( event.GetKeyCode() )

     {
     {

-        wxFAIL_MSG( wxT("wxComboBox: wrong index") );
+        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;

     }
 
     }
 

-    return str;
+    event.Skip();

 }
 
 }
 

-wxString wxComboBox::GetStringSelection() const
+void wxComboBox::EnableTextChangedEvents(bool enable)

 {
 {

-    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
+    if ( !GetEntry() )
+        return;

 
 

-    GList *selection = GTK_LIST(list)->selection;
-    if (selection)
+    if ( enable )

     {
     {

-        GtkBin *bin = GTK_BIN( selection->data );
-        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;
+        g_signal_handlers_unblock_by_func(gtk_bin_get_child(GTK_BIN(m_widget)),
+            (gpointer)gtkcombobox_text_changed_callback, this);

     }
     }

-
-    wxFAIL_MSG( wxT("wxComboBox: no selection") );
-
-    return wxEmptyString;
-}
-
-int wxComboBox::GetCount() const
-{
-    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;
-}
-
-void wxComboBox::SetSelection( int n )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    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 );
-    m_prevSelection = n;
-
-    EnableEvents();
-}
-
-wxString wxComboBox::GetValue() const
-{
-    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++)
+    else // disable

     {
     {

-        wxChar c = tmp[i];
-        printf( "%d ", (int) (c) );
+        g_signal_handlers_block_by_func(gtk_bin_get_child(GTK_BIN(m_widget)),
+            (gpointer)gtkcombobox_text_changed_callback, this);

     }
     }

-    printf( "\n" );
-#endif
-
-    return tmp;
-}
-
-void wxComboBox::SetValue( const wxString& value )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    wxString tmp;
-    if (!value.IsNull()) tmp = value;
-    gtk_entry_set_text( GTK_ENTRY(entry), wxGTK_CONV( tmp ) );
-
-    InvalidateBestSize();
-}
-
-void wxComboBox::Copy()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_editable_copy_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG );
-}
-
-void wxComboBox::Cut()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_editable_cut_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG );
-}
-
-void wxComboBox::Paste()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_editable_paste_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG);
-}
-
-void wxComboBox::Undo()
-{
-    // TODO
-}
-
-void wxComboBox::Redo()
-{
-    // TODO
-}
-
-void wxComboBox::SelectAll()
-{
-    SetSelection(0, GetLastPosition());
-}
-
-bool wxComboBox::CanUndo() const
-{
-    // TODO
-    return false;
-}
-
-bool wxComboBox::CanRedo() const
-{
-    // TODO
-    return false;
-}
-
-bool wxComboBox::HasSelection() const
-{
-    long from, to;
-    GetSelection(&from, &to);
-    return from != to;
-}
-
-bool wxComboBox::CanCopy() const
-{
-    // Can copy if there's a selection
-    return HasSelection();
-}
-
-bool wxComboBox::CanCut() const
-{
-    return CanCopy() && IsEditable();

 }
 
 }
 

-bool wxComboBox::CanPaste() const
+void wxComboBox::GTKDisableEvents()

 {
 {

-    // TODO: check for text on the clipboard
-    return IsEditable() ;
-}
+    EnableTextChangedEvents(false);

 
 

-bool wxComboBox::IsEditable() const
-{
-    return !HasFlag(wxCB_READONLY);
+    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);

 }
 
 }
 

-
-void wxComboBox::SetInsertionPoint( long pos )
+void wxComboBox::GTKEnableEvents()

 {
 {

-    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 );
-}
+    EnableTextChangedEvents(true);

 
 

-long wxComboBox::GetInsertionPoint() const
-{
-    return (long) GET_EDITABLE_POS( GTK_COMBO(m_widget)->entry );
+    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);

 }
 
 }
 

-wxTextPos wxComboBox::GetLastPosition() const
+GtkWidget* wxComboBox::GetConnectWidget()

 {
 {

-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    int pos = GTK_ENTRY(entry)->text_length;
-    return (long) pos-1;
+    return GTK_WIDGET( GetEntry() );

 }
 
 }
 

-void wxComboBox::Replace( long from, long to, const wxString& value )
+GdkWindow* wxComboBox::GTKGetWindow(wxArrayGdkWindows& /* windows */) const

 {
 {

-    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 (value.IsNull()) return;
-    gint pos = (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 );
+#ifdef __WXGTK3__
+    // no access to internal GdkWindows
+    return NULL;

 #else
 #else

-    gtk_editable_insert_text( GTK_EDITABLE(entry), value.c_str(), value.Length(), &pos );
+    return gtk_entry_get_text_window(GetEntry());

 #endif
 }
 
 #endif
 }
 

-void wxComboBox::SetSelection( long from, long to )
-{
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_editable_select_region( GTK_EDITABLE(entry), (gint)from, (gint)to );
-}
-
-void wxComboBox::GetSelection( long* from, long* to ) const
+// static
+wxVisualAttributes
+wxComboBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))

 {
 {

-    if (IsEditable())
-    {
-        GtkEditable *editable = GTK_EDITABLE(GTK_COMBO(m_widget)->entry);
-#ifdef __WXGTK20__
-        gint start, end;
-        gtk_editable_get_selection_bounds(editable, & start, & end);
-        *from = start;
-        *to = end;
+#ifdef __WXGTK3__
+    return GetDefaultAttributesFromGTKWidget(gtk_combo_box_new_with_entry(), true);

 #else
 #else

-        *from = (long) editable->selection_start_pos;
-        *to = (long) editable->selection_end_pos;
+    return GetDefaultAttributesFromGTKWidget(gtk_combo_box_entry_new(), true);

 #endif
 #endif

-    }
-}
-
-void wxComboBox::SetEditable( bool editable )
-{
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_entry_set_editable( GTK_ENTRY(entry), editable );
-}
-
-void wxComboBox::OnChar( wxKeyEvent &event )
-{
-    if ( event.GetKeyCode() == WXK_RETURN )
-    {
-        // GTK automatically selects an item if its in the list
-        wxCommandEvent eventEnter(wxEVT_COMMAND_TEXT_ENTER, GetId());
-        eventEnter.SetString( GetValue() );
-        eventEnter.SetInt( GetSelection() );
-        eventEnter.SetEventObject( this );
-
-        if (!GetEventHandler()->ProcessEvent( eventEnter ))
-        {
-            // 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))
-            {
-                GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
-
-                if (window->default_widget)
-                        gtk_widget_activate (window->default_widget);
-            }
-        }
-
-        // Catch GTK event so that GTK doesn't open the drop
-        // down list upon RETURN.
-        return;
-    }
-
-    event.Skip();
-}
-
-void wxComboBox::DisableEvents()
-{
-    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::SetValue(const wxString& value)

 {
 {

-    gtk_signal_connect_after( GTK_OBJECT(GTK_COMBO(m_widget)->list), "select-child",
-      GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
-    gtk_signal_connect_after( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );
-}
-
-void wxComboBox::OnSize( wxSizeEvent &event )
-{
-    // NB: In some situations (e.g. on non-first page of a wizard, if the
-    //     size used is default size), GtkCombo widget is resized correctly,
-    //     but it's look is not updated, it's rendered as if it was much wider.
-    //     No other widgets are affected, so it looks like a bug in GTK+.
-    //     Manually requesting resize calculation (as gtk_pizza_set_size does)
-    //     fixes it.
-    if (GTK_WIDGET_VISIBLE(m_widget))
-        gtk_widget_queue_resize(m_widget);
-
-    event.Skip();
-}
-
-void wxComboBox::DoApplyWidgetStyle(GtkRcStyle *style)
-{
-//    gtk_widget_modify_style( GTK_COMBO(m_widget)->button, syle );
-
-    gtk_widget_modify_style( GTK_COMBO(m_widget)->entry, style );
-    gtk_widget_modify_style( GTK_COMBO(m_widget)->list, style );
-
-    GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
-    GList *child = list->children;
-    while (child)
-    {
-        gtk_widget_modify_style( GTK_WIDGET(child->data), style );
-
-        GtkBin *bin = GTK_BIN(child->data);
-        gtk_widget_modify_style( bin->child, style );
-
-        child = child->next;
-    }
-}
-
-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 ) );
+    if ( HasFlag(wxCB_READONLY) )
+        SetStringSelection(value);
+    else
+        wxTextEntry::SetValue(value);

 }
 
 }
 

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

 {
 {

-    wxSize ret( wxControl::DoGetBestSize() );
+    wxChoice::SetString(n, text);

 
 

-    // we know better our horizontal extent: it depends on the longest string
-    // in the combobox
-    if ( m_widget )
+    if ( static_cast<int>(n) == GetSelection() )

     {
     {

-        int width;
-        size_t count = GetCount();
-        for ( size_t n = 0; n < count; n++ )
-        {
-            GetTextExtent( GetString(n), &width, NULL, NULL, NULL );
-            if ( width > ret.x )
-                ret.x = width;
-        }
+        // 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);

     }
     }

-
-    // empty combobox should have some reasonable default size too
-    if ( ret.x < 100 )
-        ret.x = 100;
-
-    CacheBestSize(ret);
-    return ret;
-}
-
-// static
-wxVisualAttributes
-wxComboBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
-{
-    return GetDefaultAttributesFromGTKWidget(gtk_combo_new, true);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1000,15 +352,12 @@ void wxComboBox::OnRedo(wxCommandEvent& WXUNUSED(event))
 
 void wxComboBox::OnDelete(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxComboBox::OnDelete(wxCommandEvent& WXUNUSED(event))
 {

-    long from, to;
-    GetSelection(& from, & to);
-    if (from != -1 && to != -1)
-        Remove(from, to);
+    RemoveSelection();

 }
 
 void wxComboBox::OnSelectAll(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void wxComboBox::OnSelectAll(wxCommandEvent& WXUNUSED(event))
 {

-    SetSelection(-1, -1);
+    SelectAll();

 }
 
 void wxComboBox::OnUpdateCut(wxUpdateUIEvent& event)
 }
 
 void wxComboBox::OnUpdateCut(wxUpdateUIEvent& event)


@@ -1043,7 +392,33 @@ void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event)
 
 void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event)
 {
 
 void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event)
 {

-    event.Enable(GetLastPosition() > 0);
+    event.Enable(!wxTextEntry::IsEmpty());

 }
 
 }
 

-#endif
+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