glom r1525 - in trunk: . glom/utility_widgets/adddel glom/utility_widgets/db_adddel

[murrayc svn gnome org]

Author: murrayc
Date: Fri Apr  4 17:42:05 2008
New Revision: 1525
URL: http://svn.gnome.org/viewvc/glom?rev=1525&view=rev

Log:
2008-04-04  Murray Cumming  <murrayc murrayc com>

* glom/utility_widgets/adddel/adddel.cc: construct_specified_columns():
Really delete the temporary TreeModelColumns to fix a leak.

Modified:
   trunk/ChangeLog
   trunk/glom/utility_widgets/adddel/adddel.cc
   trunk/glom/utility_widgets/db_adddel/glom_db_treemodel.cc

Modified: trunk/glom/utility_widgets/adddel/adddel.cc
==============================================================================
--- trunk/glom/utility_widgets/adddel/adddel.cc	(original)
+++ trunk/glom/utility_widgets/adddel/adddel.cc	Fri Apr  4 17:42:05 2008
@@ -673,7 +673,7 @@
           if(pCellRenderer)
           {
             //Make it editable:
-	    g_object_set(pCellRenderer->gobj(), "editable", TRUE, (gpointer)NULL);
+            g_object_set(pCellRenderer->gobj(), "editable", TRUE, (gpointer)NULL);
 
             //Connect to its signal:
             pCellRenderer->signal_edited().connect(
@@ -702,6 +702,7 @@
   }
 
   //Delete the vector's items:
+  model_column_index = 0;
   for(type_vecModelColumns::iterator iter = vecModelColumns.begin(); iter != vecModelColumns.end(); ++iter)
   {
      Gtk::TreeModelColumnBase* pModelColumn = *iter;
@@ -739,6 +740,8 @@
     {
       std::cerr << "debug: AddDel::construct_specified_columns(): Leaking a Gtk::TreeModelColumn<>." << std::endl;
     }
+    
+    ++model_column_index;
   }
 
   m_TreeView.columns_autosize();

Modified: trunk/glom/utility_widgets/db_adddel/glom_db_treemodel.cc
==============================================================================
--- trunk/glom/utility_widgets/db_adddel/glom_db_treemodel.cc	(original)
+++ trunk/glom/utility_widgets/db_adddel/glom_db_treemodel.cc	Fri Apr  4 17:42:05 2008
@@ -246,11 +246,11 @@
 
 void DbTreeModelRow::fill_values_if_necessary(DbTreeModel& model, int row)
 {
-  std::cout << "DbTreeModelRow::fill_values_if_necessary(): row=" << row << std::endl;
-  if(row == 1000)
-  {
-    std::cout << "1000" << std::endl;  
-  }
+  //std::cout << "DbTreeModelRow::fill_values_if_necessary(): row=" << row << std::endl;
+  //if(row == 1000)
+  //{
+  //  std::cout << "1000" << std::endl;  
+  //}
 
   if(m_values_retrieved)
   {