X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/865bb3251ecf83ddac350b734f4fed1d258e250b..c00fed0ef4d70c9b45d9b8405f636d30eadb7ea6:/src/gtk1/choice.cpp?ds=sidebyside diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp index 7b8633ef1b..8b61e05950 100644 --- a/src/gtk1/choice.cpp +++ b/src/gtk1/choice.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: choice.cpp +// Name: src/gtk1/choice.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,11 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "choice.h" -#endif - #include "wx/defs.h" #if wxUSE_CHOICE @@ -19,7 +14,7 @@ #include "wx/choice.h" #include "wx/arrstr.h" -#include "wx/gtk/private.h" +#include "wx/gtk1/private.h" //----------------------------------------------------------------------------- // idle system @@ -50,9 +45,6 @@ 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; @@ -68,7 +60,7 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice * child = child->next; count++; } -#endif + choice->m_selection_hack = selection; wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() ); @@ -115,16 +107,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(); @@ -153,7 +145,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() @@ -247,7 +239,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 ) { @@ -339,9 +331,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. @@ -360,24 +352,21 @@ int wxChoice::FindString( const wxString &string ) const 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") ); + wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid choice") ); return m_selection_hack; @@ -403,8 +392,8 @@ void wxChoice::SetString( int n, const wxString& str ) 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; @@ -414,7 +403,7 @@ void wxChoice::SetString( int n, const wxString& str ) wxString wxChoice::GetString( 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; @@ -432,11 +421,7 @@ wxString wxChoice::GetString( int n ) const 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++; @@ -444,7 +429,7 @@ wxString wxChoice::GetString( int n ) const wxFAIL_MSG( wxT("wxChoice: invalid index in GetString()") ); - return wxT(""); + return wxEmptyString; } int wxChoice::GetCount() const @@ -545,9 +530,9 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item) // normal control, just append if (pos == (int)m_clientList.GetCount()) { - gtk_menu_append( GTK_MENU(menu), menu_item ); - m_clientList.Append( (wxObject*) NULL ); - index = m_clientList.GetCount() - 1; + gtk_menu_append( GTK_MENU(menu), menu_item ); + m_clientList.Append( (wxObject*) NULL ); + index = m_clientList.GetCount() - 1; } else { @@ -570,7 +555,7 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item) // changed, but at least after adding an 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 ); @@ -627,11 +612,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 @@ -643,4 +624,3 @@ wxChoice::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) #endif // wxUSE_CHOICE -