A lean, clean and working start to the new, improved gnome frontend.

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

diff --git a/src/frontends/gnome/GnomeBase.C b/src/frontends/gnome/GnomeBase.C
index b524d9833a43483f391a92ea0c1ec3fb8592720d..e7d00f8585e99fe97b8483c60d7052372e094ee0 100644 (file)
--- a/src/frontends/gnome/GnomeBase.C
+++ b/src/frontends/gnome/GnomeBase.C
@@ -1,6 +1,6 @@
 /* This file is part of
  * =================================================
- * 
+ *
  *          LyX, The Document Processor
  *          Copyright 1995 Matthias Ettrich.
  *          Copyright 1995-2000 The LyX Team.
@@ -20,55 +20,49 @@
 
 #include <gnome--/dialog.h>
 
-GnomeBase::GnomeBase(ControlButtons & c, 
+GnomeBase::GnomeBase(ControlButtons & c,
                 string const & name)
        : ViewBC<gnomeBC>(c)
        , file_(name + ".glade"), widget_name_(name), xml_(0)
        , dialog_(0)
 {}
-       
+
 GnomeBase::~GnomeBase()
 {
        if (xml_)
                gtk_object_unref(GTK_OBJECT(xml_));
 }
 
-       
+
 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 path("src/frontends/gnome/dialogs/;frontends/gnome/dialogs/;");
        string const file = FileOpenSearch(path, file_, "glade");
 
        if (file.empty()) {
                lyxerr << "Cannot find glade file. Aborting." << std::endl;
                lyx::Assert(true);
        }
-       
+
        lyxerr[Debug::GUI] << "Glade file to open is " << file << '\n';
-       
+
        xml_ = glade_xml_new(file.c_str(), widget_name_.c_str());
 }
 
 
 void GnomeBase::show()
 {
-       if (!dialog_) {
-               dialog_ = dialog();
-               build();
-       }
-
        update();
-       dialog_->show();
+       dialog()->show();
 }
 
 
 void GnomeBase::hide()
 {
-       if (dialog_)
-               dialog_->hide();
+       dialog()->hide();
 }
 
 bool GnomeBase::validate()
@@ -76,36 +70,39 @@ bool GnomeBase::validate()
        return true;
 }
 
-void GnomeBase::OKClicked() 
-{ 
-       lyxerr[Debug::GUI] << "OKClicked()\n";
-       OKButton(); 
+void GnomeBase::OKClicked()
+{
+       lyxerr[Debug::GUI] << "GnomeBase::OKClicked()\n";
+       OKButton();
 }
 
 void GnomeBase::CancelClicked() 
 { 
+       lyxerr[Debug::GUI] << "GnomeBase::CancelClicked()\n";
        CancelButton(); 
 }
 
 void GnomeBase::ApplyClicked() 
 { 
+       lyxerr[Debug::GUI] << "GnomeBase::ApplyClicked()\n";
        ApplyButton(); 
 }
 
 void GnomeBase::RestoreClicked() 
 { 
+       lyxerr[Debug::GUI] << "GnomeBase::RestoreClicked()\n";
        RestoreButton(); 
 }
 
-void GnomeBase::InputChanged() 
-{ 
-       bc().valid(validate()); 
+void GnomeBase::InputChanged()
+{
+       bc().valid(validate());
 }
 
 Gnome::Dialog * GnomeBase::dialog()
 {
-       if (!dialog_) 
+       if (!dialog_)
                dialog_ = getWidget<Gnome::Dialog>(widget_name_.c_str());
-               
+
        return dialog_;
 }