diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2013-10-15 08:51:43 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2013-10-15 08:51:43 +0000 |
| commit | ae0c0b603200f5eb23299afc00857c70036f7749 (patch) | |
| tree | 144f7def09af2731f73eea14786a82855ae13ae5 /src | |
| parent | Merging lp:~novalis/inkscape/cleanup branch (diff) | |
| download | inkscape-ae0c0b603200f5eb23299afc00857c70036f7749.tar.gz inkscape-ae0c0b603200f5eb23299afc00857c70036f7749.zip | |
color-profile: Use Gdk::RGBA for gtkmm 3.0 builds
(bzr r12689)
Diffstat (limited to 'src')
| -rw-r--r-- | src/color-profile.cpp | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/src/color-profile.cpp b/src/color-profile.cpp index e6a9ac71c..f0a06f73b 100644 --- a/src/color-profile.cpp +++ b/src/color-profile.cpp @@ -4,7 +4,12 @@ #define noDEBUG_LCMS -#include <gdkmm/color.h> +#if WITH_GTKMM_3_0 +# include <gdkmm/rgba.h> +#else +# include <gdkmm/color.h> +#endif + #include <glibmm/checksum.h> #include <glib/gstdio.h> #include <fcntl.h> @@ -973,7 +978,13 @@ void loadProfiles() } // namespace static bool gamutWarn = false; + +#if WITH_GTKMM_3_0 +static Gdk::RGBA lastGamutColor("#808080"); +#else static Gdk::Color lastGamutColor("#808080"); +#endif + static bool lastBPC = false; #if defined(cmsFLAGS_PRESERVEBLACK) static bool lastPreserveBlack = false; @@ -1118,7 +1129,12 @@ cmsHTRANSFORM Inkscape::CMSSystem::getDisplayTransform() bool preserveBlack = prefs->getBool( "/options/softproof/preserveblack"); #endif //defined(cmsFLAGS_PRESERVEBLACK) Glib::ustring colorStr = prefs->getString("/options/softproof/gamutcolor"); + +#if WITH_GTKMM_3_0 + Gdk::RGBA gamutColor( colorStr.empty() ? "#808080" : colorStr ); +#else Gdk::Color gamutColor( colorStr.empty() ? "#808080" : colorStr ); +#endif if ( (warn != gamutWarn) || (lastIntent != intent) @@ -1288,7 +1304,12 @@ cmsHTRANSFORM Inkscape::CMSSystem::getDisplayPer( Glib::ustring const& id ) bool preserveBlack = prefs->getBool( "/options/softproof/preserveblack"); #endif //defined(cmsFLAGS_PRESERVEBLACK) Glib::ustring colorStr = prefs->getString("/options/softproof/gamutcolor"); + +#if WITH_GTKMM_3_0 + Gdk::RGBA gamutColor( colorStr.empty() ? "#808080" : colorStr ); +#else Gdk::Color gamutColor( colorStr.empty() ? "#808080" : colorStr ); +#endif if ( (warn != gamutWarn) || (lastIntent != intent) |