X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a81258bee4e20d3fa9b3d2f6bf3bcd1200d1e5e0..bcd3d8d9e26e41615d26d457ba0e2b84b80a0356:/src/gtk/choice.cpp?ds=sidebyside diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp index 3a09b3b8fb..0106c68dff 100644 --- a/src/gtk/choice.cpp +++ b/src/gtk/choice.cpp @@ -4,7 +4,7 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -12,8 +12,22 @@ #pragma implementation "choice.h" #endif +#include "wx/defs.h" + +#if wxUSE_CHOICE + #include "wx/choice.h" +#include +#include + +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; + //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -26,15 +40,26 @@ extern bool g_blockEventsOnDrag; static void gtk_choice_clicked_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); + if (g_isIdle) + wxapp_install_idle_handler(); + + if (!choice->m_hasVMT) return; + + if (g_blockEventsOnDrag) return; + + wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() ); + 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); } //----------------------------------------------------------------------------- @@ -43,263 +68,348 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice * IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl) -wxChoice::wxChoice(void) +wxChoice::wxChoice() { + m_strings = (wxSortedArrayString *)NULL; } 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 = gtk_menu_new(); - - for (int i = 0; i < n; i++) - { - GtkWidget *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_widget_realize( item ); - gtk_widget_realize( GTK_BIN(item)->child ); - } - gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu ); - - PostCreation(); - - SetBackgroundColour( parent->GetBackgroundColour() ); - - Show( TRUE ); - - return TRUE; + 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( wxT("wxChoice creation failed") ); + return FALSE; + } + + m_widget = gtk_option_menu_new(); + + 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++) + { + GtkAppendHelper(menu, choices[i]); + } + + gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu ); + + m_parent->DoAddChild( this ); + + PostCreation(); + + SetFont( parent->GetFont() ); + + wxSize size_best( DoGetBestSize() ); + wxSize new_size( size ); + if (new_size.x == -1) + new_size.x = size_best.x; + if (new_size.y == -1) + new_size.y = size_best.y; + if ((new_size.x != size.x) || (new_size.y != size.y)) + SetSize( new_size.x, new_size.y ); + + SetBackgroundColour( parent->GetBackgroundColour() ); + SetForegroundColour( parent->GetForegroundColour() ); + + Show( TRUE ); + + return TRUE; } - -void wxChoice::Append( const wxString &item ) + +wxChoice::~wxChoice() { - wxCHECK_RET( m_widget != NULL, "invalid choice" ); - - GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ); - GtkWidget *menu_item = gtk_menu_item_new_with_label( item ); - - gtk_menu_append( GTK_MENU(menu), menu_item ); - - gtk_widget_realize( menu_item ); - gtk_widget_realize( GTK_BIN(menu_item)->child ); - - if (m_widgetStyle) - { - gtk_widget_set_style( menu_item, m_widgetStyle ); - gtk_widget_set_style( GTK_BIN(menu_item)->child, m_widgetStyle ); - } - - gtk_signal_connect( GTK_OBJECT( menu_item ), "activate", - GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this ); - - gtk_widget_show( menu_item ); + Clear(); + + delete m_strings; } - -void wxChoice::Clear(void) + +int wxChoice::DoAppend( const wxString &item ) { - wxCHECK_RET( m_widget != NULL, "invalid choice" ); + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") ); + + GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ); - 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 ); + return GtkAppendHelper(menu, item); } -void wxChoice::Delete( int WXUNUSED(n) ) +void wxChoice::DoSetItemClientData( int n, void* clientData ) { - wxFAIL_MSG( "wxChoice:Delete not implemented" ); + wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") ); + + wxNode *node = m_clientList.Nth( n ); + wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientData") ); + + node->SetData( (wxObject*) clientData ); } -int wxChoice::FindString( const wxString &string ) const +void* wxChoice::DoGetItemClientData( int n ) const { - wxCHECK_MSG( m_widget != NULL, -1, "invalid choice" ); - - // 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; + 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::DoGetItemClientData") ); + + return node->Data(); } -int wxChoice::GetColumns(void) const +void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData ) { - return 1; + wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") ); + + wxNode *node = m_clientList.Nth( n ); + wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientObject") ); + + wxClientData *cd = (wxClientData*) node->Data(); + delete cd; + + node->SetData( (wxObject*) clientData ); } -int wxChoice::GetSelection(void) +wxClientData* wxChoice::DoGetItemClientObject( int n ) const { - wxCHECK_MSG( m_widget != NULL, -1, "invalid choice" ); - - 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_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::DoGetItemClientObject") ); + + return (wxClientData*) node->Data(); } -wxString wxChoice::GetString( int n ) const +void wxChoice::Clear() { - wxCHECK_MSG( m_widget != NULL, "", "invalid choice" ); - - 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 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 ); + + if ( HasClientObjectData() ) { - 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; + // 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 ) + { + delete (wxClientData *)node->Data(); + node = node->Next(); + } } - child = child->next; - count++; - } - - wxFAIL_MSG( "wxChoice: string not found" ); - - return ""; + m_clientList.Clear(); + + if ( m_strings ) + m_strings->Clear(); +} + +void wxChoice::Delete( int WXUNUSED(n) ) +{ + wxFAIL_MSG( wxT("wxChoice:Delete not implemented") ); } -wxString wxChoice::GetStringSelection(void) const +int wxChoice::FindString( const wxString &string ) const { - wxCHECK_MSG( m_widget != NULL, "", "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. + + 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 ); - GtkLabel *label = GTK_LABEL( GTK_BUTTON(m_widget)->child ); - - wxASSERT_MSG( label != NULL , "wxChoice: invalid label" ); - - return label->label; + wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") ); + + if (string == wxString(label->label,*wxConvCurrent)) + return count; + + child = child->next; + count++; + } + + return -1; } -int wxChoice::Number(void) const +int wxChoice::GetSelection() const { - wxCHECK_MSG( m_widget != NULL, 0, "invalid choice" ); - - 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, -1, wxT("invalid choice") ); + + 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++; + } + + return -1; } -void wxChoice::SetColumns( int WXUNUSED(n) ) +void wxChoice::SetString( int WXUNUSED(n), const wxString& WXUNUSED(string) ) { + wxCHECK_RET( m_widget != NULL, wxT("invalid choice") ); + + wxFAIL_MSG(wxT("not implemented")); } -void wxChoice::SetSelection( int n ) +wxString wxChoice::GetString( int n ) const { - wxCHECK_RET( m_widget != NULL, "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; + GList *child = menu_shell->children; + while (child) + { + GtkBin *bin = GTK_BIN( child->data ); + 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 ); + + wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") ); + + return wxString(label->label,*wxConvCurrent); + } + child = child->next; + count++; + } - int tmp = n; - gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp ); - - gtk_choice_clicked_callback( (GtkWidget *) NULL, this ); + wxFAIL_MSG( wxT("wxChoice: invalid index in GetString()") ); + + return wxT(""); } -void wxChoice::SetStringSelection( const wxString &string ) +int wxChoice::GetCount() const { - wxCHECK_RET( m_widget != NULL, "invalid choice" ); + wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid choice") ); - int n = FindString( string ); - if (n != -1) SetSelection( 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) + { + count++; + child = child->next; + } + return count; } -void wxChoice::SetFont( const wxFont &font ) +void wxChoice::SetSelection( int n ) { - wxCHECK_RET( m_widget != NULL, "invalid choice" ); - - wxControl::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, GetWidgetStyle() ); - - child = child->next; - } + 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::SetBackgroundColour( const wxColour &colour ) +void wxChoice::ApplyWidgetStyle() { - wxCHECK_RET( m_widget != NULL, "invalid choice" ); - - wxControl::SetBackgroundColour( colour ); - - if (!m_backgroundColour.Ok()) return; - - 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_widget_set_style( GTK_WIDGET( child->data ), m_widgetStyle ); - child = child->next; - } + 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_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 = GTK_BUTTON(m_widget)->child; + + gtk_widget_set_style( label, m_widgetStyle ); + + child = child->next; + } } +size_t wxChoice::GtkAppendHelper(GtkWidget *menu, const wxString& item) +{ + GtkWidget *menu_item = gtk_menu_item_new_with_label( item.mbc_str() ); + size_t index; + if ( m_strings ) + { + // sorted control, need to insert at the correct index + index = m_strings->Add(item); + + 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; +} + +wxSize wxChoice::DoGetBestSize() const +{ + wxSize ret( wxControl::DoGetBestSize() ); + if (ret.x < 80) ret.x = 80; + ret.y = 16 + gdk_char_height( m_widget->style->font, 'H' ); + return ret; +} + +#endif