Fix explicitly setting focus to generic wxSpinCtrl.

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

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 439408958bd89fb940c0b6692cfec3bf37dc9a86..69c1373dde8c9ac096f4ba53a93f8184524d8ea3 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -42,14 +42,19 @@ gtkcombobox_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *comb
 static void
 gtkcombobox_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
 static void
 gtkcombobox_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {

-    if (!combo->m_hasVMT) return;
-
-    if (combo->GetSelection() == -1)
-        return;
+    combo->SendSelectionChangedEvent(wxEVT_COMMAND_COMBOBOX_SELECTED);
+}

 
 

-    wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
-    event.SetInt( combo->GetSelection() );
-    event.SetString( combo->GetStringSelection() );
+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_COMMAND_COMBOBOX_DROPDOWN
+                                  : wxEVT_COMMAND_COMBOBOX_CLOSEUP,
+                          combo->GetId() );

     event.SetEventObject( combo );
     combo->HandleWindowEvent( event );
 }
     event.SetEventObject( combo );
     combo->HandleWindowEvent( event );
 }


@@ -59,9 +64,9 @@ gtkcombobox_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 // wxComboBox
 //-----------------------------------------------------------------------------
 
 // wxComboBox
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxChoice)

 
 

-BEGIN_EVENT_TABLE(wxComboBox, wxControl)
+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)


@@ -81,6 +86,11 @@ 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()
 

+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,


@@ -100,10 +110,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_strings = NULL;
-    m_ignoreNextUpdate = false;
-    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 ))
     {


@@ -114,7 +120,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     if (HasFlag(wxCB_SORT))
         m_strings = new wxSortedArrayString();
 
     if (HasFlag(wxCB_SORT))
         m_strings = new wxSortedArrayString();
 

-    m_widget = gtk_combo_box_entry_new_text();
+    GTKCreateComboBoxWidget();

 
     if (HasFlag(wxBORDER_NONE))
     {
 
     if (HasFlag(wxBORDER_NONE))
     {


@@ -124,38 +130,65 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
 
     GtkEntry * const entry = GetEntry();
 
 
     GtkEntry * const entry = GetEntry();
 

-    gtk_entry_set_editable( entry, TRUE );
+    if ( entry )
+    {
+        // Set it up to trigger default item on enter key press
+        gtk_entry_set_activates_default( entry,
+                                         !HasFlag(wxTE_PROCESS_ENTER) );
+
+        gtk_entry_set_editable( entry, TRUE );
+    }

 
     Append(n, choices);
 
     m_parent->DoAddChild( this );
 
 
     Append(n, choices);
 
     m_parent->DoAddChild( this );
 

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

 
     PostCreation(size);
 
 
     PostCreation(size);
 

-    ConnectWidget( m_widget );
-
-    gtk_entry_set_text( entry, wxGTK_CONV(value) );
-
-    if (style & wxCB_READONLY)
-        gtk_entry_set_editable( entry, FALSE );
+    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_entry_set_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);
+        g_signal_connect_after (entry, "changed",
+                                G_CALLBACK (gtkcombobox_text_changed_callback), this);
+    }

 
     g_signal_connect_after (m_widget, "changed",
                         G_CALLBACK (gtkcombobox_changed_callback), this);
 
 
     g_signal_connect_after (m_widget, "changed",
                         G_CALLBACK (gtkcombobox_changed_callback), this);
 

+    if ( !gtk_check_version(2,10,0) )
+    {
+        g_signal_connect (m_widget, "notify::popup-shown",
+                          G_CALLBACK (gtkcombobox_popupshown_callback), this);
+    }

 
     SetInitialSize(size); // need this too because this is a wxControlWithItems
 
     return true;
 }
 
 
     SetInitialSize(size); // need this too because this is a wxControlWithItems
 
     return true;
 }
 

-GtkEntry *wxComboBox::GetEntry() const
+void wxComboBox::GTKCreateComboBoxWidget()

 {
 {

-    return GTK_ENTRY(GTK_BIN(m_widget)->child);
+    m_widget = gtk_combo_box_entry_new_text();
+    g_object_ref(m_widget);
+
+    m_entry = GTK_ENTRY(GTK_BIN(m_widget)->child);

 }
 
 GtkEditable *wxComboBox::GetEditable() const
 }
 
 GtkEditable *wxComboBox::GetEditable() const


@@ -163,222 +196,12 @@ GtkEditable *wxComboBox::GetEditable() const
     return GTK_EDITABLE( GTK_BIN(m_widget)->child );
 }
 
     return GTK_EDITABLE( GTK_BIN(m_widget)->child );
 }
 

