X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f8845289521c7f53e95b6dfd8275daab8b05639..f7b06c8ce1bf0c34e4c5bde45181205101a5661e:/src/gtk/choice.cpp diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp index 4bef419b40..8c0789964d 100644 --- a/src/gtk/choice.cpp +++ b/src/gtk/choice.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: choice.cpp +// Name: src/gtk/choice.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,26 +7,22 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "choice.h" -#endif - -#include "wx/defs.h" +#include "wx/wxprec.h" #if wxUSE_CHOICE #include "wx/choice.h" #include "wx/arrstr.h" -#include "wx/gtk/private.h" - -//----------------------------------------------------------------------------- -// 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 +#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 @@ -38,6 +34,7 @@ extern bool g_blockEventsOnDrag; // "activate" //----------------------------------------------------------------------------- +extern "C" { static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice ) { if (g_isIdle) @@ -47,6 +44,12 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice * 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() ); int n = choice->GetSelection(); @@ -61,6 +64,7 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice * choice->GetEventHandler()->ProcessEvent(event); } +} //----------------------------------------------------------------------------- // wxChoice @@ -90,16 +94,16 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, int n, const wxString choices[], long style, const wxValidator& validator, const wxString &name ) { - m_needParent = TRUE; + m_needParent = true; #if (GTK_MINOR_VERSION > 0) - m_acceptsFocus = TRUE; + 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; + return false; } m_widget = gtk_option_menu_new(); @@ -111,9 +115,12 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, m_strings = new wxSortedArrayString; } + // begin with no selection + m_selection_hack = wxNOT_FOUND; + GtkWidget *menu = gtk_menu_new(); - for (int i = 0; i < n; i++) + for (unsigned int i = 0; i < (unsigned int)n; i++) { GtkAddHelper(menu, i, choices[i]); } @@ -125,7 +132,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, PostCreation(size); SetBestSize(size); // need this too because this is a wxControlWithItems - return TRUE; + return true; } wxChoice::~wxChoice() @@ -144,20 +151,27 @@ int wxChoice::DoAppend( const wxString &item ) return GtkAddHelper(menu, GetCount(), item); } -int wxChoice::DoInsert( const wxString &item, int pos ) +int wxChoice::DoInsert(const wxString &item, unsigned int pos) { wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") ); - wxCHECK_MSG( (pos>=0) && (pos<=GetCount()), -1, wxT("invalid index")); + wxCHECK_MSG( IsValidInsert(pos), -1, wxT("invalid index")); if (pos == GetCount()) return DoAppend(item); GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ); + // 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 one + m_selection_hack++; + } + return GtkAddHelper(menu, pos, item); } -void wxChoice::DoSetItemClientData( int n, void* clientData ) +void wxChoice::DoSetItemClientData(unsigned int n, void* clientData) { wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") ); @@ -167,7 +181,7 @@ void wxChoice::DoSetItemClientData( int n, void* clientData ) node->SetData( (wxObject*) clientData ); } -void* wxChoice::DoGetItemClientData( int n ) const +void* wxChoice::DoGetItemClientData(unsigned int n) const { wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid choice control") ); @@ -177,7 +191,7 @@ void* wxChoice::DoGetItemClientData( int n ) const return node->GetData(); } -void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData ) +void wxChoice::DoSetItemClientObject(unsigned int n, wxClientData* clientData) { wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") ); @@ -189,7 +203,7 @@ void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData ) node->SetData( (wxObject*) clientData ); } -wxClientData* wxChoice::DoGetItemClientObject( int n ) const +wxClientData* wxChoice::DoGetItemClientObject(unsigned int n) const { wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid choice control") ); @@ -212,7 +226,7 @@ void wxChoice::Clear() { // 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! + // m_clientList.DeleteContents(true) - this would crash! wxList::compatibility_iterator node = m_clientList.GetFirst(); while ( node ) { @@ -224,18 +238,32 @@ void wxChoice::Clear() if ( m_strings ) m_strings->Clear(); + + // begin with no selection + m_selection_hack = wxNOT_FOUND; } -void wxChoice::Delete( int n ) +void wxChoice::Delete(unsigned int n) { wxCHECK_RET( m_widget != NULL, wxT("invalid choice") ); + wxCHECK_RET( IsValid(n), _T("invalid index in wxChoice::Delete") ); // 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 - int i, - count = GetCount(); + unsigned int i; + const unsigned int count = GetCount(); - wxCHECK_RET( n >= 0 && n < count, _T("invalid index in wxChoice::Delete") ); + // 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; + } const bool hasClientData = m_clientDataItemsType != wxClientData_None; const bool hasObjectData = m_clientDataItemsType == wxClientData_Object; @@ -289,9 +317,9 @@ void wxChoice::Delete( int n ) } } -int wxChoice::FindString( const wxString &string ) const +int wxChoice::FindString( const wxString &string, bool bCase ) const { - wxCHECK_MSG( m_widget != NULL, -1, wxT("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. @@ -306,56 +334,35 @@ int wxChoice::FindString( const wxString &string ) const if (bin->child) label = GTK_LABEL(bin->child); if (!label) - label = GTK_LABEL( BUTTON_CHILD(m_widget) ); + label = GTK_LABEL(GTK_BIN(m_widget)->child); 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) + if (string.IsSameAs( tmp, bCase )) return count; child = child->next; count++; } - return -1; + return wxNOT_FOUND; } int wxChoice::GetSelection() const { - 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; + wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid choice") ); - GList *child = menu_shell->children; - while (child) - { - GtkBin *bin = GTK_BIN( child->data ); - if (!bin->child) return count; - child = child->next; - count++; - } + return m_selection_hack; - return -1; -#endif } -void wxChoice::SetString( int n, const wxString& str ) +void wxChoice::SetString(unsigned int n, const wxString& str) { 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) { @@ -366,12 +373,12 @@ void wxChoice::SetString( int n, const wxString& str ) if (bin->child) label = GTK_LABEL(bin->child); if (!label) - label = GTK_LABEL( BUTTON_CHILD(m_widget) ); + label = GTK_LABEL(GTK_BIN(m_widget)->child); wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") ); - gtk_label_set_text( label, wxGTK_CONV( str ) ); - + gtk_label_set_text( label, wxGTK_CONV( str ) ); + return; } child = child->next; @@ -379,12 +386,12 @@ void wxChoice::SetString( int n, const wxString& str ) } } -wxString wxChoice::GetString( int n ) const +wxString wxChoice::GetString(unsigned int n) const { - wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("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) { @@ -395,15 +402,11 @@ wxString wxChoice::GetString( int n ) const if (bin->child) label = GTK_LABEL(bin->child); if (!label) - label = GTK_LABEL( BUTTON_CHILD(m_widget) ); + label = GTK_LABEL(GTK_BIN(m_widget)->child); wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") ); -#ifdef __WXGTK20__ return wxString( wxGTK_CONV_BACK( gtk_label_get_text( label) ) ); -#else - return wxString( label->label ); -#endif } child = child->next; count++; @@ -411,15 +414,15 @@ wxString wxChoice::GetString( int n ) const wxFAIL_MSG( wxT("wxChoice: invalid index in GetString()") ); - return wxT(""); + return wxEmptyString; } -int wxChoice::GetCount() const +unsigned int wxChoice::GetCount() const { 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) { @@ -435,6 +438,24 @@ void wxChoice::SetSelection( int n ) int tmp = n; gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp ); + + // 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::DoApplyWidgetStyle(GtkRcStyle *style) @@ -454,7 +475,7 @@ void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style) if (bin->child) label = bin->child; if (!label) - label = BUTTON_CHILD(m_widget); + label = GTK_BIN(m_widget)->child; gtk_widget_modify_style( label, style ); @@ -462,19 +483,19 @@ void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style) } } -int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item) +int wxChoice::GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& item) { - wxCHECK_MSG((pos>=0) && (pos<=(int)m_clientList.GetCount()), -1, wxT("invalid index")); + wxCHECK_MSG(pos<=m_clientList.GetCount(), -1, wxT("invalid index")); GtkWidget *menu_item = gtk_menu_item_new_with_label( wxGTK_CONV( item ) ); - size_t index; + unsigned int 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 ); + gtk_menu_shell_insert( GTK_MENU_SHELL(menu), menu_item, index ); if ( index ) { @@ -492,15 +513,15 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item) // if we're called from ctor (and GtkMenuShell is still NULL) // normal control, just append - if (pos == (int)m_clientList.GetCount()) + if (pos == m_clientList.GetCount()) { - gtk_menu_append( GTK_MENU(menu), menu_item ); - m_clientList.Append( (wxObject*) NULL ); - index = m_clientList.GetCount() - 1; + gtk_menu_shell_append( GTK_MENU_SHELL(menu), menu_item ); + m_clientList.Append( (wxObject*) NULL ); + index = m_clientList.GetCount() - 1; } else { - gtk_menu_insert( GTK_MENU(menu), menu_item, pos ); + gtk_menu_shell_insert( GTK_MENU_SHELL(menu), menu_item, pos ); m_clientList.Insert( pos, (wxObject*) NULL ); index = pos; } @@ -514,8 +535,15 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item) ApplyWidgetStyle(); } - gtk_signal_connect( GTK_OBJECT( menu_item ), "activate", - GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this ); + // 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 ); @@ -533,8 +561,8 @@ wxSize wxChoice::DoGetBestSize() const if ( m_widget ) { int width; - size_t count = GetCount(); - for ( size_t n = 0; n < count; n++ ) + unsigned int count = GetCount(); + for ( unsigned int n = 0; n < count; n++ ) { GetTextExtent( GetString(n), &width, NULL, NULL, NULL ); if ( width > ret.x ) @@ -570,11 +598,7 @@ wxSize wxChoice::DoGetBestSize() const bool wxChoice::IsOwnGtkWindow( GdkWindow *window ) { -#ifdef __WXGTK20__ return GTK_BUTTON(m_widget)->event_window; -#else - return (window == m_widget->window); -#endif } // static @@ -586,4 +610,3 @@ wxChoice::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) #endif // wxUSE_CHOICE -