X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/625ed743015f2da84db47a6851e6011bd08f4bd2..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/gtk/private/string.h?ds=sidebyside diff --git a/include/wx/gtk/private/string.h b/include/wx/gtk/private/string.h index c9662bcebd..bd188d10f8 100644 --- a/include/wx/gtk/private/string.h +++ b/include/wx/gtk/private/string.h @@ -3,7 +3,6 @@ // Purpose: wxGtkString class declaration // Author: Vadim Zeitlin // Created: 2006-10-19 -// RCS-ID: $Id$ // Copyright: (c) 2006 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -48,10 +47,10 @@ public: m_label = label; m_key = key; } - + ~wxGtkCollatableString() { - if (m_key) + if (m_key) g_free( m_key ); } @@ -63,22 +62,22 @@ class wxGtkCollatedArrayString { public: wxGtkCollatedArrayString() { } - + int Add( const wxString &new_label ) { int index = 0; - - gchar *new_key_lower = g_utf8_casefold( new_label.utf8_str(), -1); - gchar *new_key = g_utf8_collate_key( new_key_lower, -1); + + gchar *new_key_lower = g_utf8_casefold( new_label.utf8_str(), -1); + gchar *new_key = g_utf8_collate_key( new_key_lower, -1); g_free( new_key_lower ); - + wxSharedPtr new_ptr( new wxGtkCollatableString( new_label, new_key ) ); - + wxVector< wxSharedPtr >::iterator iter; for (iter = m_list.begin(); iter != m_list.end(); ++iter) { wxSharedPtr ptr = *iter; - + gchar *key = ptr->m_key; if (strcmp(key,new_key) >= 0) { @@ -87,31 +86,31 @@ public: } index ++; } - + m_list.push_back( new_ptr ); return index; } - + size_t GetCount() { return m_list.size(); } - + wxString At( size_t index ) { return m_list[index]->m_label; } - + void Clear() { m_list.clear(); } - + void RemoveAt( size_t index ) { m_list.erase( m_list.begin() + index ); } - + private: wxVector< wxSharedPtr > m_list; };