-wxComboBox::~wxComboBox()
-{
-    Clear();
-
-    delete m_strings;
-}
-
-void wxComboBox::SetFocus()
-{
-    if ( m_hasFocus )
-    {
-        // don't do anything if we already have focus
-        return;
-    }
-
-    gtk_widget_grab_focus( m_focusWidget );
-}
-
-int wxComboBox::DoInsertItems(const wxArrayStringsAdapter & items,
-                              unsigned int pos,
-                              void **clientData, wxClientDataType type)
-{
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
-
-    wxASSERT_MSG( !IsSorted() || (pos == GetCount()),
-                 _T("In a sorted combobox data could only be appended"));
-
-    const int count = items.GetCount();
-
-    int n = wxNOT_FOUND;
-
-    GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
-    for( int i = 0; i < count; ++i )
-    {
-        n = pos + i;
-        // If sorted, use this wxSortedArrayStrings to determine
-        // the right insertion point
-        if(m_strings)
-            n = m_strings->Add(items[i]);
-
-        gtk_combo_box_insert_text( combobox, n, wxGTK_CONV( items[i] ) );
-
-        m_clientData.Insert( NULL, n );
-        AssignNewItemClientData(n, clientData, i, type);
-    }
-
-    InvalidateBestSize();
-
-    return n;
-}
-
-void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
-{
-    m_clientData[n] = clientData;
-}
-
-void* wxComboBox::DoGetItemClientData(unsigned int n) const
-{
-    return m_clientData[n];
-}
-
-void wxComboBox::DoClear()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    DisableEvents();
-
-    GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
-    const unsigned int count = GetCount();
-    for (unsigned int i = 0; i < count; i++)
-        gtk_combo_box_remove_text( combobox, 0 );
-
-    m_clientData.Clear();
-
-    if(m_strings)
-        m_strings->Clear();
-
-    EnableEvents();
-
-    InvalidateBestSize();
-}
-
-void wxComboBox::DoDeleteOneItem(unsigned int n)
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    wxCHECK_RET( IsValid(n), wxT("invalid index") );
-
-    GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
-    gtk_combo_box_remove_text( combobox, n );
-
-    m_clientData.RemoveAt( n );
-    if(m_strings)
-        m_strings->RemoveAt( n );
-
-    InvalidateBestSize();
-}
-
-void wxComboBox::SetString(unsigned int n, const wxString &text)
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
-    wxCHECK_RET( IsValid(n), wxT("invalid index") );
-
-    GtkTreeModel *model = gtk_combo_box_get_model( combobox );
-    GtkTreeIter iter;
-    if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n))
-    {
-        GValue value = { 0, };
-        g_value_init( &value, G_TYPE_STRING );
-        g_value_set_string( &value, wxGTK_CONV( text ) );
-        gtk_list_store_set_value( GTK_LIST_STORE(model), &iter, 0, &value );
-        g_value_unset( &value );
-    }
-
-    InvalidateBestSize();
-}
-
-int wxComboBox::FindString( const wxString &item, bool bCase ) const
-{
-    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid combobox") );
-
-    GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
-    GtkTreeModel* model = gtk_combo_box_get_model( combobox );
-    GtkTreeIter iter;
-    gtk_tree_model_get_iter_first( model, &iter );
-    if (!gtk_list_store_iter_is_valid(GTK_LIST_STORE(model), &iter ))
-        return -1;
-    int count = 0;
-    do
-    {
-        GValue value = { 0, };
-        gtk_tree_model_get_value( model, &iter, 0, &value );
-        wxString str = wxGTK_CONV_BACK( g_value_get_string( &value ) );
-        g_value_unset( &value );
-
-        if (item.IsSameAs( str, bCase ) )
-            return count;
-
-        count++;
-    }
-    while ( gtk_tree_model_iter_next(model, &iter) );
-
-    return wxNOT_FOUND;
-}
-
-int wxComboBox::GetSelection() const
-{
-    GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
-    return gtk_combo_box_get_active( combobox );
-}
-
-int wxComboBox::GetCurrentSelection() const
-{
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
-
-    GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
-    return gtk_combo_box_get_active( combobox );
-}
-
-wxString wxComboBox::GetString(unsigned int n) const
-{
-    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid combobox") );
-
-    wxString str;
-
-    GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
-    GtkTreeModel *model = gtk_combo_box_get_model( combobox );
-    GtkTreeIter iter;
-    if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n))
-    {
-        GValue value = { 0, };
-        gtk_tree_model_get_value( model, &iter, 0, &value );
-        wxString tmp = wxGTK_CONV_BACK( g_value_get_string( &value ) );
-        g_value_unset( &value );
-        return tmp;
-    }
-
-    return str;
-}
-
-unsigned int wxComboBox::GetCount() const
-{
-    wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid combobox") );
-
-    GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
-    GtkTreeModel* model = gtk_combo_box_get_model( combobox );
-    GtkTreeIter iter;
-    gtk_tree_model_get_iter_first( model, &iter );
-    if (!gtk_list_store_iter_is_valid(GTK_LIST_STORE(model), &iter ))
-        return 0;
-    unsigned int ret = 1;
-    while (gtk_tree_model_iter_next( model, &iter ))
-        ret++;
-    return ret;
-}
-
-void wxComboBox::SetSelection( int n )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    DisableEvents();
-
-    GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
-    gtk_combo_box_set_active( combobox, n );
-
-    EnableEvents();
-}
-

 void wxComboBox::OnChar( wxKeyEvent &event )
 {
     switch ( event.GetKeyCode() )
     {
         case WXK_RETURN:
 void wxComboBox::OnChar( wxKeyEvent &event )
 {
     switch ( event.GetKeyCode() )
     {
         case WXK_RETURN:

-            if ( HasFlag(wxTE_PROCESS_ENTER) )
+            if ( HasFlag(wxTE_PROCESS_ENTER) && GetEntry() )

             {
                 // GTK automatically selects an item if its in the list
                 wxCommandEvent eventEnter(wxEVT_COMMAND_TEXT_ENTER, GetId());
             {
                 // GTK automatically selects an item if its in the list
                 wxCommandEvent eventEnter(wxEVT_COMMAND_TEXT_ENTER, GetId());


@@ -393,39 +216,47 @@ void wxComboBox::OnChar( wxKeyEvent &event )
                     return;
                 }
             }
                     return;
                 }
             }

-
-            // On enter key press, we must give a signal to default control, 
-            // Otherwise, nothing happens when pressing Enter from inside a 
-            // combo box in a dialog. 
-            wxWindow *top_frame = wxGetTopLevelParent(this);
-            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 );
-            }

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

