X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..23fb33aa4e15110d41b5a16fff438e44e0cb3ea9:/src/gtk/combobox.cpp

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 5d080a400a..b94d1f983b 100644
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -1,282 +1,308 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        combobox.cpp
+// Name:        src/gtk/combobox.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:   	wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// 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"
 
-//-----------------------------------------------------------------------------
-// wxComboBox
-//-----------------------------------------------------------------------------
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/settings.h"
+    #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
+    #include "wx/arrstr.h"
+#endif
 
-void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
+#include "wx/gtk/private.h"
+
+// ----------------------------------------------------------------------------
+// GTK callbacks
+// ----------------------------------------------------------------------------
+
+extern "C" {
+static void
+gtkcombobox_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
-  wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, combo->GetId());
-  event.SetInt( combo->GetSelection() );
-  wxString tmp( combo->GetStringSelection() );
-  event.SetString( WXSTRINGCAST(tmp) );
-  event.SetEventObject(combo);
-  combo->ProcessEvent(event);
-};
+    if (!combo->m_hasVMT) return;
 
-//-----------------------------------------------------------------------------
+    wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
+    event.SetString( combo->GetValue() );
+    event.SetEventObject( combo );
+    combo->HandleWindowEvent( event );
+}
 
-IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
+static void
+gtkcombobox_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
+{
+    combo->SendSelectionChangedEvent(wxEVT_COMMAND_COMBOBOX_SELECTED);
+}
+}
+
+//-----------------------------------------------------------------------------
+// wxComboBox
+//-----------------------------------------------------------------------------
 
-bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value,
-  const wxPoint& pos, const wxSize& size,
-  int n, const wxString choices[],
-  long style, const wxString& name )
+IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxChoice)
+
+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()
+
+void wxComboBox::Init()
 {
-  m_needParent = TRUE;
-  
-  PreCreation( parent, id, pos, size, style, name );
-  
-  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;
-    list_item = gtk_list_item_new_with_label( choices[i] ); 
-  
-    gtk_signal_connect( GTK_OBJECT(list_item), "select", 
-      GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-  
-    gtk_container_add( GTK_CONTAINER(list), list_item );
-    
-    gtk_widget_show( list_item );
-  };
-  
-  PostCreation();
-
-  if (!value.IsNull()) SetValue( value );
-    
-  Show( TRUE );
-    
-  return TRUE;
-};
-
-void wxComboBox::Clear(void)
+    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 )
 {
-  GtkWidget *list = GTK_COMBO(m_widget)->list;
-  gtk_list_clear_items( GTK_LIST(list), 0, Number() );
-};
+    wxCArrayString chs(choices);
+
+    return Create( parent, id, value, pos, size, chs.GetCount(),
+                   chs.GetStrings(), style, validator, name );
+}
 
-void wxComboBox::Append( const wxString &item )
+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 )
 {
-  GtkWidget *list = GTK_COMBO(m_widget)->list;
-  
-  GtkWidget *list_item;
-  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 );
-  
-  gtk_container_add( GTK_CONTAINER(list), list_item );
-    
-  gtk_widget_show( list_item );
-};
-
-void wxComboBox::Append( const wxString &WXUNUSED(item), char* WXUNUSED(clientData) )
+    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 wxSortedArrayString();
+
+    GTKCreateComboBoxWidget();
+
+    if (HasFlag(wxBORDER_NONE))
+    {
+        // Doesn't seem to work
+        // g_object_set (m_widget, "has-frame", FALSE, NULL);
+    }
+
+    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_entry_set_editable( entry, TRUE );
+    }
+
+    Append(n, choices);
+
+    m_parent->DoAddChild( this );
+
+    if ( entry )
+        m_focusWidget = GTK_WIDGET( entry );
+
+    PostCreation(size);
+
+    if ( entry )
+    {
+        gtk_entry_set_text( entry, wxGTK_CONV(value) );
+
+        if (style & wxCB_READONLY)
+            gtk_entry_set_editable( entry, FALSE );
+
+        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);
+
+    SetInitialSize(size); // need this too because this is a wxControlWithItems
+
+    return true;
+}
+
+void wxComboBox::GTKCreateComboBoxWidget()
 {
-};
+    m_widget = gtk_combo_box_entry_new_text();
+    g_object_ref(m_widget);
 
-void wxComboBox::Delete( int n )
+    m_entry = GTK_ENTRY(GTK_BIN(m_widget)->child);
+}
+
+GtkEditable *wxComboBox::GetEditable() const
 {
-  GtkWidget *list = GTK_COMBO(m_widget)->list;
-  gtk_list_clear_items( GTK_LIST(list), n, n );
-};
+    return GTK_EDITABLE( GTK_BIN(m_widget)->child );
+}
 
-int wxComboBox::FindString( const wxString &item )
+void wxComboBox::OnChar( wxKeyEvent &event )
 {
-  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;
-  };
-  return -1;
-};
-
-char* wxComboBox::GetClientData( int n )
+    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_COMMAND_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::DisableEvents()
 {
-  wxNode *node = m_clientData.Nth( n );
-  if (node) return (char*)node->Data();
-  return NULL;
-};
+    if ( GetEntry() )
+        g_signal_handlers_block_by_func(GTK_BIN(m_widget)->child,
+            (gpointer)gtkcombobox_text_changed_callback, this);
 
