#pragma implementation "choice.h"
#endif
-#include "wx/choice.h"
+#include "wx/defs.h"
#if wxUSE_CHOICE
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include "wx/choice.h"
+#include "wx/arrstr.h"
+
+#include "wx/gtk/private.h"
//-----------------------------------------------------------------------------
// idle system
static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
{
- if (g_isIdle)
+ if (g_isIdle)
wxapp_install_idle_handler();
if (!choice->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
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::wxChoice()
{
+ m_strings = (wxSortedArrayString *)NULL;
}
bool wxChoice::Create( wxWindow *parent, wxWindowID id,
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 );
+ if ( style & wxCB_SORT )
+ {
+ // if our m_strings != NULL, DoAppend() will check for it and insert
+ // items in the correct order
+ m_strings = new wxSortedArrayString;
+ }
GtkWidget *menu = gtk_menu_new();
for (int i = 0; i < n; i++)
{
- m_clientDataList.Append( (wxObject*) NULL );
- m_clientObjectList.Append( (wxObject*) NULL );
-
- GtkWidget *item = gtk_menu_item_new_with_label( choices[i].mbc_str() );
- gtk_menu_append( GTK_MENU(menu), item );
-
- gtk_widget_show( item );
-
- gtk_signal_connect( GTK_OBJECT( item ), "activate",
- GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
+ GtkAddHelper(menu, i, choices[i]);
}
+
gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
m_parent->DoAddChild( this );
PostCreation();
+ SetFont( parent->GetFont() );
+
+ SetBestSize(size);
+
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
- SetFont( parent->GetFont() );
Show( TRUE );
wxChoice::~wxChoice()
{
Clear();
+
+ delete m_strings;
}
-void wxChoice::AppendCommon( const wxString &item )
+int wxChoice::DoAppend( const wxString &item )
{
- 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() );
-
- gtk_menu_append( GTK_MENU(menu), menu_item );
- if (GTK_WIDGET_REALIZED(m_widget))
- {
- gtk_widget_realize( menu_item );
- gtk_widget_realize( GTK_BIN(menu_item)->child );
-
- if (m_widgetStyle) ApplyWidgetStyle();
- }
-
- gtk_signal_connect( GTK_OBJECT( menu_item ), "activate",
- GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
-
- gtk_widget_show( menu_item );
+ return GtkAddHelper(menu, GetCount(), item);
}
-void wxChoice::Append( const wxString &item )
+int wxChoice::DoInsert( const wxString &item, int pos )
{
- m_clientDataList.Append( (wxObject*) NULL );
- m_clientObjectList.Append( (wxObject*) NULL );
+ wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") );
+ wxCHECK_MSG( (pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
- AppendCommon( item );
-}
+ if (pos == GetCount())
+ return DoAppend(item);
-void wxChoice::Append( const wxString &item, void *clientData )
-{
- m_clientDataList.Append( (wxObject*) clientData );
- m_clientObjectList.Append( (wxObject*) NULL );
-
- AppendCommon( item );
-}
-
-void wxChoice::Append( const wxString &item, wxClientData *clientData )
-{
- m_clientObjectList.Append( (wxObject*) clientData );
- m_clientDataList.Append( (wxObject*) NULL );
+ GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
- AppendCommon( item );
+ return GtkAddHelper(menu, pos, item);
}
-void wxChoice::SetClientData( int n, void* clientData )
+void wxChoice::DoSetItemClientData( int n, void* clientData )
{
- wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") );
- wxNode *node = m_clientDataList.Nth( n );
- if (!node) return;
+ wxList::compatibility_iterator node = m_clientList.Item( n );
+ wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientData") );
node->SetData( (wxObject*) clientData );
}
-void* wxChoice::GetClientData( int n )
+void* wxChoice::DoGetItemClientData( int n ) const
{
- wxCHECK_MSG( m_widget != NULL, NULL, _T("invalid combobox") );
+ wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid choice control") );
- wxNode *node = m_clientDataList.Nth( n );
- if (!node) return NULL;
+ wxList::compatibility_iterator node = m_clientList.Item( n );
+ wxCHECK_MSG( node, NULL, wxT("invalid index in wxChoice::DoGetItemClientData") );
- return node->Data();
+ return node->GetData();
}
-void wxChoice::SetClientObject( int n, wxClientData* clientData )
+void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
{
- wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") );
- wxNode *node = m_clientObjectList.Nth( n );
- if (!node) return;
+ wxList::compatibility_iterator node = m_clientList.Item( n );
+ wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientObject") );
- wxClientData *cd = (wxClientData*) node->Data();
- if (cd) delete cd;
+ // wxItemContainer already deletes data for us
node->SetData( (wxObject*) clientData );
}
-wxClientData* wxChoice::GetClientObject( int n )
+wxClientData* wxChoice::DoGetItemClientObject( int n ) const
{
- wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, _T("invalid combobox") );
+ wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid choice control") );
- wxNode *node = m_clientObjectList.Nth( n );
- if (!node) return (wxClientData*) NULL;
+ wxList::compatibility_iterator node = m_clientList.Item( n );
+ wxCHECK_MSG( node, (wxClientData *)NULL,
+ wxT("invalid index in wxChoice::DoGetItemClientObject") );
- return (wxClientData*) node->Data();
+ return (wxClientData*) node->GetData();
}
void wxChoice::Clear()
{
- wxCHECK_RET( m_widget != NULL, _T("invalid choice") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
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.First();
- while (node)
+ if ( HasClientObjectData() )
{
- wxClientData *cd = (wxClientData*)node->Data();
- if (cd) delete cd;
- node = node->Next();
+ // destroy the data (due to Robert's idea of using wxList<wxObject>
+ // and not wxList<wxClientData> we can't just say
+ // m_clientList.DeleteContents(TRUE) - this would crash!
+ wxList::compatibility_iterator node = m_clientList.GetFirst();
+ while ( node )
+ {
+ delete (wxClientData *)node->GetData();
+ node = node->GetNext();
+ }
}
- m_clientObjectList.Clear();
+ m_clientList.Clear();
- m_clientDataList.Clear();
+ if ( m_strings )
+ m_strings->Clear();
}
-void wxChoice::Delete( int WXUNUSED(n) )
+void wxChoice::Delete( int n )
{
- wxFAIL_MSG( _T("wxChoice:Delete not implemented") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
+
+ // VZ: apparently GTK+ doesn't have a built-in function to do it (not even
+ // in 2.0), hence this dump implementation - still better than nothing
+ int i,
+ count = GetCount();
+
+ wxCHECK_RET( n >= 0 && n < count, _T("invalid index in wxChoice::Delete") );
+
+ wxArrayString items;
+ items.Alloc(count);
+ for ( i = 0; i < count; i++ )
+ {
+ if ( i != n )
+ items.Add(GetString(i));
+ }
+
+ Clear();
+
+ for ( i = 0; i < count - 1; i++ )
+ {
+ Append(items[i]);
+ }
}
int wxChoice::FindString( const wxString &string ) const
{
- wxCHECK_MSG( m_widget != NULL, -1, _T("invalid choice") );
+ wxCHECK_MSG( m_widget != NULL, -1, 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 );
-
- wxASSERT_MSG( label != NULL , _T("wxChoice: invalid label") );
-
- if (string == wxString(label->label,*wxConvCurrent))
- return count;
+ if (bin->child)
+ label = GTK_LABEL(bin->child);
+ if (!label)
+ label = GTK_LABEL( BUTTON_CHILD(m_widget) );
+
+ wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
+
+#ifdef __WXGTK20__
+ wxString tmp( wxGTK_CONV_BACK( gtk_label_get_text( label) ) );
+#else
+ wxString tmp( label->label );
+#endif
+ if (string == tmp)
+ return count;
- child = child->next;
- count++;
+ child = child->next;
+ count++;
}
return -1;
}
-int wxChoice::GetColumns() const
+int wxChoice::GetSelection() const
{
- return 1;
-}
-
-int wxChoice::GetSelection()
-{
- wxCHECK_MSG( m_widget != NULL, -1, _T("invalid choice") );
+ wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice") );
+
+#ifdef __WXGTK20__
+ return gtk_option_menu_get_history( GTK_OPTION_MENU(m_widget) );
+
+#else
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)
{
}
return -1;
+#endif
+}
+
+void wxChoice::SetString( int WXUNUSED(n), const wxString& WXUNUSED(string) )
+{
+ wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
+
+ wxFAIL_MSG(wxT("not implemented"));
}
wxString wxChoice::GetString( int n ) const
{
- wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid choice") );
+ wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid choice") );
GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
int count = 0;
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( BUTTON_CHILD(m_widget) );
- wxASSERT_MSG( label != NULL , _T("wxChoice: invalid label") );
+ wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
- return wxString(label->label,*wxConvCurrent);
+#ifdef __WXGTK20__
+ return wxString( wxGTK_CONV_BACK( gtk_label_get_text( label) ) );
+#else
+ return wxString( label->label );
+#endif
}
child = child->next;
count++;
}
- wxFAIL_MSG( _T("wxChoice: invalid index in GetString()") );
+ wxFAIL_MSG( wxT("wxChoice: invalid index in GetString()") );
- return _T("");
+ return wxT("");
}
-wxString wxChoice::GetStringSelection() const
+int wxChoice::GetCount() 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") );
-
- return wxString(label->label,*wxConvCurrent);
-}
-
-int wxChoice::Number() 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;
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 )
+void wxChoice::ApplyWidgetStyle()
{
- wxCHECK_RET( m_widget != NULL, _T("invalid choice") );
-
- int n = FindString( string );
- if (n != -1) SetSelection( n );
-}
+ SetWidgetStyle();
-void wxChoice::DisableEvents()
-{
-/*
GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
+
+ gtk_widget_set_style( m_widget, m_widgetStyle );
+ gtk_widget_set_style( GTK_WIDGET( menu_shell ), m_widgetStyle );
+
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_set_style( GTK_WIDGET( child->data ), m_widgetStyle );
+
+ GtkBin *bin = GTK_BIN( child->data );
+ GtkWidget *label = (GtkWidget *) NULL;
+ if (bin->child)
+ label = bin->child;
+ if (!label)
+ label = BUTTON_CHILD(m_widget);
+
+ gtk_widget_set_style( label, m_widgetStyle );
child = child->next;
}
-*/
}
-void wxChoice::EnableEvents()
+int wxChoice::GtkAddHelper(GtkWidget *menu, 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>=0) && (pos<=(int)m_clientList.GetCount()), -1, wxT("invalid index"));
+
+ GtkWidget *menu_item = gtk_menu_item_new_with_label( wxGTK_CONV( item ) );
+
+ size_t index;
+ 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
+ index = m_strings->Add(item);
- child = child->next;
+ gtk_menu_insert( GTK_MENU(menu), menu_item, index );
+
+ if ( index )
+ {
+ m_clientList.Insert( m_clientList.Item(index - 1),
+ (wxObject*) NULL );
+ }
+ else
+ {
+ m_clientList.Insert( (wxObject*) NULL );
+ }
}
-*/
-}
+ else
+ {
+ // don't call wxChoice::GetCount() from here because it doesn't work
+ // if we're called from ctor (and GtkMenuShell is still NULL)
-void wxChoice::ApplyWidgetStyle()
-{
- SetWidgetStyle();
+ // normal control, just append
+ if (pos == (int)m_clientList.GetCount())
+ {
+ gtk_menu_append( GTK_MENU(menu), menu_item );
+ m_clientList.Append( (wxObject*) NULL );
+ index = m_clientList.GetCount() - 1;
+ }
+ else
+ {
+ gtk_menu_insert( GTK_MENU(menu), menu_item, pos );
+ m_clientList.Insert( pos, (wxObject*) NULL );
+ index = pos;
+ }
+ }
- GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
+ if (GTK_WIDGET_REALIZED(m_widget))
+ {
+ gtk_widget_realize( menu_item );
+ gtk_widget_realize( GTK_BIN(menu_item)->child );
- gtk_widget_set_style( m_widget, m_widgetStyle );
- gtk_widget_set_style( GTK_WIDGET( menu_shell ), m_widgetStyle );
+ if (m_widgetStyle) ApplyWidgetStyle();
+ }
- GList *child = menu_shell->children;
- while (child)
- {
- gtk_widget_set_style( GTK_WIDGET( child->data ), m_widgetStyle );
+ gtk_signal_connect( GTK_OBJECT( menu_item ), "activate",
+ GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
- 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_show( menu_item );
- gtk_widget_set_style( label, m_widgetStyle );
+ // return the index of the item in the control
+ return index;
+}
- child = child->next;
+wxSize wxChoice::DoGetBestSize() const
+{
+ wxSize ret( wxControl::DoGetBestSize() );
+
+ // we know better our horizontal extent: it depends on the longest string
+ // we have
+ ret.x = 0;
+ if ( m_widget )
+ {
+ int width;
+ size_t count = GetCount();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ GetTextExtent( GetString(n), &width, NULL, NULL, NULL, &m_font );
+ if ( width > ret.x )
+ ret.x = width;
+ }
+
+ // 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;
}
+
+ // but not less than the minimal width
+ if ( ret.x < 80 )
+ ret.x = 80;
+
+ ret.y = 16 + GetCharHeight();
+
+ return ret;
}
+bool wxChoice::IsOwnGtkWindow( GdkWindow *window )
+{
+#ifdef __WXGTK20__
+ return GTK_BUTTON(m_widget)->event_window;
+#else
+ return (window == m_widget->window);
#endif
+}
+
+
+#endif // wxUSE_CHOICE
+
projects / wxWidgets.git / blobdiff