-void wxComboBox::DisableEvents()
+void wxComboBox::EnableTextChangedEvents(bool enable)
+{
+    if ( !GetEntry() )
+        return;
+
+    if ( enable )
+    {
+        g_signal_handlers_unblock_by_func(GTK_BIN(m_widget)->child,
+            (gpointer)gtkcombobox_text_changed_callback, this);
+    }
+    else // disable
+    {
+        g_signal_handlers_block_by_func(GTK_BIN(m_widget)->child,
+            (gpointer)gtkcombobox_text_changed_callback, this);
+    }
+}
+
+void wxComboBox::GTKDisableEvents()

 {
 {

-    g_signal_handlers_block_by_func(GTK_BIN(m_widget)->child,
-        (gpointer)gtkcombobox_text_changed_callback, this);
+    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_changed_callback, this);

+    g_signal_handlers_block_by_func(m_widget,
+        (gpointer)gtkcombobox_popupshown_callback, this);

 }
 
 }
 

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

 {
 {

-    g_signal_handlers_unblock_by_func(GTK_BIN(m_widget)->child,
-        (gpointer)gtkcombobox_text_changed_callback, this);
+    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_changed_callback, this);

+    g_signal_handlers_unblock_by_func(m_widget,
+        (gpointer)gtkcombobox_popupshown_callback, this);

 }
 
 GtkWidget* wxComboBox::GetConnectWidget()
 }
 
 GtkWidget* wxComboBox::GetConnectWidget()


@@ -433,39 +264,11 @@ GtkWidget* wxComboBox::GetConnectWidget()
     return GTK_WIDGET( GetEntry() );
 }
 
     return GTK_WIDGET( GetEntry() );
 }
 

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

 {
 {

-    wxUnusedVar(windows);
-

     return GetEntry()->text_area;
 }
 
     return GetEntry()->text_area;
 }
 

-wxSize wxComboBox::DoGetBestSize() const
-{
-    wxSize ret( wxControl::DoGetBestSize() );
-
-    // we know better our horizontal extent: it depends on the longest string
-    // in the combobox
-    if ( m_widget )
-    {
-        int width;
-        unsigned int count = GetCount();
-        for ( unsigned int n = 0; n < count; n++ )
-        {
-            GetTextExtent(GetString(n), &width, NULL, NULL, NULL );
-            if ( width > ret.x )
-                ret.x = width;
-        }
-    }
-
-    // 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))
 // static
 wxVisualAttributes
 wxComboBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))


@@ -504,15 +307,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)


@@ -547,7 +347,16 @@ void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event)
 
 void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event)
 {
 
 void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event)
 {

-    event.Enable(GetLastPosition() > 0);
+    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) );
+}

 #endif // wxUSE_COMBOBOX
 #endif // wxUSE_COMBOBOX