Remove unnecessary base class OnPaint() call from wxGenericColourDialog.

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

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index f6e3925ea43709a978d078367c6b895916297164..d9fc4408c7f292f6e709a0f4f49465532a3b23ce 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -1,258 +1,386 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $id$
+// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+#include "wx/wxprec.h"

 
 

-#ifdef __GNUG__
-#pragma implementation "choice.h"
-#endif
+#if wxUSE_CHOICE || wxUSE_COMBOBOX

 
 #include "wx/choice.h"
 
 
 #include "wx/choice.h"
 

-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
+#ifndef WX_PRECOMP
+    #include "wx/arrstr.h"
+#endif

 
 

-extern bool   g_blockEventsOnDrag;
+#include "wx/gtk/private.h"

 
 

-//-----------------------------------------------------------------------------
-// "activate"
-//-----------------------------------------------------------------------------

 
 

-static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
+// ----------------------------------------------------------------------------
+// GTK callbacks
+// ----------------------------------------------------------------------------
+
+extern "C" {
+
+static void
+gtk_choice_changed_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )

 {
 {

-  if (!choice->HasVMT()) return;
-  if (g_blockEventsOnDrag) return;
-  
-  wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() );
-  event.SetInt( choice->GetSelection() );
-  wxString tmp( choice->GetStringSelection() );
-  event.SetString( WXSTRINGCAST(tmp) );
-  event.SetEventObject(choice);
-  choice->GetEventHandler()->ProcessEvent(event);
+    choice->SendSelectionChangedEvent(wxEVT_COMMAND_CHOICE_SELECTED);
+}
+

 }
 
 //-----------------------------------------------------------------------------
 // wxChoice
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // wxChoice
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl)
+void wxChoice::Init()
+{
+    m_strings = NULL;
+    m_stringCellIndex = 0;
+}

 
 

-wxChoice::wxChoice(void)
+bool wxChoice::Create( wxWindow *parent, wxWindowID id,
+                       const wxPoint &pos, const wxSize &size,
+                       const wxArrayString& choices,
+                       long style, const wxValidator& validator,
+                       const wxString &name )

 {
 {

+    wxCArrayString chs(choices);
+
+    return Create( parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+                   style, validator, name );

 }
 
 bool wxChoice::Create( wxWindow *parent, wxWindowID id,
 }
 
 bool wxChoice::Create( wxWindow *parent, wxWindowID id,

-      const wxPoint &pos, const wxSize &size,
-      int n, const wxString choices[],
-      long style, const wxValidator& validator, const wxString &name )
+                       const wxPoint &pos, const wxSize &size,
+                       int n, const wxString choices[],
+                       long style, const wxValidator& validator,
+                       const wxString &name )

 {
 {

-  m_needParent = TRUE;
-  
-  PreCreation( parent, id, pos, size, style, name );
-  
-  SetValidator( validator );
-
-  m_widget = gtk_option_menu_new();
-  
-  wxSize newSize = size;
-  if (newSize.x == -1) newSize.x = 80;
-  if (newSize.y == -1) newSize.y = 26;
-  SetSize( newSize.x, newSize.y );
-  
-  GtkWidget *menu;
-  menu = gtk_menu_new();
-  
-  for (int i = 0; i < n; i++)
-  {
-    GtkWidget *item;
-    item = gtk_menu_item_new_with_label( choices[i] );
-    gtk_signal_connect( GTK_OBJECT( item ), "activate", 
-      GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
-    gtk_menu_append( GTK_MENU(menu), item );
-    gtk_widget_show( item );
-  }
-  gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
-  
-  PostCreation();
-  
-  Show( TRUE );
-    
-  return TRUE;
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxChoice creation failed") );
+        return false;
+    }
+
+    if ( IsSorted() )
+    {
+        // if our m_strings != NULL, Append() will check for it and insert
+        // items in the correct order
+        m_strings = new wxGtkCollatedArrayString;
+    }
+
+    m_widget = gtk_combo_box_new_text();
+    g_object_ref(m_widget);
+
+    Append(n, choices);
+
+    m_parent->DoAddChild( this );
+
+    PostCreation(size);
+
+    g_signal_connect_after (m_widget, "changed",
+                            G_CALLBACK (gtk_choice_changed_callback), this);
+
+    return true;

 }
 }

