Continue to improve GtkLengthEntry

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10787 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog
index fc6c3e510ea1bbee446249ff9a0f17308df4b42e..181062a82d1bc588d41c967a4ebf185f5d86b1fc 100644 (file)
--- a/src/frontends/gtk/ChangeLog
+++ b/src/frontends/gtk/ChangeLog
@@ -1,9 +1,13 @@
+2006-01-28  John Spray  <spray@lyx.org>
+
+       * GtkLengthEntry.[Ch]: implement signal_changed, setup spin limits
+
 2006-01-27  Bernhard Reiter  <ockham@gmx.net>
 
        * GBranch.[Ch], glade/branch.glade: Add the Branches dialog
        * Dialogs.C, Makefile.am, glade/Makefile.am: Use GBranch
-       * GCitation.C, glade/citation.glade: Add some shortcuts, 
-         set shortcut targets correctly plus some minor bc().valid() logic
+       * GCitation.C, glade/citation.glade: Add some shortcuts, 
+         set shortcut targets correctly plus some minor bc().valid() logic
 
 2006-01-25  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 

diff --git a/src/frontends/gtk/GtkLengthEntry.C b/src/frontends/gtk/GtkLengthEntry.C
index 93171647238c95c8e46daa74e2ad43d0edf3c7d1..e1a29a930dcfde3e85bc194eb477598aa5abbc87 100644 (file)
--- a/src/frontends/gtk/GtkLengthEntry.C
+++ b/src/frontends/gtk/GtkLengthEntry.C
@@ -29,10 +29,8 @@ namespace frontend {
 GtkLengthEntry::GtkLengthEntry(
        BaseObjectType* cobject,
        const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
-: Gtk::HBox(cobject), spin_(0.1, 2)
+: Gtk::HBox(cobject), adj_(666.0, 0.0, 99999.0, 0.1, 1, 0.0), spin_(adj_, 0.1, 2)
 {
-
-       spin_.set_range(0.0, 99999.0f);
        populateUnitCombo (combo_, true);
        relative_ = true;
 
@@ -40,6 +38,14 @@ GtkLengthEntry::GtkLengthEntry(
        pack_start (spin_, true, true, 0);
        pack_start (combo_, true, true, 0);
        show_all();
+       spin_.signal_changed().connect(sigc::mem_fun(changedsignal_, &sigc::signal<void>::emit));
+       combo_.signal_changed().connect(sigc::mem_fun(changedsignal_, &sigc::signal<void>::emit));
+}
+
+
+sigc::signal< void >& GtkLengthEntry::signal_changed()
+{
+       return changedsignal_;
 }
 
 

diff --git a/src/frontends/gtk/GtkLengthEntry.h b/src/frontends/gtk/GtkLengthEntry.h
index e684085de12191a823db77d542b12859766bd74c..af0991e08124cf37f4e1a5829df5eee13db867c4 100644 (file)
--- a/src/frontends/gtk/GtkLengthEntry.h
+++ b/src/frontends/gtk/GtkLengthEntry.h
@@ -38,10 +38,15 @@ public:
 
        Gtk::SpinButton *get_spin();
        Gtk::ComboBoxText *get_combo();
+       sigc::signal<void> &signal_changed();
 
 protected:
+       // spin_ construction depends on adj_, so it must come first
+       Gtk::Adjustment adj_;
        Gtk::SpinButton spin_;
        Gtk::ComboBoxText combo_;
+       sigc::signal<void> changedsignal_;
+       void emit_changed();
        bool relative_;
 };