Cleaning up my mess... backward compatibility and fix Windows build (hopefully)

Fixed bugs:
  - https://launchpad.net/bugs/927992

(bzr r10947)

2 files changed, 9 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
     }
 }
 
diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp
index 56929912d..01a5c0e75 100644
--- a/src/ui/dialog/filedialogimpl-win32.cpp
+++ b/src/ui/dialog/filedialogimpl-win32.cpp
@@ -47,6 +47,7 @@
 #include <zlib.h>
 #include <cairomm/win32_surface.h>
 #include <cairomm/context.h>
+#include <gdkmm/general.h>
 
 using namespace std;
 using namespace Glib;