-      
-void wxChoice::Append( const wxString &item )
+
+wxChoice::~wxChoice()

 {
 {

-  GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
-  GtkWidget *menu_item;
-  menu_item = gtk_menu_item_new_with_label( item );
-  
-  if (m_hasOwnStyle)
-  {
-    GtkBin *bin = GTK_BIN( menu_item );
-    gtk_widget_set_style( bin->child, 
-      gtk_style_ref(
-        gtk_widget_get_style( m_widget ) ) ); 
-  }
-  
-  gtk_signal_connect( GTK_OBJECT( menu_item ), "activate", 
-    GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
-    
-  gtk_menu_append( GTK_MENU(menu), menu_item );
-  gtk_widget_show( menu_item );
+    delete m_strings;

 }
 }

- 
-void wxChoice::Clear(void)
+
+void wxChoice::SendSelectionChangedEvent(wxEventType evt_type)

 {
 {

-  gtk_option_menu_remove_menu( GTK_OPTION_MENU(m_widget) );
-  GtkWidget *menu = gtk_menu_new();
-  gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
+    if (!m_hasVMT)
+        return;
+
+    if (GetSelection() == -1)
+        return;
+
+    wxCommandEvent event( evt_type, GetId() );
+
+    int n = GetSelection();
+    event.SetInt( n );
+    event.SetString( GetStringSelection() );
+    event.SetEventObject( this );
+    InitCommandEventWithItems( event, n );
+
+    HandleWindowEvent( event );
+}
+
+void wxChoice::GTKInsertComboBoxTextItem( unsigned int n, const wxString& text )
+{
+    gtk_combo_box_insert_text( GTK_COMBO_BOX( m_widget ), n, wxGTK_CONV( text ) );

 }
 
 }
 

-void wxChoice::Delete( int WXUNUSED(n) )
+int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
+                            unsigned int pos,
+                            void **clientData, wxClientDataType type)

 {
 {

-  wxFAIL_MSG( "wxChoice:Delete not implemented" );
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid control") );
+
+    wxASSERT_MSG( !IsSorted() || (pos == GetCount()),
+                 wxT("In a sorted choice data could only be appended"));
+
+    const int count = items.GetCount();
+
+    int n = wxNOT_FOUND;
+
+    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]);
+
+        GTKInsertComboBoxTextItem( n, items[i] );
+
+        m_clientData.Insert( NULL, n );
+        AssignNewItemClientData(n, clientData, i, type);
+    }
+
+    InvalidateBestSize();
+
+    return n;

 }
 
 }
 

-int wxChoice::FindString( const wxString &string ) const
+void wxChoice::DoSetItemClientData(unsigned int n, void* clientData)

 {
 {

-  // If you read this code once and you think you understand
-  // it, then you are very wrong. Robert Roebling.
-  
-  GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
-  int count = 0;
-  GList *child = menu_shell->children;
-  while (child)
-  {
-    GtkBin *bin = GTK_BIN( child->data );
-    GtkLabel *label = (GtkLabel *) NULL;
-    if (bin->child) label = GTK_LABEL(bin->child);
-    if (!label) label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
-    
-    wxASSERT_MSG( label != NULL , "wxChoice: invalid label" );
-    
-    if (string == label->label) return count;
-    child = child->next;
-    count++;
-  }
-  
-  wxFAIL_MSG( "wxChoice: string not found" );
-  
-  return -1;
+    m_clientData[n] = clientData;

 }
 
 }
 

