X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8228b8932abaedadbf9568bb3a1eef3ae25fb2a3..564c7fc4127c39472b32f80b32733eb6e3ade59c:/src/gtk1/choice.cpp diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp index 6558cf509b..e6d11cc52d 100644 --- a/src/gtk1/choice.cpp +++ b/src/gtk1/choice.cpp @@ -12,7 +12,10 @@ #if wxUSE_CHOICE #include "wx/choice.h" -#include "wx/arrstr.h" + +#ifndef WX_PRECOMP + #include "wx/arrstr.h" +#endif #include "wx/gtk1/private.h" @@ -75,7 +78,7 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice * else if ( choice->HasClientUntypedData() ) event.SetClientData( choice->GetClientData(n) ); - choice->GetEventHandler()->ProcessEvent(event); + choice->HandleWindowEvent(event); } } @@ -83,7 +86,7 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice * // wxChoice //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems) wxChoice::wxChoice() { @@ -123,7 +126,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, if ( style & wxCB_SORT ) { - // if our m_strings != NULL, DoAppend() will check for it and insert + // if our m_strings != NULL, Append() will check for it and insert // items in the correct order m_strings = new wxSortedArrayString; } @@ -133,7 +136,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, GtkWidget *menu = gtk_menu_new(); - for (size_t i = 0; i < (size_t)n; i++) + for (unsigned int i = 0; i < (unsigned int)n; i++) { GtkAddHelper(menu, i, choices[i]); } @@ -143,7 +146,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, m_parent->DoAddChild( this ); PostCreation(size); - SetBestSize(size); // need this too because this is a wxControlWithItems + SetInitialSize(size); // need this too because this is a wxControlWithItems return true; } @@ -155,36 +158,36 @@ wxChoice::~wxChoice() delete m_strings; } -int wxChoice::DoAppend( const wxString &item ) +int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items, + unsigned int pos, + void **clientData, wxClientDataType type) { wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") ); - GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ); + const unsigned int count = items.GetCount(); - return GtkAddHelper(menu, GetCount(), item); -} - -int wxChoice::DoInsert( const wxString &item, int pos ) -{ - wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") ); - wxCHECK_MSG( IsValidInsert(pos), -1, wxT("invalid index")); + GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ); - if ((size_t)pos == GetCount()) - return DoAppend(item); + for ( unsigned int i = 0; i < count; ++i, ++pos ) + { + int n = GtkAddHelper(menu, pos, items[i]); + if ( n == wxNOT_FOUND ) + return n; - GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ); + AssignNewItemClientData(n, clientData, i, type); + } // 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++; + // move the selection forward + m_selection_hack += count; } - return GtkAddHelper(menu, (size_t)pos, item); + return pos - 1; } -void wxChoice::DoSetItemClientData( int n, void* clientData ) +void wxChoice::DoSetItemClientData(unsigned int n, void* clientData) { wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") ); @@ -194,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") ); @@ -204,30 +207,7 @@ void* wxChoice::DoGetItemClientData( int n ) const return node->GetData(); } -void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData ) -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") ); - - wxList::compatibility_iterator node = m_clientList.Item( n ); - wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientObject") ); - - // wxItemContainer already deletes data for us - - node->SetData( (wxObject*) clientData ); -} - -wxClientData* wxChoice::DoGetItemClientObject( int n ) const -{ - wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid choice control") ); - - wxList::compatibility_iterator node = m_clientList.Item( n ); - wxCHECK_MSG( node, (wxClientData *)NULL, - wxT("invalid index in wxChoice::DoGetItemClientObject") ); - - return (wxClientData*) node->GetData(); -} - -void wxChoice::Clear() +void wxChoice::DoClear() { wxCHECK_RET( m_widget != NULL, wxT("invalid choice") ); @@ -235,18 +215,6 @@ void wxChoice::Clear() GtkWidget *menu = gtk_menu_new(); gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu ); - if ( HasClientObjectData() ) - { - // 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! - wxList::compatibility_iterator node = m_clientList.GetFirst(); - while ( node ) - { - delete (wxClientData *)node->GetData(); - node = node->GetNext(); - } - } m_clientList.Clear(); if ( m_strings ) @@ -256,79 +224,49 @@ void wxChoice::Clear() m_selection_hack = wxNOT_FOUND; } -void wxChoice::Delete( int n ) +void wxChoice::DoDeleteOneItem(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; - size_t count = GetCount(); - 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; } - const bool hasClientData = m_clientDataItemsType != wxClientData_None; - const bool hasObjectData = m_clientDataItemsType == wxClientData_Object; + // 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 + const unsigned int count = GetCount(); wxList::compatibility_iterator node = m_clientList.GetFirst(); wxArrayString items; wxArrayPtrVoid itemsData; items.Alloc(count); - for ( i = 0; (size_t)i < count; i++ ) + for ( unsigned i = 0; i < count; i++, node = node->GetNext() ) { if ( i != n ) { items.Add(GetString(i)); - if ( hasClientData ) - { - // also save the client data - itemsData.Add(node->GetData()); - } - } - else // need to delete the client object too - { - if ( hasObjectData ) - { - delete (wxClientData *)node->GetData(); - } - } - - if ( hasClientData ) - { - node = node->GetNext(); + itemsData.Add(node->GetData()); } } - if ( hasObjectData ) - { - // prevent Clear() from destroying all client data - m_clientDataItemsType = wxClientData_None; - } + wxChoice::DoClear(); - Clear(); - - for ( i = 0; i < count - 1; i++ ) - { - Append(items[i]); - - if ( hasObjectData ) - SetClientObject(i, (wxClientData *)itemsData[i]); - else if ( hasClientData ) - SetClientData(i, itemsData[i]); - } + void ** const data = &itemsData[0]; + if ( HasClientObjectData() ) + Append(items, reinterpret_cast(data)); + else + Append(items, data); } int wxChoice::FindString( const wxString &string, bool bCase ) const @@ -372,12 +310,12 @@ int wxChoice::GetSelection() const } -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,12 +339,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, 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) { @@ -432,12 +370,12 @@ wxString wxChoice::GetString( int n ) const return wxEmptyString; } -size_t 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) ) ); - size_t count = 0; + unsigned int count = 0; GList *child = menu_shell->children; while (child) { @@ -455,7 +393,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) && ((size_t)n < GetCount())) + if (IsValid((unsigned int)n)) { // a valid selection has been made m_selection_hack = n; @@ -498,7 +436,7 @@ void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style) } } -int wxChoice::GtkAddHelper(GtkWidget *menu, size_t pos, const wxString& item) +int wxChoice::GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& item) { wxCHECK_MSG(pos<=m_clientList.GetCount(), -1, wxT("invalid index")); @@ -528,7 +466,7 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, size_t 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 ); @@ -575,10 +513,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; }