Clean-up of the button controller.

[lyx.git] / src / frontends / gnome / GnomeBase.C

diff --git a/src/frontends/gnome/GnomeBase.C b/src/frontends/gnome/GnomeBase.C
index 8b68b16bb706c1f36eccf17f46054a80c3cc9db4..cb56013590aed57c5c43cc5df64a1dad1986f9f4 100644 (file)
--- a/src/frontends/gnome/GnomeBase.C
+++ b/src/frontends/gnome/GnomeBase.C
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 /* This file is part of
  * =================================================
  * 
@@ -21,7 +20,7 @@
 
 #include <gnome--/dialog.h>
 
-GnomeBase::GnomeBase(ControlButton & c, 
+GnomeBase::GnomeBase(ControlButtons & c, 
                string const & glade_file, string const & name)
        : ViewBC<gnomeBC>(c)
        , file_(glade_file), widget_name_(name), xml_(0)
@@ -37,13 +36,15 @@ GnomeBase::~GnomeBase()
        
 void GnomeBase::loadXML() const
 {
+#ifdef WITH_WARNINGS
 #warning Change this before declaring it production code! (be 20010325)
+#endif
        string const path("src/frontends/gnome/dialogs/;frontends/gnome/dialogs/;/home/baruch/prog/lyx/graphics/src/frontends/gnome/dialogs/");
        string const file = FileOpenSearch(path, file_, "glade");
 
        if (file.empty()) {
                lyxerr << "Cannot find glade file. Aborting." << std::endl;
-               Assert(true);
+               lyx::Assert(true);
        }
        
        lyxerr[Debug::GUI] << "Glade file to open is " << file << '\n';