smyrna warning clean up

diff --git a/cmd/smyrna/gui/appmouse.c b/cmd/smyrna/gui/appmouse.c
index bcd96d84f2ca9391c5b500ef4a69b02689761cc9..c64fbd8b03f849d316844309982da107cf2efe96 100644 (file)
--- a/cmd/smyrna/gui/appmouse.c
+++ b/cmd/smyrna/gui/appmouse.c
@@ -155,7 +155,6 @@ void appmouse_left_click_down(ViewInfo* v,int x,int y)
 }
 void appmouse_left_click_up(ViewInfo* v,int x,int y)
 {
-       int a=get_mode(v);
     appmouse_up(v,x,y);
 /*     if (v->mouse.mouse_mode == MM_MOVE)
            move_TVnodes();*/

diff --git a/cmd/smyrna/gui/glcompui.c b/cmd/smyrna/gui/glcompui.c
index 2cdeabcdb5ad658f4460ce3996204a0a40e93ddc..e5b84da0f05d9fc8b034aa55816c7e331d42dc2a 100644 (file)
--- a/cmd/smyrna/gui/glcompui.c
+++ b/cmd/smyrna/gui/glcompui.c
@@ -32,10 +32,8 @@
 /* static glCompPanel *controlPanel; */
 /* static glCompButton *rotatebutton; */
 static glCompPanel *sel = NULL;
-static  glCompLabel *selLabel=NULL;
 static glCompButton *to3DBtn;
 static glCompButton *to2DBtn;
-static glCompButton *rotateBtn;
 static glCompButton *toFisheye;
 static glCompButton *toNormal;
 static glCompImage *imgFisheye;
@@ -43,7 +41,7 @@ static glCompImage *img3D;
 static glCompButton *panBtn;
 
 
-static void menu_click_pan(void *obj, GLfloat x, GLfloat y,
+static void menu_click_pan(glCompObj *obj, GLfloat x, GLfloat y,
                           glMouseButtonType t)
 {
         deselect_all(view->g[view->activeGraph]);
@@ -58,19 +56,19 @@ static void menu_click_zoom(void *obj, GLfloat x, GLfloat y,
 #endif
 
 
-static void menu_click_zoom_minus(void *obj, GLfloat x, GLfloat y,
+static void menu_click_zoom_minus(glCompObj *obj, GLfloat x, GLfloat y,
                                  glMouseButtonType t)
 {
     glmotion_zoom_inc(0);
 }
 
-static void menu_click_zoom_plus(void *obj, GLfloat x, GLfloat y,
+static void menu_click_zoom_plus(glCompObj *obj, GLfloat x, GLfloat y,
                                 glMouseButtonType t)
 {
     glmotion_zoom_inc(1);
 }
 
-static void menu_switch_to_fisheye(void *obj, GLfloat x, GLfloat y,
+static void menu_switch_to_fisheye(glCompObj *obj, GLfloat x, GLfloat y,
                                   glMouseButtonType t)
 {
     if (!view->Topview->is_top_fisheye == 1) {
@@ -97,7 +95,7 @@ static void menu_switch_to_fisheye(void *obj, GLfloat x, GLfloat y,
 
 
 
-static void menu_click_center(void *obj, GLfloat x, GLfloat y,
+static void menu_click_center(glCompObj *obj, GLfloat x, GLfloat y,
                              glMouseButtonType t)
 {
     if (view->active_camera == -1) {   /*2D mode */
@@ -110,7 +108,7 @@ static void menu_click_center(void *obj, GLfloat x, GLfloat y,
 
     }
 }
-static void switch2D3D(void *obj, GLfloat x, GLfloat y,
+static void switch2D3D(glCompObj *obj, GLfloat x, GLfloat y,
                       glMouseButtonType t)
 {
     if (t == glMouseLeftButton) {
@@ -141,7 +139,7 @@ static void switch2D3D(void *obj, GLfloat x, GLfloat y,
 }
 
 
-void CBglCompMouseUp(void *obj, GLfloat x, GLfloat y, glMouseButtonType t)
+void CBglCompMouseUp(glCompObj *obj, GLfloat x, GLfloat y, glMouseButtonType t)
 {
     /* glCompMouse* m=&((glCompSet*)obj)->mouse; */
     sel->common.visible = 0;
@@ -149,7 +147,8 @@ void CBglCompMouseUp(void *obj, GLfloat x, GLfloat y, glMouseButtonType t)
 
 }
 
-void CBglCompMouseRightClick(void *obj, GLfloat x, GLfloat y,
+
+void CBglCompMouseRightClick(glCompObj *obj, GLfloat x, GLfloat y,
                             glMouseButtonType t)
 {
     if (t == glMouseRightButton) 
@@ -159,7 +158,7 @@ void CBglCompMouseRightClick(void *obj, GLfloat x, GLfloat y,
     }
 }
 
-void attrList(void *obj, GLfloat x, GLfloat y, glMouseButtonType t)
+void attrList(glCompObj *obj, GLfloat x, GLfloat y, glMouseButtonType t)
 {
        showAttrsWidget(view->Topview);
 }
@@ -167,7 +166,7 @@ void attrList(void *obj, GLfloat x, GLfloat y, glMouseButtonType t)
 
 
 
-void glCompMouseMove(void *obj, GLfloat x, GLfloat y)
+void glCompMouseMove(glCompObj *obj, GLfloat x, GLfloat y)
 {
     glCompMouse *m = &((glCompSet *) obj)->mouse;
 

diff --git a/cmd/smyrna/hotkeymap.c b/cmd/smyrna/hotkeymap.c
index 891b2e30fae3c772256d695c24415b781fcdf124..3beff00039a2430aa7a86f5ea4bb2337ed87dc1e 100644 (file)
--- a/cmd/smyrna/hotkeymap.c
+++ b/cmd/smyrna/hotkeymap.c
@@ -94,7 +94,6 @@ void load_mouse_actions (char* modefile,ViewInfo* v)
 #define MM_MAGNIFIER                   20
 #define MM_FISHEYE_MAGNIFIER   21*/
     /*file parsing is temporarrily not available*/
-    int ind=0;
     int i=0;
     FILE* file;
     char line[BUFSIZ];

diff --git a/cmd/smyrna/main.c b/cmd/smyrna/main.c
index 77dd7cf77d00eb3239e65a518627a72f45ca75a7..99766b36a5f70fd7b2ce574f50a53a0385b12746 100755 (executable)
--- a/cmd/smyrna/main.c
+++ b/cmd/smyrna/main.c
@@ -230,7 +230,7 @@ int main(int argc, char *argv[])
     glutInit(&argc, argv);
 #endif
 
-    gladewidget = glade_xml_get_widget(xml, "hbox10");
+    gladewidget = glade_xml_get_widget(xml, "hbox13");
     graphComboBox = (GtkComboBox *) gtk_combo_box_new_text();
     gtk_box_pack_end((GtkBox*)gladewidget, (GtkWidget*)graphComboBox, 1, 1, 10);
     gtk_widget_show((GtkWidget*)graphComboBox);

diff --git a/cmd/smyrna/selection.c b/cmd/smyrna/selection.c
index 667ec46006aa519b0e0e9018e2d046479e0d0aad..f0bf50ba9f529445c5ed1a0e44f979059c74787a 100755 (executable)
--- a/cmd/smyrna/selection.c
+++ b/cmd/smyrna/selection.c
@@ -580,7 +580,6 @@ int is_point_in_rectangle(float X, float Y, float RX, float RY, float RW,
 static void select_topview_node(topview_node * n)
 {
     static float x1,y1,x2,y2,x,y;
-    static int sel_type=0;  /*0:select all , 1:only nodes 2:only edges*/
     x=n->distorted_x;
     y=n->distorted_y;
     if(view->mouse.GLfinalPos.x > view->mouse.GLinitPos.x)
@@ -614,7 +613,6 @@ static void select_topview_node(topview_node * n)
 static void select_topview_edge(topview_edge* e)
 {
     static float x1,y1,x2,y2,n1x,n1y,n2x,n2y;
-    static int sel_type=0;  /*0:select all , 1:only nodes 2:only edges*/
     n1x=e->Node1->distorted_x;
     n1y=e->Node1->distorted_y;
     n2x=e->Node2->distorted_x;

diff --git a/cmd/smyrna/smyrna.vcproj b/cmd/smyrna/smyrna.vcproj
index bc7604d2960023691e64a001001d87466e106372..c5b18683a941f7560993942547bc26a7c8c9b94a 100644 (file)
--- a/cmd/smyrna/smyrna.vcproj
+++ b/cmd/smyrna/smyrna.vcproj
@@ -360,6 +360,14 @@
                        <File
                                RelativePath=".\gui\glcompui.c"
                                >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               WarningLevel="4"
+                                       />
+                               </FileConfiguration>
                        </File>
                        <File
                                RelativePath=".\glexpose.c"

diff --git a/cmd/smyrna/topview.c b/cmd/smyrna/topview.c
index 8710b8043fa964c055255e9dbef826481cbd9c52..626735ae4ada290c4aeb463fda1242a224dda6d6 100755 (executable)
--- a/cmd/smyrna/topview.c
+++ b/cmd/smyrna/topview.c
@@ -42,7 +42,6 @@
 #include "hotkeymap.h"
 static float dx = 0.0;
 static float dy = 0.0;
-static float dz = 0.0;
 
    /* Forward declarations */
 static void set_boundaries(topview * t);
@@ -50,7 +49,6 @@ static void set_topview_options(void);
 static int draw_topview_label(topview_node * v, float zdepth);
 static int draw_topview_edge_label(topview_edge * e, float zdepth);
 static int node_visible(topview_node * n);
-static int select_topview_node(topview_node * n);
 static int get_color_from_edge(topview_edge * e);
 static void draw_tv_xdot(topview* t);
 static void draw_xdot(xdot* x,float base_z);