diff options
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/simple_dialog.c | 4 | ||||
| -rw-r--r-- | gtk/tcp_graph.c | 4 | ||||
| -rw-r--r-- | gtk/toolbar.c | 2 | ||||
| -rw-r--r-- | gtk/ui_util.c | 2 | ||||
| -rw-r--r-- | gtk/ui_util.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c index 63da30296d..249e19d662 100644 --- a/gtk/simple_dialog.c +++ b/gtk/simple_dialog.c @@ -69,7 +69,7 @@ display_simple_dialog(gint type, gint btn_mask, char *message) GdkBitmap *mask; GtkStyle *style; GdkColormap *cmap; - gchar **icon; + const gchar **icon; /* Main window */ switch (type) { @@ -146,7 +146,7 @@ display_simple_dialog(gint type, gint btn_mask, char *message) style = gtk_widget_get_style(win); cmap = gdk_colormap_get_system(); pixmap = gdk_pixmap_colormap_create_from_xpm_d(NULL, cmap, &mask, - &style->bg[GTK_STATE_NORMAL], icon); + &style->bg[GTK_STATE_NORMAL], (gchar **) icon); type_pm = gtk_pixmap_new(pixmap, mask); gtk_misc_set_alignment (GTK_MISC (type_pm), 0.5, 0.0); gtk_container_add(GTK_CONTAINER(top_hb), type_pm); diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c index 5cb0ac1e6a..480af52c1d 100644 --- a/gtk/tcp_graph.c +++ b/gtk/tcp_graph.c @@ -1727,7 +1727,7 @@ static void graph_destroy (struct graph *g) gdk_pixmap_unref (g->pixmap[1]); g_free (g->x_axis); g_free (g->y_axis); - g_free (g->title); + g_free ( (gpointer) (g->title) ); graph_segment_list_free (g); graph_element_lists_free (g); #if 0 @@ -2210,7 +2210,7 @@ static void axis_destroy (struct axis *axis) { gdk_pixmap_unref (axis->pixmap[0]); gdk_pixmap_unref (axis->pixmap[1]); - g_free (axis->label); + g_free ( (gpointer) (axis->label) ); } static void axis_display (struct axis *axis) diff --git a/gtk/toolbar.c b/gtk/toolbar.c index 77a8139c67..a24d0d44f1 100644 --- a/gtk/toolbar.c +++ b/gtk/toolbar.c @@ -424,7 +424,7 @@ static void toolbar_append_separator(GtkWidget *toolbar) { #define toolbar_icon(new_icon, window, xpm) { \ - icon = gdk_pixmap_create_from_xpm_d(window->window, &mask, &window->style->white, xpm); \ + icon = gdk_pixmap_create_from_xpm_d(window->window, &mask, &window->style->white, (gchar **) xpm); \ new_icon = gtk_pixmap_new(icon, mask); \ } diff --git a/gtk/ui_util.c b/gtk/ui_util.c index 9177cf9eb5..6311c4ab61 100644 --- a/gtk/ui_util.c +++ b/gtk/ui_util.c @@ -848,7 +848,7 @@ tree_view_new(GtkTreeModel *model) #if GTK_MAJOR_VERSION < 2 GtkWidget * -ctree_new_with_titles(gint columns, gint tree_column, gchar *titles[]) +ctree_new_with_titles(gint columns, gint tree_column, const gchar *titles[]) { GtkWidget *tree; diff --git a/gtk/ui_util.h b/gtk/ui_util.h index b037f0a430..99f89541ff 100644 --- a/gtk/ui_util.h +++ b/gtk/ui_util.h @@ -246,7 +246,7 @@ extern GtkWidget *ctree_new(gint columns, gint tree_column); * @return the newly created GtkCTree */ extern GtkWidget *ctree_new_with_titles(gint columns, gint tree_column, - gchar *titles[]); + const gchar *titles[]); #else /** Create a GtkTreeView, give it the right styles, and remember it. * |