add GetLo/Hi() test

[wxWidgets.git] / src / gtk / dataview.cpp

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index c80f8bd0123c4292af515c4c4cfca5767eefa790..697d1cf9cc962e13636c5ae6394a53e7375b295a 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -2500,7 +2500,10 @@ void wxDataViewColumn::SetTitle( const wxString &title )
 
 wxString wxDataViewColumn::GetTitle() const
 {
-    return wxGTK_CONV_BACK( gtk_label_get_text( GTK_LABEL(m_label) ) );
+    return wxGTK_CONV_BACK_FONT(
+            gtk_label_get_text( GTK_LABEL(m_label) ),
+            GetOwner()->GetFont()
+           );
 }
 
 void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap )
@@ -3572,6 +3575,8 @@ wxDataViewCtrl::~wxDataViewCtrl()
     if (m_notifier)
         GetModel()->RemoveNotifier( m_notifier );
 
+    m_cols.Clear();
+
     // remove the model from the GtkTreeView before it gets destroyed by the
     // wxDataViewCtrlBase's dtor
     gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), NULL );
@@ -3583,6 +3588,8 @@ void wxDataViewCtrl::Init()
 {
     m_notifier = NULL;
     m_internal = NULL;
+    
+    m_cols.DeleteContents( true );
 }
 
 static GtkTargetEntry gs_target;
@@ -3817,7 +3824,7 @@ wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const
         return NULL;
 
     wxDataViewColumnList::const_iterator iter;
-    for (iter = m_cols.begin(); iter != m_cols.end(); iter++)
+    for (iter = m_cols.begin(); iter != m_cols.end(); ++iter)
     {
         wxDataViewColumn *col = *iter;
         if (GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) == gtk_col)
@@ -3834,9 +3841,7 @@ bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
     gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview),
                                  GTK_TREE_VIEW_COLUMN(column->GetGtkHandle()) );
 
-    m_cols.remove( column );
-
-    delete column;
+    m_cols.DeleteObject( column );
 
     return true;
 }
@@ -3844,14 +3849,14 @@ bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
 bool wxDataViewCtrl::ClearColumns()
 {
     wxDataViewColumnList::iterator iter;
-    for (iter = m_cols.begin(); iter != m_cols.end(); iter++)
+    for (iter = m_cols.begin(); iter != m_cols.end(); ++iter)
     {
         wxDataViewColumn *col = *iter;
         gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview),
                                      GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) );
     }
 
-    m_cols.clear();
+    m_cols.Clear();
 
     return true;
 }