forked from osmocom/wireshark
fix some MSVC const warnings
svn path=/trunk/; revision=15263
This commit is contained in:
parent
979636e8f7
commit
f3407856f4
|
@ -69,7 +69,7 @@ display_simple_dialog(gint type, gint btn_mask, char *message)
|
||||||
GdkBitmap *mask;
|
GdkBitmap *mask;
|
||||||
GtkStyle *style;
|
GtkStyle *style;
|
||||||
GdkColormap *cmap;
|
GdkColormap *cmap;
|
||||||
gchar **icon;
|
const gchar **icon;
|
||||||
|
|
||||||
/* Main window */
|
/* Main window */
|
||||||
switch (type) {
|
switch (type) {
|
||||||
|
@ -146,7 +146,7 @@ display_simple_dialog(gint type, gint btn_mask, char *message)
|
||||||
style = gtk_widget_get_style(win);
|
style = gtk_widget_get_style(win);
|
||||||
cmap = gdk_colormap_get_system();
|
cmap = gdk_colormap_get_system();
|
||||||
pixmap = gdk_pixmap_colormap_create_from_xpm_d(NULL, cmap, &mask,
|
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);
|
type_pm = gtk_pixmap_new(pixmap, mask);
|
||||||
gtk_misc_set_alignment (GTK_MISC (type_pm), 0.5, 0.0);
|
gtk_misc_set_alignment (GTK_MISC (type_pm), 0.5, 0.0);
|
||||||
gtk_container_add(GTK_CONTAINER(top_hb), type_pm);
|
gtk_container_add(GTK_CONTAINER(top_hb), type_pm);
|
||||||
|
|
|
@ -1727,7 +1727,7 @@ static void graph_destroy (struct graph *g)
|
||||||
gdk_pixmap_unref (g->pixmap[1]);
|
gdk_pixmap_unref (g->pixmap[1]);
|
||||||
g_free (g->x_axis);
|
g_free (g->x_axis);
|
||||||
g_free (g->y_axis);
|
g_free (g->y_axis);
|
||||||
g_free (g->title);
|
g_free ( (gpointer) (g->title) );
|
||||||
graph_segment_list_free (g);
|
graph_segment_list_free (g);
|
||||||
graph_element_lists_free (g);
|
graph_element_lists_free (g);
|
||||||
#if 0
|
#if 0
|
||||||
|
@ -2210,7 +2210,7 @@ static void axis_destroy (struct axis *axis)
|
||||||
{
|
{
|
||||||
gdk_pixmap_unref (axis->pixmap[0]);
|
gdk_pixmap_unref (axis->pixmap[0]);
|
||||||
gdk_pixmap_unref (axis->pixmap[1]);
|
gdk_pixmap_unref (axis->pixmap[1]);
|
||||||
g_free (axis->label);
|
g_free ( (gpointer) (axis->label) );
|
||||||
}
|
}
|
||||||
|
|
||||||
static void axis_display (struct axis *axis)
|
static void axis_display (struct axis *axis)
|
||||||
|
|
|
@ -424,7 +424,7 @@ static void toolbar_append_separator(GtkWidget *toolbar) {
|
||||||
|
|
||||||
|
|
||||||
#define toolbar_icon(new_icon, window, xpm) { \
|
#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); \
|
new_icon = gtk_pixmap_new(icon, mask); \
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -848,7 +848,7 @@ tree_view_new(GtkTreeModel *model)
|
||||||
|
|
||||||
#if GTK_MAJOR_VERSION < 2
|
#if GTK_MAJOR_VERSION < 2
|
||||||
GtkWidget *
|
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;
|
GtkWidget *tree;
|
||||||
|
|
||||||
|
|
|
@ -246,7 +246,7 @@ extern GtkWidget *ctree_new(gint columns, gint tree_column);
|
||||||
* @return the newly created GtkCTree
|
* @return the newly created GtkCTree
|
||||||
*/
|
*/
|
||||||
extern GtkWidget *ctree_new_with_titles(gint columns, gint tree_column,
|
extern GtkWidget *ctree_new_with_titles(gint columns, gint tree_column,
|
||||||
gchar *titles[]);
|
const gchar *titles[]);
|
||||||
#else
|
#else
|
||||||
/** Create a GtkTreeView, give it the right styles, and remember it.
|
/** Create a GtkTreeView, give it the right styles, and remember it.
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue