Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

[wxWidgets.git] / include / wx / gtk / private / string.h

diff --git a/include/wx/gtk/private/string.h b/include/wx/gtk/private/string.h
index 8be04b483f0dc354a5ba7011cba374368a6e43b4..bd188d10f87c03e9dc9064bd5775f20372ff8dca 100644 (file)
--- 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
 // Purpose:     wxGtkString class declaration
 // Author:      Vadim Zeitlin
 // Created:     2006-10-19

-// RCS-ID:      $Id$

 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -36,6 +35,7 @@ private:
 // list for sorting collated strings
 // ----------------------------------------------------------------------------
 
 // list for sorting collated strings
 // ----------------------------------------------------------------------------
 

+#include "wx/string.h"

 #include "wx/vector.h"
 #include "wx/sharedptr.h"
 
 #include "wx/vector.h"
 #include "wx/sharedptr.h"
 


@@ -47,10 +47,10 @@ public:
         m_label = label;
         m_key = key;
     }
         m_label = label;
         m_key = key;
     }

-    
+

     ~wxGtkCollatableString()
     {
     ~wxGtkCollatableString()
     {

-        if (m_key) 
+        if (m_key)

             g_free( m_key );
     }
 
             g_free( m_key );
     }
 


@@ -62,55 +62,55 @@ class wxGtkCollatedArrayString
 {
 public:
     wxGtkCollatedArrayString() { }
 {
 public:
     wxGtkCollatedArrayString() { }

-    
+

     int Add( const wxString &new_label )
     {
         int index = 0;
     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 );
         g_free( new_key_lower );

-        
+

         wxSharedPtr<wxGtkCollatableString> new_ptr( new wxGtkCollatableString( new_label, new_key ) );
         wxSharedPtr<wxGtkCollatableString> new_ptr( new wxGtkCollatableString( new_label, new_key ) );

-    
+

         wxVector< wxSharedPtr<wxGtkCollatableString> >::iterator iter;
         for (iter = m_list.begin(); iter != m_list.end(); ++iter)
         {
             wxSharedPtr<wxGtkCollatableString> ptr = *iter;
         wxVector< wxSharedPtr<wxGtkCollatableString> >::iterator iter;
         for (iter = m_list.begin(); iter != m_list.end(); ++iter)
         {
             wxSharedPtr<wxGtkCollatableString> ptr = *iter;

-            
+

             gchar *key = ptr->m_key;
             gchar *key = ptr->m_key;

-            if (strcmp(key,new_key) > 0)
+            if (strcmp(key,new_key) >= 0)

             {
                 m_list.insert( iter, new_ptr );
                 return index;
             }
             index ++;
         }
             {
                 m_list.insert( iter, new_ptr );
                 return index;
             }
             index ++;
         }

-        
+

         m_list.push_back( new_ptr );
         return index;
     }
         m_list.push_back( new_ptr );
         return index;
     }

-    
+

     size_t GetCount()
     {
         return m_list.size();
     }
     size_t GetCount()
     {
         return m_list.size();
     }

-    
+

     wxString At( size_t index )
     {
         return m_list[index]->m_label;
     }
     wxString At( size_t index )
     {
         return m_list[index]->m_label;
     }

-    
+

     void Clear()
     {
         m_list.clear();
     }
     void Clear()
     {
         m_list.clear();
     }

-    
+

     void RemoveAt( size_t index )
     {
         m_list.erase( m_list.begin() + index );
     }
     void RemoveAt( size_t index )
     {
         m_list.erase( m_list.begin() + index );
     }

-    
+

 private:
     wxVector< wxSharedPtr<wxGtkCollatableString> > m_list;
 };
 private:
     wxVector< wxSharedPtr<wxGtkCollatableString> > m_list;
 };