diff options
Diffstat (limited to 'src/dialogs/swatches.cpp')
| -rw-r--r-- | src/dialogs/swatches.cpp | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/src/dialogs/swatches.cpp b/src/dialogs/swatches.cpp index 4b2976a62..7ab5c099b 100644 --- a/src/dialogs/swatches.cpp +++ b/src/dialogs/swatches.cpp @@ -100,13 +100,19 @@ typedef enum { TEXT_DATA } colorFlavorType; +//TODO: warning: deprecated conversion from string constant to ‘gchar*’ +// +//Turn out to be warnings that we should probably leave in place. The +// pointers/types used need to be read-only. So until we correct the using +// code, those warnings are actually desired. They say "Hey! Fix this". We +// definitely don't want to hide/ignore them. --JonCruz static const GtkTargetEntry sourceColorEntries[] = { #if ENABLE_MAGIC_COLORS -// {(gchar*) "application/x-inkscape-color-id", GTK_TARGET_SAME_APP, APP_X_INKY_COLOR_ID}, - {(gchar*) "application/x-inkscape-color", 0, APP_X_INKY_COLOR}, +// {"application/x-inkscape-color-id", GTK_TARGET_SAME_APP, APP_X_INKY_COLOR_ID}, + {"application/x-inkscape-color", 0, APP_X_INKY_COLOR}, #endif // ENABLE_MAGIC_COLORS - {(gchar*) "application/x-color", 0, APP_X_COLOR}, - {(gchar*) "text/plain", 0, TEXT_DATA}, + {"application/x-color", 0, APP_X_COLOR}, + {"text/plain", 0, TEXT_DATA}, }; void ColorItem::_dragGetColorData( GtkWidget *widget, @@ -347,12 +353,18 @@ static void dieDieDie( GtkObject *obj, gpointer user_data ) g_message("die die die %p %p", obj, user_data ); } +//TODO: warning: deprecated conversion from string constant to ‘gchar*’ +// +//Turn out to be warnings that we should probably leave in place. The +// pointers/types used need to be read-only. So until we correct the using +// code, those warnings are actually desired. They say "Hey! Fix this". We +// definitely don't want to hide/ignore them. --JonCruz static const GtkTargetEntry destColorTargets[] = { #if ENABLE_MAGIC_COLORS -// {(gchar*) "application/x-inkscape-color-id", GTK_TARGET_SAME_APP, APP_X_INKY_COLOR_ID}, - {(gchar*) "application/x-inkscape-color", 0, APP_X_INKY_COLOR}, +// {"application/x-inkscape-color-id", GTK_TARGET_SAME_APP, APP_X_INKY_COLOR_ID}, + {"application/x-inkscape-color", 0, APP_X_INKY_COLOR}, #endif // ENABLE_MAGIC_COLORS - {(gchar*) "application/x-color", 0, APP_X_COLOR}, + {"application/x-color", 0, APP_X_COLOR}, }; #include "color.h" // for SP_RGBA32_U_COMPOSE |