/////////////////////////////////////////////////////////////////////////////
-// Name: choice.cpp
+// Name: src/gtk/choice.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+#include "wx/wxprec.h"
-#ifdef __GNUG__
-#pragma implementation "choice.h"
-#endif
+#if wxUSE_CHOICE
#include "wx/choice.h"
-#if wxUSE_CHOICE
-
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#ifndef WX_PRECOMP
+ #include "wx/arrstr.h"
+#endif
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
+// FIXME: We use GtkOptionMenu which has been deprecated since GTK+ 2.3.0 in
+// favour of GtkComboBox.
+// Later use GtkComboBox if GTK+ runtime version is new enough.
+#include <gtk/gtkversion.h>
+#if defined(GTK_DISABLE_DEPRECATED) && GTK_CHECK_VERSION(2,3,0)
+#undef GTK_DISABLE_DEPRECATED
+#endif
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+#include "wx/gtk/private.h"
//-----------------------------------------------------------------------------
// data
// "activate"
//-----------------------------------------------------------------------------
+extern "C" {
static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
{
- if (g_isIdle)
- wxapp_install_idle_handler();
-
if (!choice->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
+ int selection = wxNOT_FOUND;
+
+ selection = gtk_option_menu_get_history( GTK_OPTION_MENU(choice->GetHandle()) );
+
+ choice->m_selection_hack = selection;
+
wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() );
- event.SetInt( choice->GetSelection() );
+ int n = choice->GetSelection();
+
+ event.SetInt( n );
event.SetString( choice->GetStringSelection() );
event.SetEventObject(choice);
+
+ if ( choice->HasClientObjectData() )
+ event.SetClientObject( choice->GetClientObject(n) );
+ else if ( choice->HasClientUntypedData() )
+ event.SetClientData( choice->GetClientData(n) );
+
choice->GetEventHandler()->ProcessEvent(event);
}
+}
//-----------------------------------------------------------------------------
// wxChoice
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
wxChoice::wxChoice()
{
+ m_strings = (wxSortedArrayString *)NULL;
+}
+
+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,
int n, const wxString choices[],
long style, const wxValidator& validator, const wxString &name )
{
- m_needParent = TRUE;
-#if (GTK_MINOR_VERSION > 0)
- m_acceptsFocus = TRUE;
-#endif
-
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
- wxFAIL_MSG( T("wxChoice creation failed") );
- return FALSE;
+ wxFAIL_MSG( wxT("wxChoice creation failed") );
+ return false;
}
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 = gtk_menu_new();
-
- for (int i = 0; i < n; i++)
+ if ( IsSorted() )
{
- m_clientDataList.Append( (wxObject*) NULL );
- m_clientObjectList.Append( (wxObject*) NULL );
+ // if our m_strings != NULL, Append() will check for it and insert
+ // items in the correct order
+ m_strings = new wxSortedArrayString;
+ }
- GtkWidget *item = gtk_menu_item_new_with_label( choices[i].mbc_str() );
- gtk_menu_append( GTK_MENU(menu), item );
+ // begin with no selection
+ m_selection_hack = wxNOT_FOUND;
- gtk_widget_show( item );
+ GtkWidget *menu = gtk_menu_new();
- gtk_signal_connect( GTK_OBJECT( item ), "activate",
- GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
+ for (unsigned int i = 0; i < (unsigned int)n; i++)
+ {
+ GtkAddHelper(menu, i, choices[i]);
}
+
gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
m_parent->DoAddChild( this );
- PostCreation();
-
- SetBackgroundColour( parent->GetBackgroundColour() );
- SetForegroundColour( parent->GetForegroundColour() );
- SetFont( parent->GetFont() );
+ PostCreation(size);
+ SetInitialSize(size); // need this too because this is a wxControlWithItems
- Show( TRUE );
-
- return TRUE;
+ return true;
}
wxChoice::~wxChoice()
{
Clear();
+
+ delete m_strings;
}
-void wxChoice::AppendCommon( const wxString &item )
+int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
+ unsigned int pos,
+ void **clientData, wxClientDataType type)
{
- wxCHECK_RET( m_widget != NULL, T("invalid choice") );
+ wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") );
- GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
- GtkWidget *menu_item = gtk_menu_item_new_with_label( item.mbc_str() );
+ const unsigned int count = items.GetCount();
- gtk_menu_append( GTK_MENU(menu), menu_item );
+ GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
- if (GTK_WIDGET_REALIZED(m_widget))
+ for ( unsigned int i = 0; i < count; ++i, ++pos )
{
- gtk_widget_realize( menu_item );
- gtk_widget_realize( GTK_BIN(menu_item)->child );
+ int n = GtkAddHelper(menu, pos, items[i]);
+ if ( n == wxNOT_FOUND )
+ return n;
- if (m_widgetStyle) ApplyWidgetStyle();
+ AssignNewItemClientData(n, clientData, i, type);
}
- gtk_signal_connect( GTK_OBJECT( menu_item ), "activate",
- GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
-
- gtk_widget_show( menu_item );
-}
-
-void wxChoice::Append( const wxString &item )
-{
- m_clientDataList.Append( (wxObject*) NULL );
- m_clientObjectList.Append( (wxObject*) NULL );
-
- AppendCommon( item );
-}
-
-void wxChoice::Append( const wxString &item, void *clientData )
-{
- m_clientDataList.Append( (wxObject*) clientData );
- m_clientObjectList.Append( (wxObject*) NULL );
+ // if the item to insert is at or before the selection, and the selection is valid
+ if (((int)pos <= m_selection_hack) && (m_selection_hack != wxNOT_FOUND))
+ {
+ // move the selection forward
+ m_selection_hack += count;
+ }
- AppendCommon( item );
+ return pos - 1;
}
-void wxChoice::Append( const wxString &item, wxClientData *clientData )
+void wxChoice::DoSetItemClientData(unsigned int n, void* clientData)
{
- m_clientObjectList.Append( (wxObject*) clientData );
- m_clientDataList.Append( (wxObject*) NULL );
-
- AppendCommon( item );
+ m_clientData[n] = clientData;
}
-void wxChoice::SetClientData( int n, void* clientData )
+void* wxChoice::DoGetItemClientData(unsigned int n) const
{
- wxCHECK_RET( m_widget != NULL, T("invalid combobox") );
-
- wxNode *node = m_clientDataList.Nth( n );
- if (!node) return;
-
- node->SetData( (wxObject*) clientData );
+ return m_clientData[n];
}
-void* wxChoice::GetClientData( int n )
+void wxChoice::DoClear()
{
- wxCHECK_MSG( m_widget != NULL, NULL, T("invalid combobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
- wxNode *node = m_clientDataList.Nth( n );
- if (!node) return NULL;
-
- return node->Data();
-}
-
-void wxChoice::SetClientObject( int n, wxClientData* clientData )
-{
- wxCHECK_RET( m_widget != NULL, T("invalid combobox") );
+ 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 );
- wxNode *node = m_clientObjectList.Nth( n );
- if (!node) return;
+ m_clientData.Clear();
- wxClientData *cd = (wxClientData*) node->Data();
- if (cd) delete cd;
+ if ( m_strings )
+ m_strings->Clear();
- node->SetData( (wxObject*) clientData );
+ // begin with no selection
+ m_selection_hack = wxNOT_FOUND;
}
-wxClientData* wxChoice::GetClientObject( int n )
+void wxChoice::DoDeleteOneItem(unsigned int n)
{
- wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, T("invalid combobox") );
-
- wxNode *node = m_clientObjectList.Nth( n );
- if (!node) return (wxClientData*) NULL;
-
- return (wxClientData*) node->Data();
-}
+ wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
+ wxCHECK_RET( IsValid(n), _T("invalid index in wxChoice::Delete") );
-void wxChoice::Clear()
-{
- wxCHECK_RET( m_widget != NULL, T("invalid choice") );
+ // if the item to delete is before the selection, and the selection is valid
+ if (((int)n < m_selection_hack) && (m_selection_hack != wxNOT_FOUND))
+ {
+ // move the selection back one
+ m_selection_hack--;
+ }
+ else if ((int)n == m_selection_hack)
+ {
+ // invalidate the selection
+ m_selection_hack = wxNOT_FOUND;
+ }
- 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 );
+ // VZ: apparently GTK+ doesn't have a built-in function to do it (not even
+ // in 2.0), hence this dumb implementation -- still better than nothing
+ const unsigned int count = GetCount();
- wxNode *node = m_clientObjectList.First();
- while (node)
+ wxArrayString items;
+ wxArrayPtrVoid itemsData;
+ items.Alloc(count);
+ itemsData.Alloc(count);
+ for ( unsigned i = 0; i < count; i++ )
{
- wxClientData *cd = (wxClientData*)node->Data();
- if (cd) delete cd;
- node = node->Next();
+ if ( i != n )
+ {
+ items.Add(GetString(i));
+ itemsData.Add(m_clientData[i]);
+ }
}
- m_clientObjectList.Clear();
- m_clientDataList.Clear();
-}
+ wxChoice::DoClear();
-void wxChoice::Delete( int WXUNUSED(n) )
-{
- wxFAIL_MSG( T("wxChoice:Delete not implemented") );
+ void ** const data = &itemsData[0];
+ if ( HasClientObjectData() )
+ Append(items, wx_reinterpret_cast(wxClientData **, data));
+ else
+ Append(items, data);
}
-int wxChoice::FindString( const wxString &string ) const
+int wxChoice::FindString( const wxString &string, bool bCase ) const
{
- wxCHECK_MSG( m_widget != NULL, -1, T("invalid choice") );
+ wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid choice") );
// If you read this code once and you think you understand
// it, then you are very wrong. Robert Roebling.
{
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 );
+ if (bin->child)
+ label = GTK_LABEL(bin->child);
+ if (!label)
+ label = GTK_LABEL(GTK_BIN(m_widget)->child);
- wxASSERT_MSG( label != NULL , T("wxChoice: invalid label") );
+ wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
- if (string == wxString(label->label,*wxConvCurrent))
- return count;
+ wxString tmp( wxGTK_CONV_BACK( gtk_label_get_text( label) ) );
+ if (string.IsSameAs( tmp, bCase ))
+ return count;
- child = child->next;
- count++;
+ child = child->next;
+ count++;
}
- return -1;
+ return wxNOT_FOUND;
}
-int wxChoice::GetColumns() const
+int wxChoice::GetSelection() const
{
- return 1;
+ wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid choice") );
+
+ return m_selection_hack;
+
}
-int wxChoice::GetSelection()
+void wxChoice::SetString(unsigned int n, const wxString& str)
{
- wxCHECK_MSG( m_widget != NULL, -1, T("invalid choice") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
- int count = 0;
+ unsigned int count = 0;
GList *child = menu_shell->children;
while (child)
{
GtkBin *bin = GTK_BIN( child->data );
- if (!bin->child) return count;
+ if (count == n)
+ {
+ GtkLabel *label = (GtkLabel *) NULL;
+ if (bin->child)
+ label = GTK_LABEL(bin->child);
+ if (!label)
+ label = GTK_LABEL(GTK_BIN(m_widget)->child);
+
+ wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
+
+ gtk_label_set_text( label, wxGTK_CONV( str ) );
+
+ InvalidateBestSize();
+
+ return;
+ }
child = child->next;
count++;
}
-
- return -1;
}
-wxString wxChoice::GetString( int n ) const
+wxString wxChoice::GetString(unsigned int n) const
{
- wxCHECK_MSG( m_widget != NULL, T(""), T("invalid choice") );
+ wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid choice") );
GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
- int count = 0;
+ unsigned int count = 0;
GList *child = menu_shell->children;
while (child)
{
if (count == n)
{
GtkLabel *label = (GtkLabel *) NULL;
- if (bin->child) label = GTK_LABEL(bin->child);
- if (!label) label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
+ if (bin->child)
+ label = GTK_LABEL(bin->child);
+ if (!label)
+ label = GTK_LABEL(GTK_BIN(m_widget)->child);
- wxASSERT_MSG( label != NULL , T("wxChoice: invalid label") );
+ wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
- return wxString(label->label,*wxConvCurrent);
+ return wxString( wxGTK_CONV_BACK( gtk_label_get_text( label) ) );
}
child = child->next;
count++;
}
- wxFAIL_MSG( T("wxChoice: invalid index in GetString()") );
-
- return T("");
-}
-
-wxString wxChoice::GetStringSelection() const
-{
- wxCHECK_MSG( m_widget != NULL, T(""), T("invalid choice") );
-
- GtkLabel *label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
-
- wxASSERT_MSG( label != NULL , T("wxChoice: invalid label") );
+ wxFAIL_MSG( wxT("wxChoice: invalid index in GetString()") );
- return wxString(label->label,*wxConvCurrent);
+ return wxEmptyString;
}
-int wxChoice::Number() const
+unsigned int wxChoice::GetCount() const
{
- wxCHECK_MSG( m_widget != NULL, 0, T("invalid choice") );
+ wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid choice") );
GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
- int count = 0;
+ unsigned int count = 0;
GList *child = menu_shell->children;
while (child)
{
return count;
}
-void wxChoice::SetColumns( int WXUNUSED(n) )
-{
-}
-
void wxChoice::SetSelection( int n )
{
- wxCHECK_RET( m_widget != NULL, T("invalid choice") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
int tmp = n;
gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp );
-}
-void wxChoice::SetStringSelection( const wxString &string )
-{
- wxCHECK_RET( m_widget != NULL, T("invalid choice") );
-
- int n = FindString( string );
- if (n != -1) SetSelection( n );
+ // set the local selection variable manually
+ if ((n >= 0) && ((unsigned int)n < GetCount()))
+ {
+ // a valid selection has been made
+ m_selection_hack = n;
+ }
+ else if ((n == wxNOT_FOUND) || (GetCount() == 0))
+ {
+ // invalidates the selection if there are no items
+ // or if it is specifically set to wxNOT_FOUND
+ m_selection_hack = wxNOT_FOUND;
+ }
+ else
+ {
+ // this selects the first item by default if the selection is out of bounds
+ m_selection_hack = 0;
+ }
}
-void wxChoice::DisableEvents()
+void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style)
{
-/*
GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
+
+ gtk_widget_modify_style( m_widget, style );
+ gtk_widget_modify_style( GTK_WIDGET( menu_shell ), style );
+
GList *child = menu_shell->children;
while (child)
{
- gtk_signal_disconnect_by_func( GTK_OBJECT( child->data ),
- GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
+ gtk_widget_modify_style( GTK_WIDGET( child->data ), style );
+
+ GtkBin *bin = GTK_BIN( child->data );
+ GtkWidget *label = (GtkWidget *) NULL;
+ if (bin->child)
+ label = bin->child;
+ if (!label)
+ label = GTK_BIN(m_widget)->child;
+
+ gtk_widget_modify_style( label, style );
child = child->next;
}
-*/
}
-void wxChoice::EnableEvents()
+int wxChoice::GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& item)
{
-/*
- GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
- GList *child = menu_shell->children;
- while (child)
+ wxCHECK_MSG(pos<=m_clientData.GetCount(), -1, wxT("invalid index"));
+
+ GtkWidget *menu_item = gtk_menu_item_new_with_label( wxGTK_CONV( item ) );
+
+ if ( m_strings )
{
- gtk_signal_connect( GTK_OBJECT( child->data ), "activate",
- GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
+ // sorted control, need to insert at the correct index
+ pos = m_strings->Add(item);
+ }
- child = child->next;
+ // don't call wxChoice::GetCount() from here because it doesn't work
+ // if we're called from ctor (and GtkMenuShell is still NULL)
+ if (pos == m_clientData.GetCount())
+ gtk_menu_shell_append( GTK_MENU_SHELL(menu), menu_item );
+ else
+ gtk_menu_shell_insert( GTK_MENU_SHELL(menu), menu_item, pos );
+
+ m_clientData.Insert( NULL, pos );
+
+ if (GTK_WIDGET_REALIZED(m_widget))
+ {
+ gtk_widget_realize( menu_item );
+ gtk_widget_realize( GTK_BIN(menu_item)->child );
+
+ ApplyWidgetStyle();
}
-*/
+
+ // The best size of a wxChoice should probably
+ // be changed everytime the control has been
+ // changed, but at least after adding an item
+ // it has to change. Adapted from Matt Ownby.
+ InvalidateBestSize();
+
+ g_signal_connect_after (menu_item, "activate",
+ G_CALLBACK (gtk_choice_clicked_callback),
+ this);
+
+ gtk_widget_show( menu_item );
+
+ // return the index of the item in the control
+ return pos;
}
-void wxChoice::ApplyWidgetStyle()
+wxSize wxChoice::DoGetBestSize() const
{
- SetWidgetStyle();
+ wxSize ret( wxControl::DoGetBestSize() );
- GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
+ // we know better our horizontal extent: it depends on the longest string
+ // we have
+ ret.x = 0;
+ 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;
+ }
- gtk_widget_set_style( m_widget, m_widgetStyle );
- gtk_widget_set_style( GTK_WIDGET( menu_shell ), m_widgetStyle );
+ // add extra for the choice "=" button
+
+ // VZ: I don't know how to get the right value, it seems to be in
+ // GtkOptionMenuProps struct from gtkoptionmenu.c but we can't get
+ // to it - maybe we can use gtk_option_menu_size_request() for this
+ // somehow?
+ //
+ // This default value works only for the default GTK+ theme (i.e.
+ // no theme at all) (FIXME)
+ static const int widthChoiceIndicator = 35;
+ ret.x += widthChoiceIndicator;
+ }
- GList *child = menu_shell->children;
- while (child)
- {
- gtk_widget_set_style( GTK_WIDGET( child->data ), m_widgetStyle );
+ // but not less than the minimal width
+ if ( ret.x < 80 )
+ ret.x = 80;
- GtkBin *bin = GTK_BIN( child->data );
- GtkWidget *label = (GtkWidget *) NULL;
- if (bin->child) label = bin->child;
- if (!label) label = GTK_BUTTON(m_widget)->child;
+ // If this request_size is called with no entries then
+ // the returned height is wrong. Give it a reasonable
+ // default value.
+ if (ret.y <= 18)
+ ret.y = 8 + GetCharHeight();
- gtk_widget_set_style( label, m_widgetStyle );
+ CacheBestSize(ret);
+ return ret;
+}
- child = child->next;
- }
+GdkWindow *wxChoice::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
+{
+ return GTK_BUTTON(m_widget)->event_window;
}
-#endif
+// static
+wxVisualAttributes
+wxChoice::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+ return GetDefaultAttributesFromGTKWidget(gtk_option_menu_new);
+}
+
+
+#endif // wxUSE_CHOICE
projects / wxWidgets.git / blobdiff