Add macros for custom_object_data and custom_graph_data;

clean up warnings;
add macros for malloc and realloc

diff --git a/cmd/smyrna/glexpose.c b/cmd/smyrna/glexpose.c
index a40c2595275d109d0b5f9256b4bc98d490984459..4333b956533e83a1568eb9c096f2c6f871e1f2cb 100644 (file)
--- a/cmd/smyrna/glexpose.c
+++ b/cmd/smyrna/glexpose.c
@@ -133,8 +133,7 @@ void glexpose_grid(ViewInfo * view)
 int glexpose_drawgraph(ViewInfo * view)
 {
     if (view->activeGraph > -1) {
-       if (((custom_graph_data *) AGDATA(view->g[view->activeGraph]))->
-           TopView) {
+       if (GD_TopView(view->g[view->activeGraph])) {
            drawTopViewGraph(view->g[view->activeGraph]);       //view->Topview style dots and straight lines
            glCompSetDraw(view->Topview->topviewmenu);
        } else

diff --git a/cmd/smyrna/gltemplate.c b/cmd/smyrna/gltemplate.c
index c1dd5123666366c11cde3d784018a90066072b65..05faad209762dc63d84a70ec98f54de67b9162db 100755 (executable)
--- a/cmd/smyrna/gltemplate.c
+++ b/cmd/smyrna/gltemplate.c
@@ -319,8 +319,7 @@ static gboolean button_release_event(GtkWidget * widget,
            expose_event(view->drawing_area, NULL, NULL);
        }
        if (view->mouse.mouse_mode == MM_MOVE) {
-           if (((custom_graph_data *)
-                AGDATA(view->g[view->activeGraph]))->TopView == 0)
+           if (GD_TopView(view->g[view->activeGraph]) == 0)
                move_nodes(view->g[view->activeGraph]);
            else
                move_TVnodes();