gtkmm-2 upgrade. Still some small bugs to iron out, but mostly functional

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

diff --git a/src/frontends/gnome/GnomeBase.C b/src/frontends/gnome/GnomeBase.C
index e7d00f8585e99fe97b8483c60d7052372e094ee0..a220f82594e0a68ffe23e6af766f79992cff5418 100644 (file)
--- a/src/frontends/gnome/GnomeBase.C
+++ b/src/frontends/gnome/GnomeBase.C
@@ -17,24 +17,22 @@
 #include "debug.h"
 #include "support/filetools.h"
 #include <glib.h>
-
-#include <gnome--/dialog.h>
+#include <gtkmm/dialog.h>
 
 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_));
+       loadXML();
 }
 
+GnomeBase::~GnomeBase()
+{}
+
 
-void GnomeBase::loadXML() const
+void GnomeBase::loadXML() 
 {
 #ifdef WITH_WARNINGS
 #warning Change this before declaring it production code! (be 20010325)
@@ -49,7 +47,7 @@ void GnomeBase::loadXML() const
 
        lyxerr[Debug::GUI] << "Glade file to open is " << file << '\n';
 
-       xml_ = glade_xml_new(file.c_str(), widget_name_.c_str());
+       xml_ = Gnome::Glade::Xml::create (file, widget_name_);
 }
 
 
@@ -99,10 +97,10 @@ void GnomeBase::InputChanged()
        bc().valid(validate());
 }
 
-Gnome::Dialog * GnomeBase::dialog()
+Gtk::Dialog * GnomeBase::dialog()
 {
        if (!dialog_)
-               dialog_ = getWidget<Gnome::Dialog>(widget_name_.c_str());
+               dialog_ = getWidget<Gtk::Dialog>(widget_name_);
 
        return dialog_;
 }