smyrna Makeifle.am

diff --git a/cmd/smyrna/main.c b/cmd/smyrna/main.c
index 50ed0721dce762274ccc7f4d473036e27fe37277..8a7c5e5d0fb86463f2864b18d3741aded8ffb4a3 100755 (executable)
--- a/cmd/smyrna/main.c
+++ b/cmd/smyrna/main.c
@@ -59,7 +59,7 @@ int main (int argc, char *argv[])
 #ifdef _WIN32
 #define GTKTOPVIEW_ICONSDIR "C:\\Projects\\ATT\\GTK\\GTKTest2\\GUI\\images\\"
 #endif
-       xml = glade_xml_new(GTKTOPVIEW_GLADE, NULL, NULL);
+       xml = glade_xml_new(SMYRNA_GLADE, NULL, NULL);
        gladewidget = glade_xml_get_widget(xml, "frmMain");
     gtk_widget_show (gladewidget);
        g_signal_connect ((gpointer) gladewidget, "destroy", G_CALLBACK(mQuitSlot),

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3fba67bb6e6279e4e00dbc6d7fcc01cbf1957e3e..92a8e76412ba2aa856c75b53b2d8e3956273d543 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -3,6 +3,6 @@
 
 SUBDIRS = cdt graph agraph gd pathplan agutil sfio vmalloc ast vpsc \
        circogen dotgen fdpgen neatogen twopigen common pack gvc \
-       ingraphs expr cgraph utilities xdot gui filter topfish
+       ingraphs expr cgraph utilities xdot gui filter topfish glcomp
 
 EXTRA_DIST = Makefile.old

diff --git a/lib/glcomp/glcompset.h b/lib/glcomp/glcompset.h
index 4859ff5c5e859faf427e9c68d476be768141d530..c2421a709972af16d99a101857a4a8a42c44a1d8 100644 (file)
--- a/lib/glcomp/glcompset.h
+++ b/lib/glcomp/glcompset.h
@@ -140,7 +140,7 @@ void glCompDrawBegin();     //pushes a gl stack
 void glCompDrawEnd();  //pops the gl stack 
 int glCompDrawPanel(glCompPanel* p);
 int glCompSetClick(glCompSet* s,int x,int y);
-int glCompSetRelease(glCompSet* s);
+int glCompSetRelease(glCompSet* s, int x, int y);
 void glCompSetGetPos(int x, int y,float* X,float* Y,float* Z);
 int glCompPointInButton(glCompButton* p,float x,float y);
 void glCompButtonClick(glCompButton* p);
@@ -154,4 +154,4 @@ int glCompPanelHide(glCompPanel* p);
 int glCompPanelShow(glCompPanel* p);
 
 
-#endif
\ No newline at end of file
+#endif