X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93c5dd39af2fb5eb12c5c837999be944543b21b0..80d2803f703d1b238f42725504f08266ef02defe:/src/gtk1/choice.cpp diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp index 2c1d4c702c..d794e2a915 100644 --- a/src/gtk1/choice.cpp +++ b/src/gtk1/choice.cpp @@ -14,8 +14,17 @@ #include "wx/choice.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#if wxUSE_CHOICE + +#include +#include + +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; //----------------------------------------------------------------------------- // data @@ -29,17 +38,26 @@ extern bool g_blockEventsOnDrag; static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice ) { - if (!choice->HasVMT()) - return; + if (g_isIdle) + wxapp_install_idle_handler(); + + if (!choice->m_hasVMT) return; + + if (g_blockEventsOnDrag) return; - if (g_blockEventsOnDrag) - return; + wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() ); + int n = choice->GetSelection(); - wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() ); - event.SetInt( choice->GetSelection() ); - event.SetString( choice->GetStringSelection() ); - event.SetEventObject(choice); - choice->GetEventHandler()->ProcessEvent(event); + 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); } //----------------------------------------------------------------------------- @@ -50,6 +68,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl) wxChoice::wxChoice() { + m_strings = (wxSortedArrayString *)NULL; } bool wxChoice::Create( wxWindow *parent, wxWindowID id, @@ -62,48 +81,48 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, m_acceptsFocus = TRUE; #endif - PreCreation( parent, id, pos, size, style, name ); - - SetValidator( validator ); + 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(); - 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_realize( item ); - gtk_widget_realize( GTK_BIN(item)->child ); - - 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->AddChild( this ); + gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu ); - (m_parent->m_insertCallback)( m_parent, this ); + 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() ); - SetFont( parent->GetFont() ); Show( TRUE ); @@ -113,123 +132,97 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, wxChoice::~wxChoice() { Clear(); -} -void wxChoice::AppendCommon( const wxString &item ) -{ - wxCHECK_RET( m_widget != NULL, _T("invalid choice") ); - - 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 ); - - 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 ); + delete m_strings; } -void wxChoice::Append( const wxString &item ) +int wxChoice::DoAppend( const wxString &item ) { - m_clientDataList.Append( (wxObject*) NULL ); - m_clientObjectList.Append( (wxObject*) NULL ); + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") ); - AppendCommon( 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 GtkAppendHelper(menu, 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; + wxNode *node = m_clientList.Nth( 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; + wxNode *node = m_clientList.Nth( n ); + wxCHECK_MSG( node, NULL, wxT("invalid index in wxChoice::DoGetItemClientData") ); return node->Data(); } -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; + wxNode *node = m_clientList.Nth( n ); + wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientObject") ); wxClientData *cd = (wxClientData*) node->Data(); - if (cd) delete cd; + delete cd; 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; + wxNode *node = m_clientList.Nth( n ); + wxCHECK_MSG( node, (wxClientData *)NULL, + wxT("invalid index in wxChoice::DoGetItemClientObject") ); return (wxClientData*) node->Data(); } 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 + // 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(); + } } - m_clientObjectList.Clear(); + m_clientList.Clear(); - m_clientDataList.Clear(); + if ( m_strings ) + m_strings->Clear(); } void wxChoice::Delete( int WXUNUSED(n) ) { - wxFAIL_MSG( _T("wxChoice:Delete not implemented") ); + wxFAIL_MSG( wxT("wxChoice:Delete not implemented") ); } 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. @@ -244,9 +237,9 @@ int wxChoice::FindString( const wxString &string ) const 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") ); + wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") ); - if (string == label->label) + if (string == wxString(label->label,*wxConvCurrent)) return count; child = child->next; @@ -256,14 +249,9 @@ int wxChoice::FindString( const wxString &string ) const return -1; } -int wxChoice::GetColumns() const -{ - return 1; -} - -int wxChoice::GetSelection() +int wxChoice::GetSelection() const { - wxCHECK_MSG( m_widget != NULL, -1, _T("invalid choice") ); + 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; @@ -276,14 +264,19 @@ int wxChoice::GetSelection() count++; } - wxFAIL_MSG( _T("wxChoice: no selection") ); - 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, _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; @@ -297,33 +290,22 @@ wxString wxChoice::GetString( int n ) const 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") ); + wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") ); - return label->label; + return wxString(label->label,*wxConvCurrent); } child = child->next; count++; } - wxFAIL_MSG( _T("wxChoice: invalid index in GetString()") ); + wxFAIL_MSG( wxT("wxChoice: invalid index in GetString()") ); - return ""; + 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 label->label; -} - -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; @@ -336,26 +318,12 @@ int wxChoice::Number() const 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 ); - - gtk_choice_clicked_callback( (GtkWidget *) NULL, this ); -} - -void wxChoice::SetStringSelection( const wxString &string ) -{ - wxCHECK_RET( m_widget != NULL, _T("invalid choice") ); - - int n = FindString( string ); - if (n != -1) SetSelection( n ); } void wxChoice::ApplyWidgetStyle() @@ -383,3 +351,63 @@ void wxChoice::ApplyWidgetStyle() } } +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