X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58b907f6e1ba4a25a99ce65e044fbd4285905aaf..23c085422e55c79bc40cb402be6a7d956b7d1190:/src/gtk1/choice.cpp diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp index 59d5402c12..1372a2398f 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,19 +7,17 @@ // 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" +#ifndef WX_PRECOMP + #include "wx/arrstr.h" +#endif + +#include "wx/gtk1/private.h" //----------------------------------------------------------------------------- // idle system @@ -38,6 +36,7 @@ extern bool g_blockEventsOnDrag; // "activate" //----------------------------------------------------------------------------- +extern "C" { static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice ) { if (g_isIdle) @@ -49,9 +48,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; @@ -67,7 +63,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() ); @@ -84,6 +80,7 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice * choice->GetEventHandler()->ProcessEvent(event); } +} //----------------------------------------------------------------------------- // wxChoice @@ -113,16 +110,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(); @@ -139,7 +136,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, 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]); } @@ -151,7 +148,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() @@ -170,10 +167,10 @@ 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); @@ -181,7 +178,7 @@ int wxChoice::DoInsert( const wxString &item, int pos ) 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 ((pos <= m_selection_hack) && (m_selection_hack != wxNOT_FOUND)) + if (((int)pos <= m_selection_hack) && (m_selection_hack != wxNOT_FOUND)) { // move the selection forward one m_selection_hack++; @@ -190,7 +187,7 @@ int wxChoice::DoInsert( const wxString &item, int pos ) 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") ); @@ -200,7 +197,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") ); @@ -210,7 +207,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") ); @@ -222,7 +219,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") ); @@ -245,7 +242,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 ) { @@ -262,24 +259,24 @@ void wxChoice::Clear() m_selection_hack = wxNOT_FOUND; } -void wxChoice::Delete( int n ) +void wxChoice::Delete(unsigned int n) { wxCHECK_RET( m_widget != NULL, wxT("invalid choice") ); // 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; + unsigned int count = GetCount(); - wxCHECK_RET( n >= 0 && n < count, _T("invalid index in wxChoice::Delete") ); + wxCHECK_RET( IsValid(n), _T("invalid index in wxChoice::Delete") ); // if the item to delete is before the selection, and the selection is valid - if ((n < m_selection_hack) && (m_selection_hack != wxNOT_FOUND)) + if (((int)n < m_selection_hack) && (m_selection_hack != wxNOT_FOUND)) { // move the selection back one m_selection_hack--; } - else if (n == m_selection_hack) + else if ((int)n == m_selection_hack) { // invalidate the selection m_selection_hack = wxNOT_FOUND; @@ -337,9 +334,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. @@ -358,35 +355,32 @@ 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; } -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) { @@ -401,8 +395,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; @@ -410,12 +404,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) { @@ -430,11 +424,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++; @@ -442,15 +432,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) { @@ -468,7 +458,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 (IsValid((unsigned int)n)) { // a valid selection has been made m_selection_hack = n; @@ -511,9 +501,9 @@ 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 ) ); @@ -541,11 +531,11 @@ 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_append( GTK_MENU(menu), menu_item ); + m_clientList.Append( (wxObject*) NULL ); + index = m_clientList.GetCount() - 1; } else { @@ -568,7 +558,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 ); @@ -588,10 +578,10 @@ 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 ); + GetTextExtent(GetString(n), &width, NULL, NULL, NULL ); if ( width > ret.x ) ret.x = width; } @@ -625,11 +615,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 @@ -641,4 +627,3 @@ wxChoice::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) #endif // wxUSE_CHOICE -