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

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

diff --git a/src/frontends/gnome/GTabularCreate.C b/src/frontends/gnome/GTabularCreate.C
index 035272ed18ee797dd09cfaf3802be862ab784a54..714bc689680d3e092eebe865a011dd9bc6b48621 100644 (file)
--- a/src/frontends/gnome/GTabularCreate.C
+++ b/src/frontends/gnome/GTabularCreate.C
@@ -19,27 +19,27 @@
 #include "gnomeBC.h"
 #include "GTabularCreate.h"
 
-#include <gtk--/spinbutton.h>
-#include <gtk--/button.h>
+#include <gtkmm/spinbutton.h>
+#include <gtkmm/button.h>
 
-FormTabularCreate::FormTabularCreate(ControlTabularCreate & c)
-       : FormCB<ControlTabularCreate>(c, "FormTabularCreate")
+GTabularCreate::GTabularCreate(ControlTabularCreate & c)
+       : FormCB<ControlTabularCreate>(c, "GTabularCreate")
 {}
 
 
-FormTabularCreate::~FormTabularCreate()
+GTabularCreate::~GTabularCreate()
 {}
 
 
-void FormTabularCreate::build()
+void GTabularCreate::build()
 {
        // Connect the buttons.
-       ok_btn()->clicked.connect(SigC::slot(this, 
-                                        &FormTabularCreate::OKClicked));
-       cancel_btn()->clicked.connect(SigC::slot(this, 
-                                        &FormTabularCreate::CancelClicked));
-       apply_btn()->clicked.connect(SigC::slot(this, 
-                                     &FormTabularCreate::ApplyClicked));
+       ok_btn()->signal_clicked().connect(SigC::slot(*this, 
+                                        &GTabularCreate::OKClicked));
+       cancel_btn()->signal_clicked().connect(SigC::slot(*this, 
+                                        &GTabularCreate::CancelClicked));
+       apply_btn()->signal_clicked().connect(SigC::slot(*this, 
+                                     &GTabularCreate::ApplyClicked));
        
        // Manage the buttons state
        bc().setOK(ok_btn());
@@ -51,7 +51,7 @@ void FormTabularCreate::build()
 }
 
 
-void FormTabularCreate::apply()
+void GTabularCreate::apply()
 {
        unsigned int ysize = (unsigned int)(rows()->get_value_as_int());
        unsigned int xsize = (unsigned int)(cols()->get_value_as_int());
@@ -60,34 +60,34 @@ void FormTabularCreate::apply()
 }
 
 
-void FormTabularCreate::update()
+void GTabularCreate::update()
 {}
 
 
-bool FormTabularCreate::validate() const
+bool GTabularCreate::validate() const
 {
        return ( rows()->get_value_as_int() > 0 ) && 
               ( cols()->get_value_as_int() > 0 );
 }
 
 
-Gtk::Button * FormTabularCreate::ok_btn() const 
+Gtk::Button * GTabularCreate::ok_btn() const 
 {
         return getWidget<Gtk::Button>("r_ok_btn");
 }
-Gtk::Button * FormTabularCreate::apply_btn() const 
+Gtk::Button * GTabularCreate::apply_btn() const 
 {
         return getWidget<Gtk::Button>("r_apply_btn");
 }
-Gtk::Button * FormTabularCreate::cancel_btn() const 
+Gtk::Button * GTabularCreate::cancel_btn() const 
 {
         return getWidget<Gtk::Button>("r_cancel_btn");
 }
-Gtk::SpinButton * FormTabularCreate::rows() const 
+Gtk::SpinButton * GTabularCreate::rows() const 
 {
         return getWidget<Gtk::SpinButton>("r_rows");
 }
-Gtk::SpinButton * FormTabularCreate::cols() const 
+Gtk::SpinButton * GTabularCreate::cols() const 
 {
         return getWidget<Gtk::SpinButton>("r_cols");
 }