diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-02-07 11:11:57 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-02-07 11:11:57 +0000 |
| commit | f97d10f1b5fd32fe58e77d496d60fb82fa1adbf1 (patch) | |
| tree | 7b0936d5e888b3b196105a86a8d2611dcac04a59 /src/ui/dialog/document-properties.cpp | |
| parent | (cppcheck and janitorial tasks:) C-style casting to C++-style casting (diff) | |
| download | inkscape-f97d10f1b5fd32fe58e77d496d60fb82fa1adbf1.tar.gz inkscape-f97d10f1b5fd32fe58e77d496d60fb82fa1adbf1.zip | |
Cleaning up my mess... backward compatibility and fix Windows build (hopefully)
Fixed bugs:
- https://launchpad.net/bugs/927992
(bzr r10947)
Diffstat (limited to 'src/ui/dialog/document-properties.cpp')
| -rw-r--r-- | src/ui/dialog/document-properties.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp index 605b9c637..7cd00c319 100644 --- a/src/ui/dialog/document-properties.cpp +++ b/src/ui/dialog/document-properties.cpp @@ -307,13 +307,21 @@ void DocumentProperties::build_snap() #if ENABLE_LCMS /// Populates the available color profiles combo box void DocumentProperties::populate_available_profiles(){ +#if WITH_GTKMM_2_24 _combo_avail.remove_all(); // Clear any existing items in the combo box +#else + _combo_avail.clear_items(); // Clear any existing items in the combo box +#endif // Iterate through the list of profiles and add the name to the combo box. std::vector<std::pair<Glib::ustring, Glib::ustring> > pairs = ColorProfile::getProfileFilesWithNames(); for ( std::vector<std::pair<Glib::ustring, Glib::ustring> >::const_iterator it = pairs.begin(); it != pairs.end(); ++it ) { Glib::ustring name = it->second; +#if WITH_GTKMM_2_24 _combo_avail.append(name); +#else + _combo_avail.append_text(name); +#endif } } |