-int wxChoice::GetColumns(void) const
+void* wxChoice::DoGetItemClientData(unsigned int n) const

 {
 {

-  return 1;
+    return m_clientData[n];

 }
 
 }
 

-int wxChoice::GetSelection(void)
+void wxChoice::DoClear()

 {
 {

-  GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
-  int count = 0;
-  GList *child = menu_shell->children;
-  while (child)
-  {
-    GtkBin *bin = GTK_BIN( child->data );
-    if (!bin->child) return count;
-    child = child->next;
-    count++;
-  }
-  
-  wxFAIL_MSG( "wxChoice: no selection" );
-  
-  return -1;
+    wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
+
+    GTKDisableEvents();
+
+    GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+    GtkTreeModel* model = gtk_combo_box_get_model( combobox );
+    gtk_list_store_clear(GTK_LIST_STORE(model));
+
+    m_clientData.Clear();
+
+    if (m_strings)
+        m_strings->Clear();
+
+    GTKEnableEvents();
+
+    InvalidateBestSize();

 }
 
 }
 

-wxString wxChoice::GetString( int n ) const
+void wxChoice::DoDeleteOneItem(unsigned int n)

 {
 {

-  GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
-  int count = 0;
-  GList *child = menu_shell->children;
-  while (child)
-  {
-    GtkBin *bin = GTK_BIN( child->data );
-    if (count == n)
+    wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
+    wxCHECK_RET( IsValid(n), wxT("invalid index in wxChoice::Delete") );
+
+    GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+    GtkTreeModel* model = gtk_combo_box_get_model( combobox );
+    GtkListStore* store = GTK_LIST_STORE(model);
+    GtkTreeIter iter;
+    gtk_tree_model_iter_nth_child( model, &iter,
+                                   NULL, (gint) n );
+    gtk_list_store_remove( store, &iter );
+
+    m_clientData.RemoveAt( n );
+    if ( m_strings )
+        m_strings->RemoveAt( n );
+
+    InvalidateBestSize();
+}
+
+int wxChoice::FindString( const wxString &item, bool bCase ) const
+{
+    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid control") );
+
+    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

     {
     {

-      GtkLabel *label = (GtkLabel *) NULL;
-      if (bin->child) label = GTK_LABEL(bin->child);
-      if (!label) label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
-      
-      wxASSERT_MSG( label != NULL , "wxChoice: invalid label" );
-      
-      return label->label;
+        GValue value = { 0, };
+        gtk_tree_model_get_value( model, &iter, m_stringCellIndex, &value );
+        wxString str = wxGTK_CONV_BACK( g_value_get_string( &value ) );
+        g_value_unset( &value );
+
+        if (item.IsSameAs( str, bCase ) )
+            return count;
+
+        count++;

     }
     }

-    child = child->next;
-    count++;
-  }
-  
-  wxFAIL_MSG( "wxChoice: string not found" );
-  
-  return "";
+    while ( gtk_tree_model_iter_next(model, &iter) );
+
+    return wxNOT_FOUND;

 }
 
 }
 

-wxString wxChoice::GetStringSelection(void) const
+int wxChoice::GetSelection() const

 {
 {

-  GtkLabel *label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
-  
-  wxASSERT_MSG( label != NULL , "wxChoice: invalid label" );
-  
-  return label->label;
+    return gtk_combo_box_get_active( GTK_COMBO_BOX( m_widget ) );
+}
+
+void wxChoice::SetString(unsigned int n, const wxString &text)
+{
+    wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
+
+    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, m_stringCellIndex, &value );
+        g_value_unset( &value );
+    }
+
+    InvalidateBestSize();

 }
 
 }
 

-int wxChoice::Number(void) const
+wxString wxChoice::GetString(unsigned int n) const

 {
 {

-  GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
-  int count = 0;
-  GList *child = menu_shell->children;
-  while (child)
-  {
-    count++;
-    child = child->next;
-  }
-  return count;
+    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid control") );
+
+    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, m_stringCellIndex, &value );
+        wxString tmp = wxGTK_CONV_BACK( g_value_get_string( &value ) );
+        g_value_unset( &value );
+        return tmp;
+    }
+
+    return str;

 }
 
 }
 

