diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2014-01-02 22:18:21 +0000 |
|---|---|---|
| committer | Johan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl> | 2014-01-02 22:18:21 +0000 |
| commit | 9736fbcc6bb9d293cdf195f88624f7855302687e (patch) | |
| tree | bda9f9e1552a947f23961b64f6ce036e392d6396 /src/widgets/icon.cpp | |
| parent | Fix Gtk+ 3.10 warnings: GtkStockItem is deprecated (diff) | |
| download | inkscape-9736fbcc6bb9d293cdf195f88624f7855302687e.tar.gz inkscape-9736fbcc6bb9d293cdf195f88624f7855302687e.zip | |
fix Windows build (constness)
(bzr r12869)
Diffstat (limited to 'src/widgets/icon.cpp')
| -rw-r--r-- | src/widgets/icon.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp index 6f558c84a..db9f219e9 100644 --- a/src/widgets/icon.cpp +++ b/src/widgets/icon.cpp @@ -1590,7 +1590,7 @@ gboolean IconImpl::prerenderTask(gpointer /*data*/) { void IconImpl::imageMapCB(GtkWidget* widget, gpointer user_data) { - gchar* id = 0; + gchar const* id = NULL; GtkIconSize size = GTK_ICON_SIZE_INVALID; gtk_image_get_icon_name(GTK_IMAGE(widget), &id, &size); GtkIconSize lsize = static_cast<GtkIconSize>(GPOINTER_TO_INT(user_data)); @@ -1617,7 +1617,7 @@ void IconImpl::imageMapCB(GtkWidget* widget, gpointer user_data) void IconImpl::imageMapNamedCB(GtkWidget* widget, gpointer user_data) { GtkImage* img = GTK_IMAGE(widget); - gchar const* iconName = 0; + gchar const* iconName = NULL; GtkIconSize size = GTK_ICON_SIZE_INVALID; gtk_image_get_icon_name(img, &iconName, &size); if ( iconName ) { @@ -1625,7 +1625,7 @@ void IconImpl::imageMapNamedCB(GtkWidget* widget, gpointer user_data) if ( type == GTK_IMAGE_ICON_NAME ) { gint iconSize = 0; - gchar* iconName = 0; + gchar* iconName = NULL; { g_object_get(G_OBJECT(widget), "icon-name", &iconName, |