Change glob() API to accept a dir parameter.

[lyx.git] / src / frontends / gtk / GToc.C

diff --git a/src/frontends/gtk/GToc.C b/src/frontends/gtk/GToc.C
index 1d60fe402b25511911a8f7e40b98c9fb1eb0fe57..3b89d83244c0082ab1f3256e5954096e8b471ac6 100644 (file)
--- a/src/frontends/gtk/GToc.C
+++ b/src/frontends/gtk/GToc.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// Too hard to make concept checks work with this file
+#ifdef _GLIBCPP_CONCEPT_CHECKS
+#undef _GLIBCPP_CONCEPT_CHECKS
+#endif
+
 #include "GToc.h"
 #include "ControlToc.h"
 
@@ -85,11 +90,11 @@ void GToc::updateType()
 
        typestore_->clear();
        vector<string> types = controller().getTypes();
-       
+
        // Because tiny empty ComboBoxes just look silly
        int const emptycombosize = 130;
        typecombo_->set_size_request(types.empty() ? emptycombosize : -1, -1);
-       
+
        vector<string>::iterator it = types.begin();
        vector<string>::iterator end = types.end();
        for(;it != end; ++it) {
@@ -137,7 +142,7 @@ void GToc::updateContents()
 
        toc::Toc::const_iterator cit = contents.begin();
        toc::Toc::const_iterator end = contents.end();
-       
+
        for (int rowindex = 0; cit != end; ++cit, ++rowindex) {
                Gtk::ListStore::iterator row = tocstore_->append();
                (*row)[listCol_] = cit->asString();
@@ -162,7 +167,8 @@ void GToc::onTocViewSelected()
 
 void GToc::onTypeComboChanged()
 {
-       updateContents();
+       if(!changing_views_)
+               updateContents();
 }