X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d6538e2c55535a747aec939d0f6659f91bc623d4..2d956b58023a4955313a1c1531bc70a0deb0b831:/src/gtk1/choice.cpp diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp index 81d2380a01..f62387d9b5 100644 --- a/src/gtk1/choice.cpp +++ b/src/gtk1/choice.cpp @@ -12,12 +12,13 @@ #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/gtk/private.h" //----------------------------------------------------------------------------- // idle system @@ -38,7 +39,7 @@ extern bool g_blockEventsOnDrag; 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; @@ -46,9 +47,17 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice * 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); } @@ -60,6 +69,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl) wxChoice::wxChoice() { + m_strings = (wxSortedArrayString *)NULL; } bool wxChoice::Create( wxWindow *parent, wxWindowID id, @@ -76,41 +86,37 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, !CreateBase( parent, id, pos, size, style, validator, name )) { wxFAIL_MSG( wxT("wxChoice creation failed") ); - return FALSE; + 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_clientList.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 ); + GtkAppendHelper(menu, 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 ); @@ -120,62 +126,45 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, wxChoice::~wxChoice() { Clear(); + + delete m_strings; } int wxChoice::DoAppend( const wxString &item ) { - wxCHECK_MSG( m_widget != NULL, -1, wxT("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 ); - m_clientList.Append( (wxObject*) NULL ); - - // return the index of the item in the control - return GetCount() - 1; + return GtkAppendHelper(menu, item); } -void wxChoice::DoSetClientData( int n, void* clientData ) +void wxChoice::DoSetItemClientData( int n, void* clientData ) { - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") ); wxNode *node = m_clientList.Nth( n ); - wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetClientData") ); + wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientData") ); node->SetData( (wxObject*) clientData ); } -void* wxChoice::DoGetClientData( int n ) const +void* wxChoice::DoGetItemClientData( int n ) const { - wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") ); + wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid choice control") ); wxNode *node = m_clientList.Nth( n ); - wxCHECK_MSG( node, NULL, wxT("invalid index in wxChoice::DoGetClientData") ); + wxCHECK_MSG( node, NULL, wxT("invalid index in wxChoice::DoGetItemClientData") ); return node->Data(); } -void wxChoice::DoSetClientObject( int n, wxClientData* clientData ) +void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData ) { - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") ); wxNode *node = m_clientList.Nth( n ); - wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetClientObject") ); + wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientObject") ); wxClientData *cd = (wxClientData*) node->Data(); delete cd; @@ -183,13 +172,13 @@ void wxChoice::DoSetClientObject( int n, wxClientData* clientData ) node->SetData( (wxObject*) clientData ); } -wxClientData* wxChoice::DoGetClientObject( int n ) const +wxClientData* wxChoice::DoGetItemClientObject( int n ) const { - wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid combobox") ); + wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid choice control") ); wxNode *node = m_clientList.Nth( n ); wxCHECK_MSG( node, (wxClientData *)NULL, - wxT("invalid index in wxChoice::DoGetClientObject") ); + wxT("invalid index in wxChoice::DoGetItemClientObject") ); return (wxClientData*) node->Data(); } @@ -202,22 +191,49 @@ void wxChoice::Clear() GtkWidget *menu = gtk_menu_new(); gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu ); - if (m_clientDataItemsType == ClientData_Object) + if ( HasClientObjectData() ) { - wxNode *node = m_clientList.First(); - while (node) + // destroy the data (due to Robert's idea of using wxList + // and not wxList we can't just say + // m_clientList.DeleteContents(TRUE) - this would crash! + wxNode *node = m_clientList.First(); + while ( node ) { - wxClientData *cd = (wxClientData*)node->Data(); - if (cd) delete cd; + delete (wxClientData *)node->Data(); node = node->Next(); - } + } } m_clientList.Clear(); + + if ( m_strings ) + m_strings->Clear(); } -void wxChoice::Delete( int WXUNUSED(n) ) +void wxChoice::Delete( int n ) { - wxFAIL_MSG( wxT("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 @@ -234,16 +250,18 @@ int wxChoice::FindString( const wxString &string ) const { 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( BUTTON_CHILD(m_widget) ); wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") ); - if (string == wxString(label->label,*wxConvCurrent)) - return count; + if (string == wxString(label->label,*wxConvCurrent)) + return count; - child = child->next; - count++; + child = child->next; + count++; } return -1; @@ -267,6 +285,13 @@ int wxChoice::GetSelection() const return -1; } +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, wxT(""), wxT("invalid choice") ); @@ -280,8 +305,10 @@ wxString wxChoice::GetString( int n ) const 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 , wxT("wxChoice: invalid label") ); @@ -319,59 +346,125 @@ void wxChoice::SetSelection( int n ) gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp ); } -void wxChoice::DisableEvents() +void wxChoice::ApplyWidgetStyle() { -/* + SetWidgetStyle(); + 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() +size_t wxChoice::GtkAppendHelper(GtkWidget *menu, 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) + GtkWidget *menu_item = gtk_menu_item_new_with_label( item.mbc_str() ); + + 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 + { + // normal control, just append + gtk_menu_append( GTK_MENU(menu), menu_item ); + + m_clientList.Append( (wxObject*) NULL ); + + // don't call wxChoice::GetCount() from here because it doesn't work + // if we're called from ctor (and GtkMenuShell is still NULL) + index = m_clientList.GetCount() - 1; + } + + 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 the index of the item in the control + return index; } -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 ) + { + GdkFont *font = m_font.GetInternalFont(); - gtk_widget_set_style( m_widget, m_widgetStyle ); - gtk_widget_set_style( GTK_WIDGET( menu_shell ), m_widgetStyle ); + wxCoord width; + size_t count = GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + width = (wxCoord)gdk_string_width(font, GetString(n).mbc_str()); + if ( width > ret.x ) + ret.x = width; + } - GList *child = menu_shell->children; - while (child) - { - gtk_widget_set_style( GTK_WIDGET( child->data ), 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; + } - GtkBin *bin = GTK_BIN( child->data ); - GtkWidget *label = (GtkWidget *) NULL; - if (bin->child) label = bin->child; - if (!label) label = GTK_BUTTON(m_widget)->child; + // but not less than the minimal width + if ( ret.x < 80 ) + ret.x = 80; - gtk_widget_set_style( label, m_widgetStyle ); + ret.y = 16 + gdk_char_height(GET_STYLE_FONT( m_widget->style ), 'H'); - child = child->next; - } + return ret; } -#endif +#endif // wxUSE_CHOICE +