aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2003-12-17 22:11:43 +0000
committerUlf Lamping <ulf.lamping@web.de>2003-12-17 22:11:43 +0000
commit1f97bdc27aa1caed69e5be96ea00eea6e773f342 (patch)
tree2c77e7216f0b208f14175e62298156ebe6f5d777 /gtk
parentb425517c70d7f1247b352f77a8265b1d53edfff0 (diff)
removed some more MSVC warnings (type casting)
svn path=/trunk/; revision=9326
Diffstat (limited to 'gtk')
-rw-r--r--gtk/main.c7
-rw-r--r--gtk/tcp_graph.c8
2 files changed, 8 insertions, 7 deletions
diff --git a/gtk/main.c b/gtk/main.c
index 6ffe9d27c0..7e22951d25 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
/* main.c
*
- * $Id: main.c,v 1.343 2003/12/16 18:43:34 oabad Exp $
+ * $Id: main.c,v 1.344 2003/12/17 22:11:43 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -952,8 +952,9 @@ packet_list_button_pressed_cb(GtkWidget *w, GdkEvent *event, gpointer data _U_)
if (event->type == GDK_BUTTON_PRESS && event_button->button == 2 &&
event_button->window == GTK_CLIST(w)->clist_window &&
- gtk_clist_get_selection_info(GTK_CLIST(w), event_button->x,
- event_button->y, &row, &column)) {
+ gtk_clist_get_selection_info(GTK_CLIST(w),
+ (gint) event_button->x, (gint) event_button->y,
+ &row, &column)) {
frame_data *fdata = (frame_data *) gtk_clist_get_row_data(GTK_CLIST(w),
row);
set_frame_mark(!fdata->flags.marked, fdata, row);
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index c3b3b06dcc..91046a687d 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -3,7 +3,7 @@
* By Pavel Mores <pvl@uh.cz>
* Win32 port: rwh@unifiedtech.com
*
- * $Id: tcp_graph.c,v 1.38 2003/12/09 23:45:34 obiot Exp $
+ * $Id: tcp_graph.c,v 1.39 2003/12/17 22:11:43 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -2221,7 +2221,7 @@ static void v_axis_pixmap_draw (struct axis *axis)
axis->p.width, axis->p.height);
/* axis */
gdk_draw_line (axis->pixmap[not_disp], g->fg_gc, axis->p.width - 1,
- (axis->p.height-axis->s.height)/2.0, axis->s.width - 1,
+ (gint) ((axis->p.height-axis->s.height)/2.0), axis->s.width - 1,
axis->p.height);
offset = g->wp.y + (-g->geom.y);
@@ -2328,7 +2328,7 @@ static void h_axis_pixmap_draw (struct axis *axis)
axis->p.width, axis->p.height);
/* axis */
gdk_draw_line (axis->pixmap[not_disp], g->fg_gc, 0, 0,
- axis->s.width + (axis->p.width-axis->s.width)/2.0, 0);
+ (gint) (axis->s.width + (axis->p.width-axis->s.width)/2.0), 0);
offset = g->wp.x - g->geom.x;
fl = floor (axis->min / axis->major) * axis->major;
@@ -3003,7 +3003,7 @@ static gint button_press_event (GtkWidget *widget, GdkEventButton *event)
axis_display (g->x_axis);
update_zoom_spins (g);
if (g->cross.draw)
- cross_draw (g, event->x, event->y);
+ cross_draw (g, (int) event->x, (int) event->y);
#ifndef WIN32
} else if (event->button == 1) {
graph_select_segment (g, (int )event->x, (int )event->y);