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 1e37b7e684a6f307e075169858977e6e13f1a3af..bc6fe2b7458041005c12fdf8983c5846e1029d42 100644 (file)
--- a/src/frontends/gtk/GBC.C
+++ b/src/frontends/gtk/GBC.C
@@ -9,10 +9,18 @@
  */
 
 #include <config.h>
-#include <gtkmm.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;
+
+namespace lyx {
+namespace frontend {
 
 GBC::GBC(ButtonController const & parent,
         string const & cancel, string const & close)
@@ -35,5 +43,10 @@ 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
+} // namespace lyx