Merge branch 'master' into gtk3

This commit is contained in:
Hombre
2016-01-11 00:54:25 +01:00
69 changed files with 1940 additions and 1001 deletions

View File

@@ -95,21 +95,12 @@ RTWindow::RTWindow ()
Glib::ustring fName = "rt-logo-small.png";
Glib::ustring fullPath = RTImage::findIconAbsolutePath(fName);
#ifdef GLIBMM_EXCEPTIONS_ENABLED
try {
set_default_icon_from_file (fullPath);
} catch(Glib::Exception& ex) {
printf ("%s\n", ex.what().c_str());
}
#else
{
std::auto_ptr<Glib::Error> error;
set_default_icon_from_file (fullPath, error);
}
#endif //GLIBMM_EXCEPTIONS_ENABLED
#if defined(__APPLE__)
{
osxApp = (GtkosxApplication *)g_object_new (GTKOSX_TYPE_APPLICATION, NULL);