-void wxComboBox::SetClientData( int n, char * clientData )
-{
-  wxNode *node = m_clientData.Nth( n );
-  if (node) node->SetData( (wxObject*) clientData );
-};
+    g_signal_handlers_block_by_func(m_widget,
+        (gpointer)gtkcombobox_changed_callback, this);
+}
 
-int wxComboBox::GetSelection(void) const
+void wxComboBox::EnableEvents()
 {
-  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
+    if ( GetEntry() )
+        g_signal_handlers_unblock_by_func(GTK_BIN(m_widget)->child,
+            (gpointer)gtkcombobox_text_changed_callback, this);
+
+    g_signal_handlers_unblock_by_func(m_widget,
+        (gpointer)gtkcombobox_changed_callback, this);
+}
+
+GtkWidget* wxComboBox::GetConnectWidget()
 {
-  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;
-  };
-  return "";
-};
-
-wxString wxComboBox::GetStringSelection(void) const
+    return GTK_WIDGET( GetEntry() );
+}
+
+GdkWindow *wxComboBox::GTKGetWindow(wxArrayGdkWindows& windows) const
 {
-  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;
-  };
-  return "";
-};
-
-int wxComboBox::Number(void) const
+    wxUnusedVar(windows);
+
+    return GetEntry()->text_area;
+}
+
+// static
+wxVisualAttributes
+wxComboBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-  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 )
+    return GetDefaultAttributesFromGTKWidget(gtk_combo_box_entry_new, true);
+}
+
+// ----------------------------------------------------------------------------
+// standard event handling
+// ----------------------------------------------------------------------------
+
+void wxComboBox::OnCut(wxCommandEvent& WXUNUSED(event))
 {
-  GtkWidget *list = GTK_COMBO(m_widget)->list;
-  gtk_list_select_item( GTK_LIST(list), n );
-};
+    Cut();
+}
 
-wxString wxComboBox::GetValue(void) const
+void wxComboBox::OnCopy(wxCommandEvent& WXUNUSED(event))
 {
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  wxString tmp = gtk_entry_get_text( GTK_ENTRY(entry) );
-  return tmp;
-};
+    Copy();
+}
 
-void wxComboBox::SetValue( const wxString& value )
+void wxComboBox::OnPaste(wxCommandEvent& WXUNUSED(event))
 {
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  wxString tmp = "";
-  if (!value.IsNull()) tmp = value;
-  gtk_entry_set_text( GTK_ENTRY(entry), tmp );
-};
+    Paste();
+}
 
-void wxComboBox::Copy(void)
+void wxComboBox::OnUndo(wxCommandEvent& WXUNUSED(event))
 {
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 );
-};
+    Undo();
+}
 
-void wxComboBox::Cut(void)
+void wxComboBox::OnRedo(wxCommandEvent& WXUNUSED(event))
 {
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 );
-};
+    Redo();
+}
 
-void wxComboBox::Paste(void)
+void wxComboBox::OnDelete(wxCommandEvent& WXUNUSED(event))
 {
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );
-};
+    RemoveSelection();
+}
 
-void wxComboBox::SetInsertionPoint( long pos )
+void wxComboBox::OnSelectAll(wxCommandEvent& WXUNUSED(event))
 {
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  int tmp = (int) pos;
-  gtk_entry_set_position( GTK_ENTRY(entry), tmp );
-};
+    SelectAll();
+}
 
-void wxComboBox::SetInsertionPointEnd(void)
+void wxComboBox::OnUpdateCut(wxUpdateUIEvent& event)
 {
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  int pos = GTK_ENTRY(entry)->text_length;
-  SetInsertionPoint( pos-1 );
-};
+    event.Enable( CanCut() );
+}
 
-long wxComboBox::GetInsertionPoint(void) const
+void wxComboBox::OnUpdateCopy(wxUpdateUIEvent& event)
 {
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  return (long) GTK_EDITABLE(entry)->current_pos;
-};
+    event.Enable( CanCopy() );
+}
 
-long wxComboBox::GetLastPosition(void) const
+void wxComboBox::OnUpdatePaste(wxUpdateUIEvent& event)
 {
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  int pos = GTK_ENTRY(entry)->text_length;
-  return (long) pos-1;
-};
+    event.Enable( CanPaste() );
+}
 
-void wxComboBox::Replace( long from, long to, const wxString& value )
+void wxComboBox::OnUpdateUndo(wxUpdateUIEvent& event)
 {
-  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 );
-};
-
-void wxComboBox::Remove(long from, long to)
+    event.Enable( CanUndo() );
+}
+
+void wxComboBox::OnUpdateRedo(wxUpdateUIEvent& event)
 {
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
-};
+    event.Enable( CanRedo() );
+}
 
-void wxComboBox::SetSelection( long WXUNUSED(from), long WXUNUSED(to) )
+void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event)
 {
-};
+    event.Enable(HasSelection() && IsEditable()) ;
+}
 
-void wxComboBox::SetEditable( bool WXUNUSED(editable) )
+void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event)
 {
-};
+    event.Enable(!wxTextEntry::IsEmpty());
+}
 
-      
+#endif // wxUSE_COMBOBOX