X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/11e62fe658531aaa2891351f19bd0a4c076717ae..c1a3ff259eefe3d9ff85ee158dfb3af99e57ea62:/src/gtk/choice.cpp?ds=sidebyside diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp index f5a9bd5034..84eb8ca7f0 100644 --- a/src/gtk/choice.cpp +++ b/src/gtk/choice.cpp @@ -7,21 +7,22 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#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 @@ -45,25 +46,8 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice * int selection = wxNOT_FOUND; -#ifdef __WXGTK20__ selection = gtk_option_menu_get_history( GTK_OPTION_MENU(choice->GetHandle()) ); -#else - GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(choice->GetHandle()) ) ); - int count = 0; - GList *child = menu_shell->children; - while (child) - { - GtkBin *bin = GTK_BIN( child->data ); - if (!bin->child) - { - selection = count; - break; - } - child = child->next; - count++; - } -#endif choice->m_selection_hack = selection; wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() ); @@ -136,7 +120,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, GtkWidget *menu = gtk_menu_new(); - for (int i = 0; i < n; i++) + for (size_t i = 0; i < (size_t)n; i++) { GtkAddHelper(menu, i, choices[i]); } @@ -170,9 +154,9 @@ int wxChoice::DoAppend( const wxString &item ) int wxChoice::DoInsert( const wxString &item, 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()) + if ((size_t)pos == GetCount()) return DoAppend(item); GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ); @@ -184,7 +168,7 @@ int wxChoice::DoInsert( const wxString &item, int pos ) m_selection_hack++; } - return GtkAddHelper(menu, pos, item); + return GtkAddHelper(menu, (size_t)pos, item); } void wxChoice::DoSetItemClientData( int n, void* clientData ) @@ -262,13 +246,12 @@ void wxChoice::Clear() void wxChoice::Delete( 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(); - - wxCHECK_RET( n >= 0 && n < count, _T("invalid index in wxChoice::Delete") ); + size_t i; + const size_t count = GetCount(); // if the item to delete is before the selection, and the selection is valid if ((n < m_selection_hack) && (m_selection_hack != wxNOT_FOUND)) @@ -292,7 +275,7 @@ void wxChoice::Delete( int n ) items.Alloc(count); for ( i = 0; i < count; i++ ) { - if ( i != n ) + if ( i != (size_t)n ) { items.Add(GetString(i)); if ( hasClientData ) @@ -351,15 +334,11 @@ int wxChoice::FindString( const wxString &string, bool bCase ) 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.IsSameAs( tmp, bCase )) return count; @@ -394,7 +373,7 @@ 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") ); @@ -423,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++; @@ -442,12 +417,12 @@ wxString wxChoice::GetString( int n ) const return wxEmptyString; } -int wxChoice::GetCount() const +size_t 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; + size_t count = 0; GList *child = menu_shell->children; while (child) { @@ -465,7 +440,7 @@ void wxChoice::SetSelection( int n ) gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp ); // set the local selection variable manually - if ((n >= 0) && (n < GetCount())) + if ((n >= 0) && (n < (int)GetCount())) { // a valid selection has been made m_selection_hack = n; @@ -500,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 ); @@ -508,9 +483,9 @@ void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style) } } -int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item) +int wxChoice::GtkAddHelper(GtkWidget *menu, size_t pos, const wxString& item) { - wxCHECK_MSG((pos>=0) && (pos<=(int)m_clientList.GetCount()), -1, wxT("invalid index")); + wxCHECK_MSG((pos>=0) && (pos<=m_clientList.GetCount()), -1, wxT("invalid index")); GtkWidget *menu_item = gtk_menu_item_new_with_label( wxGTK_CONV( item ) ); @@ -520,7 +495,7 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item) // 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 ) { @@ -538,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 ); + 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; } @@ -566,8 +541,9 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item) // it has to change. Adapted from Matt Ownby. InvalidateBestSize(); - gtk_signal_connect_after( GTK_OBJECT( menu_item ), "activate", - GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this ); + g_signal_connect_after (menu_item, "activate", + G_CALLBACK (gtk_choice_clicked_callback), + this); gtk_widget_show( menu_item ); @@ -622,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