From: ellson <devnull@localhost>
Date: Tue, 26 Feb 2008 21:34:25 +0000 (+0000)
Subject: smyrna icons
X-Git-Tag: LAST_LIBGRAPH~32^2~4666
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f29b4f3bc1326afcb58028085493aa9a588098da;p=graphviz

smyrna icons
---

diff --git a/cmd/smyrna/Makefile.am b/cmd/smyrna/Makefile.am
index bff21470b..0c6f932d2 100644
--- a/cmd/smyrna/Makefile.am
+++ b/cmd/smyrna/Makefile.am
@@ -4,7 +4,11 @@ icondir = $(pkgdatadir)/icons
 AM_CPPFLAGS = \
 	-DSMYRNA_GLADE=\""$(guidir)/smyrna.glade"\" \
 	-DSMYRNA_FONT=\""$(guidir)/arial.tga"\" \
-	-DSMYRNA_ICONSDIR=\""$(iconsdir)"\" \
+	-DSMYRNA_ICON_PAN=\""$(icondir)/pan.raw"\" \
+	-DSMYRNA_ICON_ZOOM=\""$(icondir)/zoom.raw"\" \
+	-DSMYRNA_ICON_ZOOMPLUS=\""$(icondir)/zoomplus.raw"\" \
+	-DSMYRNA_ICON_ZOOMMINUS=\""$(icondir)/zoomminus.raw"\" \
+	-DSMYRNA_ICON_FISHEYE=\""$(icondir)/fisheye.raw"\" \
         -I$(top_srcdir) \
         -I$(top_srcdir)/lib/cgraph \
         -I$(top_srcdir)/lib/cdt \
diff --git a/cmd/smyrna/topview.c b/cmd/smyrna/topview.c
index 274135c3c..c805722bc 100755
--- a/cmd/smyrna/topview.c
+++ b/cmd/smyrna/topview.c
@@ -946,7 +946,11 @@ void menu_click_alpha_plus(void* p)
 }
 
 #ifdef _WIN32
-#define SMYRNA_ICONSDIR c:
+#define SMYRNA_ICON_PAN "c:/pan.raw"
+#define SMYRNA_ICON_ZOOM "c:/zoom.raw"
+#define SMYRNA_ICON_ZOOMPLUS "c:/zomplus.raw"
+#define SMYRNA_ICON_ZOOMMINUS "c:/zoomminus.raw"
+#define SMYRNA_ICON_FISHEYE "c:/fisheye.raw"
 #endif
 
 
@@ -1022,35 +1026,35 @@ glCompSet* glcreate_gl_topview_menu()
 	b->groupid=2;
 	glCompSetAddButton(s,b);
 	//pan button
-	b=glCompButtonNew(5,120,72,72,"adasasds","SMYRNA_ICONSDIR/pan.raw",72,72);
+	b=glCompButtonNew(5,120,72,72,"adasasds",SMYRNA_ICON_PAN,72,72);
 	b->groupid=3;
 	b->customptr=view;
 	b->panel=p;
 	b->callbackfunc=menu_click_pan;
 	glCompSetAddButton(s,b);
 	//zoom
-	b=glCompButtonNew(85,120,72,72,"adasasds","SMYRNA_ICONSDIR/zoom.raw",72,72);
+	b=glCompButtonNew(85,120,72,72,"adasasds",SMYRNA_ICON_ZOOM,72,72);
 	b->groupid=3;
 	b->customptr=view;
 	b->panel=p;
 	b->callbackfunc=menu_click_zoom;
 	glCompSetAddButton(s,b);
 	//zoom +
-	b=glCompButtonNew(85,82,36,36,"adasasds","SMYRNA_ICONSDIR/zoomplus.raw",36,36);
+	b=glCompButtonNew(85,82,36,36,"adasasds",SMYRNA_ICON_ZOOMPLUS,36,36);
 	b->groupid=0;
 	b->customptr=view;
 	b->panel=p;
 	b->callbackfunc=menu_click_zoom_plus;
 	glCompSetAddButton(s,b);
 	//zoom -
-	b=glCompButtonNew(121,82,36,36,"adasasds","SMYRNA_ICONSDIR/zoomminus.raw",36,36);
+	b=glCompButtonNew(121,82,36,36,"adasasds",SMYRNA_ICON_ZOOMMINUS,36,36);
 	b->groupid=0;
 	b->panel=p;
 	b->customptr=view;
 	b->callbackfunc=menu_click_zoom_minus;
 	glCompSetAddButton(s,b);
 
-	b=glCompButtonNew(5,45,72,72,"adasasds","SMYRNA_ICONSDIR/fisheye.raw",72,72);
+	b=glCompButtonNew(5,45,72,72,"adasasds",SMYRNA_ICON_FISHEYE,72,72);
 	b->groupid=3;
 	b->panel=p;
 	b->customptr=view;
@@ -1074,13 +1078,13 @@ glCompSet* glcreate_gl_topview_menu()
 	p->data=2;		//data panel
 	glCompSetAddPanel(s,p);
 	//alpha plus button
-	b=glCompButtonNew(75,3,36,36,"","SMYRNA_ICONSDIR/zoomplus.raw",36,36);
+	b=glCompButtonNew(75,3,36,36,"",SMYRNA_ICON_ZOOMPLUS,36,36);
 	b->groupid=0;
 	b->panel=p;
 	b->callbackfunc=menu_click_alpha_plus;
 	glCompSetAddButton(s,b);
 	//alpha minus button
-	b=glCompButtonNew(113,3,36,36,"","SMYRNA_ICONSDIR/zoomminus.raw",36,36);
+	b=glCompButtonNew(113,3,36,36,"",SMYRNA_ICON_ZOOMMINUS,36,36);
 	b->groupid=0;
 	b->panel=p;
 	b->callbackfunc=menu_click_alpha_plus;