myrna - error

diff --git a/cmd/smyrna/topview.c b/cmd/smyrna/topview.c
index fad9e828c3c4867c8dad49b07c1a55b293c76711..274135c3c05cfe8bbb2c0b35aab5b26c8a555885 100755 (executable)
--- a/cmd/smyrna/topview.c
+++ b/cmd/smyrna/topview.c
@@ -945,6 +945,10 @@ void menu_click_alpha_plus(void* p)
 
 }
 
+#ifdef _WIN32
+#define SMYRNA_ICONSDIR c:
+#endif
+
 
 glCompSet* glcreate_gl_topview_menu()
 {
@@ -1018,35 +1022,35 @@ glCompSet* glcreate_gl_topview_menu()
        b->groupid=2;
        glCompSetAddButton(s,b);
        //pan button
-       b=glCompButtonNew(5,120,72,72,"adasasds","c:/pan.raw",72,72);
+       b=glCompButtonNew(5,120,72,72,"adasasds","SMYRNA_ICONSDIR/pan.raw",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","c:/zoom.raw",72,72);
+       b=glCompButtonNew(85,120,72,72,"adasasds","SMYRNA_ICONSDIR/zoom.raw",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","c:/zoomplus.raw",36,36);
+       b=glCompButtonNew(85,82,36,36,"adasasds","SMYRNA_ICONSDIR/zoomplus.raw",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","c:/zoomminus.raw",36,36);
+       b=glCompButtonNew(121,82,36,36,"adasasds","SMYRNA_ICONSDIR/zoomminus.raw",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","c:/fisheye.raw",72,72);
+       b=glCompButtonNew(5,45,72,72,"adasasds","SMYRNA_ICONSDIR/fisheye.raw",72,72);
        b->groupid=3;
        b->panel=p;
        b->customptr=view;
@@ -1070,13 +1074,13 @@ glCompSet* glcreate_gl_topview_menu()
        p->data=2;              //data panel
        glCompSetAddPanel(s,p);
        //alpha plus button
-       b=glCompButtonNew(75,3,36,36,"","c:/zoomplus.raw",36,36);
+       b=glCompButtonNew(75,3,36,36,"","SMYRNA_ICONSDIR/zoomplus.raw",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,"","c:/zoomminus.raw",36,36);
+       b=glCompButtonNew(113,3,36,36,"","SMYRNA_ICONSDIR/zoomminus.raw",36,36);
        b->groupid=0;
        b->panel=p;
        b->callbackfunc=menu_click_alpha_plus;

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

diff --git a/share/icons/Makefile.am b/share/icons/Makefile.am
index d1dd087d8a7b4bd6467533410ce0296adea5686b..628e963b223474c90acf0f54f1ba6dfb9edbc96d 100644 (file)
--- a/share/icons/Makefile.am
+++ b/share/icons/Makefile.am
@@ -8,7 +8,9 @@ icons = add_edge.png AntiselectRect.png AntiselectRectX.png cursor.png \
        fit_to_screen.png magifier_zoom_out.png magnifier.png \
        magnifier_zoom_in.png move.png new_delete.png new_node.png \
        newzoom.png pan.png select.png selectx.png zoom_in.png \
-       zoom_out.png zoom.png
+       zoom_out.png zoom.png \
+       fisheye.raw ok.raw ok2.raw ok3.raw pan.raw zoom.raw \
+       zoomminus.raw zoomplus.raw
 
 if WITH_SMYRNA
 icons_DATA = $(icons)