liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

General OS X fixup: removed obsolete disabling of file monitor (current libs work with OS X)

Browse Source
This commit is contained in:
torger
2013-11-11 11:38:12 +01:00
parent 14941d1afa
commit f243968ca2
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtgui/dirbrowser.cc
View File

@@ -222,8 +222,6 @@ void DirBrowser::row_expanded (const Gtk::TreeModel::iterator& iter, const Gtk::
#ifdef WIN32 #ifdef WIN32
Glib::RefPtr<WinDirMonitor> monitor = Glib::RefPtr<WinDirMonitor>(new WinDirMonitor (iter->get_value (dtColumns.dirname), this)); Glib::RefPtr<WinDirMonitor> monitor = Glib::RefPtr<WinDirMonitor>(new WinDirMonitor (iter->get_value (dtColumns.dirname), this));
iter->set_value (dtColumns.monitor, monitor); iter->set_value (dtColumns.monitor, monitor);
#elif defined __APPLE__
printf("TODO fix dir->monitor_directory () for OSX\n");
#else #else
Glib::RefPtr<Gio::FileMonitor> monitor = dir->monitor_directory (); Glib::RefPtr<Gio::FileMonitor> monitor = dir->monitor_directory ();
iter->set_value (dtColumns.monitor, monitor); iter->set_value (dtColumns.monitor, monitor);

4
rtgui/filecatalog.cc
View File

@@ -513,9 +513,7 @@ void FileCatalog::dirSelected (const Glib::ustring& dirname, const Glib::ustring
#ifdef WIN32 #ifdef WIN32
wdMonitor = new WinDirMonitor (selectedDirectory, this); wdMonitor = new WinDirMonitor (selectedDirectory, this);
#elif defined __APPLE__ #else
printf("TODO fix dir->monitor_directory () for OSX\n");
#else
dirMonitor = dir->monitor_directory (); dirMonitor = dir->monitor_directory ();
dirMonitor->signal_changed().connect (sigc::bind(sigc::mem_fun(*this, &FileCatalog::on_dir_changed), false)); dirMonitor->signal_changed().connect (sigc::bind(sigc::mem_fun(*this, &FileCatalog::on_dir_changed), false));
#endif #endif