-gvpr button activated

-gvpr broken pipes issue fixed
few gvpr windows related bugs fixed(iddefs for mingw and vs)

diff --git a/cmd/smyrna/glmotion.h b/cmd/smyrna/glmotion.h
index bfd3efd8dce98cbeacac94708f98278ed2ebdcc3..73fa9bcd0cc66334271cf1b1cb2147ac150ed86c 100644 (file)
--- a/cmd/smyrna/glmotion.h
+++ b/cmd/smyrna/glmotion.h
@@ -1,9 +1,11 @@
 #ifndef GLMOTION_H
 #define GLMOTION_H
 #include "viewport.h"
-int glmotion_main(ViewInfo * v,GdkEventMotion * event,GtkWidget * widget);
-int glmotion_zoom(ViewInfo * v);
-int glmotion_pan(ViewInfo * v);
-int glmotion_rotate(ViewInfo * v);
-int glmotion_adjust_pan(ViewInfo* v,float panx,float pany);
+void glmotion_main(ViewInfo * v,GdkEventMotion * event,GtkWidget * widget);
+void glmotion_zoom(ViewInfo * v);
+void glmotion_pan(ViewInfo * v);
+void glmotion_rotate(ViewInfo * v);
+void glmotion_adjust_pan(ViewInfo* v,float panx,float pany);
+void graph_zoom(float real_zoom);
+void glmotion_zoom_inc(int zoomin);
 #endif
\ No newline at end of file

diff --git a/cmd/smyrna/gltemplate.c b/cmd/smyrna/gltemplate.c
index bcc6f8e47ac8d800b2623ff734adddea666ede0b..f47d6eb3c4d1d2cc8ecb4be6efd40a9ad81aaccb 100755 (executable)
--- a/cmd/smyrna/gltemplate.c
+++ b/cmd/smyrna/gltemplate.c
@@ -429,14 +429,15 @@ static gboolean motion_notify_event(GtkWidget * widget,
 
        /*panning */
     if ((event->state & GDK_BUTTON1_MASK)
-       && (view->mouse.mouse_mode == MM_PAN)) {
-       if (glmotion_main(view, event, widget))
+       && (view->mouse.mouse_mode == MM_PAN)) 
+       {
+               glmotion_main(view, event, widget);
            redraw = TRUE;
     }
     /*rotating, only in 3d view */
     if ((view->active_camera >= 0) && (view->mouse.mouse_mode == MM_ROTATE)
        && (event->state & GDK_BUTTON1_MASK)) {
-       if (glmotion_main(view, event, widget))
+               glmotion_main(view, event, widget);
            redraw = TRUE;
     }
     /*zooming */
@@ -444,7 +445,7 @@ static gboolean motion_notify_event(GtkWidget * widget,
        && (view->mouse.mouse_mode == MM_ZOOM))
        {
 
-               if (glmotion_main(view, event, widget))
+               glmotion_main(view, event, widget);
                    redraw = TRUE;
        }