[Exult-cvs-logs] exult/mapedit shapegroup.cc,1.31,1.32 studio.cc,1.155,1.156

[<js...@us...>]

Update of /cvsroot/exult/exult/mapedit
In directory sc8-pr-cvs1:/tmp/cvs-serv21967

Modified Files:
	shapegroup.cc studio.cc 
Log Message:
Working on groups display

Index: shapegroup.cc
===================================================================
RCS file: /cvsroot/exult/exult/mapedit/shapegroup.cc,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- shapegroup.cc	25 May 2003 06:03:09 -0000	1.31
+++ shapegroup.cc	25 May 2003 08:41:25 -0000	1.32
@@ -235,14 +235,22 @@
 
 static int Get_tree_row
 	(
-	GtkTreeModel *model,
-	GtkTreeIter *iter		// Position we want.
+	GtkTreePath *path
 	)
 	{
-	GtkTreePath *path = gtk_tree_model_get_path(model, iter);
 	gchar *str = gtk_tree_path_to_string(path);
 	int row = atoi(str);
 	g_free(str);
+	return row;
+	}
+static int Get_tree_row
+	(
+	GtkTreeModel *model,
+	GtkTreeIter *iter		// Position we want.
+	)
+	{
+	GtkTreePath *path = gtk_tree_model_get_path(model, iter);
+	int row = Get_tree_row(path);
 	gtk_tree_path_free(path);
 	return row;
 	}
@@ -286,6 +294,7 @@
 	ExultStudio::get_instance()->setup_group_controls();
 }
 
+#if 0
 C_EXPORT void
 on_group_list_row_move			(GtkCList	*clist,
 					 gint		src_row,
@@ -294,6 +303,28 @@
 {
 	ExultStudio::get_instance()->move_group(src_row, dest_row);
 }
+#endif
+
+void
+on_group_list_row_inserted		(GtkTreeModel *model,
+					 GtkTreePath *path,
+					 GtkTreeIter *iter,
+					 gpointer user_data)
+{
+cout << "In row_inserted.  Row = " << Get_tree_row(model, iter) << endl;
+	ExultStudio *studio = ExultStudio::get_instance();
+	//+++++FINISH.
+}
+
+void
+on_group_list_row_deleted		(GtkTreeModel *model,
+					 GtkTreePath *path,
+					 gpointer user_data)
+{
+cout << "In row_deleted.  Row = " << Get_tree_row(path) << endl;
+	ExultStudio *studio = ExultStudio::get_instance();
+	//+++++FINISH.
+}
 
 C_EXPORT void
 on_group_list_row_activated		(GtkTreeView	*treeview,
@@ -348,6 +379,10 @@
 		GtkTreeViewColumn *column = gtk_tree_view_get_column(tview, 
 							col_offset - 1);
 		gtk_tree_view_column_set_clickable(column, TRUE);
+		g_signal_connect(G_OBJECT(model), "row-inserted",
+			GTK_SIGNAL_FUNC(on_group_list_row_inserted), this);
+		g_signal_connect(G_OBJECT(model), "row-deleted",
+			GTK_SIGNAL_FUNC(on_group_list_row_deleted), this);
 		}
 	else
 		model = GTK_TREE_STORE(oldmod);
@@ -625,7 +660,7 @@
 			GTK_OBJECT(grpwin), "browser");
 	delete chooser;
 	gtk_widget_destroy(grpwin);
-	gtk_object_destroy(GTK_OBJECT(xml));
+	g_object_unref(G_OBJECT(xml));
 	}
 
 /*

Index: studio.cc
===================================================================
RCS file: /cvsroot/exult/exult/mapedit/studio.cc,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- studio.cc	25 May 2003 02:37:25 -0000	1.155
+++ studio.cc	25 May 2003 08:41:25 -0000	1.156
@@ -612,7 +612,7 @@
 	if (combowin)
 		delete combowin;
 	locwin = 0;
-	gtk_object_unref( GTK_OBJECT( app_xml ) );
+	g_object_unref( G_OBJECT( app_xml ) );
 #ifndef WIN32
 	if (server_input_tag >= 0)
 		gdk_input_remove(server_input_tag);