From: arif Date: Tue, 10 Nov 2009 18:35:07 +0000 (+0000) Subject: smyrna warning clean up X-Git-Tag: LAST_LIBGRAPH~32^2~1572 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab53322e2b19f56b93dd82435d13b368328feac5;p=graphviz smyrna warning clean up --- diff --git a/cmd/smyrna/gui/appmouse.c b/cmd/smyrna/gui/appmouse.c index bcd96d84f..c64fbd8b0 100644 --- 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 2cdeabcdb..e5b84da0f 100644 --- 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 891b2e30f..3beff0003 100644 --- 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 77dd7cf77..99766b36a 100755 --- 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 667ec4600..f0bf50ba9 100755 --- 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 bc7604d29..c5b18683a 100644 --- a/cmd/smyrna/smyrna.vcproj +++ b/cmd/smyrna/smyrna.vcproj @@ -360,6 +360,14 @@ + + +