Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/gtk/GBC.C b/src/frontends/gtk/GBC.C
index cb3e882837232b89e9b2c61842cad934e3195d7a..bc6fe2b7458041005c12fdf8983c5846e1029d42 100644 (file)
--- a/src/frontends/gtk/GBC.C
+++ b/src/frontends/gtk/GBC.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 "GBC.h"
 
 using std::string;
@@ -38,7 +43,9 @@ void GBC::setWidgetEnabled(Gtk::Widget * widget, bool enabled) const
 
 void GBC::setButtonLabel(Gtk::Button * btn, string const & label) const
 {
-       btn->set_label(Glib::locale_to_utf8(label));
+       // GTK+ Stock buttons take precedence
+       if (!btn->get_use_stock())
+               btn->set_label(Glib::locale_to_utf8(label));
 }
 
 } // namespace frontend