-void wxChoice::SetColumns( int WXUNUSED(n) )
+unsigned int wxChoice::GetCount() const

 {
 {

+    wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid control") );
+
+    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 wxChoice::SetSelection( int n )
 {
 }
 
 void wxChoice::SetSelection( int n )
 {

-  int tmp = n;
-  gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp );
-  
-  gtk_choice_clicked_callback( (GtkWidget *) NULL, this );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
+
+    GTKDisableEvents();
+
+    GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+    gtk_combo_box_set_active( combobox, n );
+
+    GTKEnableEvents();
+}
+
+void wxChoice::SetColumns(int n)
+{
+    gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(m_widget), n);
+}
+
+int wxChoice::GetColumns() const
+{
+    // gtk_combo_box_get_wrap_width() was added in gtk 2.6
+    gint intval;
+    g_object_get(G_OBJECT(m_widget), "wrap-width", &intval, NULL);
+    return intval;
+}
+
+
+void wxChoice::GTKDisableEvents()
+{
+    g_signal_handlers_block_by_func(m_widget,
+                                (gpointer) gtk_choice_changed_callback, this);
+}
+
+void wxChoice::GTKEnableEvents()
+{
+    g_signal_handlers_unblock_by_func(m_widget,
+                                (gpointer) gtk_choice_changed_callback, this);
+}
+
+
+GdkWindow *wxChoice::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
+{
+    return gtk_widget_get_window(m_widget);

 }
 
 }
 

-void wxChoice::SetStringSelection( const wxString &string )
+// Notice that this method shouldn't be necessary, because GTK calculates
+// properly size of the combobox but for unknown reasons it doesn't work
+// correctly in wx without this.
+wxSize wxChoice::DoGetBestSize() const

 {
 {

-  int n = FindString( string );
-  if (n != -1) SetSelection( n );
+    // strangely, this returns a width of 188 pixels from GTK+ (?)
+    wxSize ret( wxControl::DoGetBestSize() );
+
+    // we know better our horizontal extent: it depends on the longest string
+    // in the combobox
+    if ( m_widget )
+    {
+        ret.x = GetCount() > 0 ? 0 : 60;  // start with something "sensible"
+        int width;
+        unsigned int count = GetCount();
+        for ( unsigned int n = 0; n < count; n++ )
+        {
+            GetTextExtent(GetString(n), &width, NULL, NULL, NULL );
+            if ( width + 40 > ret.x ) // 40 for drop down arrow and space around text
+                ret.x = width + 40;
+        }
+    }
+
+    // empty combobox should have some reasonable default size too
+    if ((GetCount() == 0) && (ret.x < 80))
+        ret.x = 80;
+
+    CacheBestSize(ret);
+    return ret;

 }
 
 }
 

-void wxChoice::SetFont( const wxFont &font )
+void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style)

 {
 {

-  wxWindow::SetFont( font );
-   
-  GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
-  GList *child = menu_shell->children;
-  while (child)
-  {
-    GtkBin *bin = GTK_BIN( child->data );
-    GtkWidget *label = (GtkWidget *) NULL;
-    if (bin->child) label = bin->child;
-    if (!label) label = GTK_BUTTON(m_widget)->child;
-    
-    gtk_widget_set_style( label,
-      gtk_style_ref(
-        gtk_widget_get_style( m_widget ) ) ); 
-       
-    child = child->next;
-  }
+    gtk_widget_modify_style(m_widget, style);
+    gtk_widget_modify_style(gtk_bin_get_child(GTK_BIN(m_widget)), style);

 }
 }

+
+
+// static
+wxVisualAttributes
+wxChoice::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_combo_box_new);
+}
+
+
+#endif // wxUSE_CHOICE || wxUSE_COMBOBOX