From: ellson <devnull@localhost>
Date: Tue, 26 Feb 2008 19:54:55 +0000 (+0000)
Subject: smyrna Makeifle.am
X-Git-Tag: LAST_LIBGRAPH~32^2~4675
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0c2c81bb5a3fad2ab017a6f64b8e94641e9ed38;p=graphviz

smyrna Makeifle.am
---

diff --git a/cmd/smyrna/main.c b/cmd/smyrna/main.c
index 50ed0721d..8a7c5e5d0 100755
--- 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 3fba67bb6..92a8e7641 100644
--- 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 4859ff5c5..c2421a709 100644
--- 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