John Spray <[EMAIL PROTECTED]> writes:
| Index: GDocument.C
| ===================================================================
| RCS file: GDocument.C
| diff -N GDocument.C
| --- /dev/null 1 Jan 1970 00:00:00 -0000
| +++ GDocument.C 10 Mar 2005 21:33:26 -0000
| @@ -0,0 +1,289 @@
| +/**
| + * \file GDocument.C
| +void GDocument::doBuild()
| +{
| + string const gladeName = findGladeFile("document");
| + xml_ = Gnome::Glade::Xml::create(gladeName);
| +
| + // Manage the action area buttons
| + Gtk::Button * button;
| + xml_->get_widget("Cancel", button);
| + setCancel(button);
| + xml_->get_widget("OK", button);
| + setOK(button);
| + xml_->get_widget("Apply", button);
| + setApply(button);
| + xml_->get_widget("Revert", button);
| + setRestore(button);
| +
| + xml_->get_widget("UseClassDefaults", button);
| + button->signal_clicked().connect(
| + sigc::mem_fun(*this, &GDocument::resetToDefaults));
| + xml_->get_widget("SaveAsDocumentDefaults", button);
| + button->signal_clicked().connect(
| + sigc::mem_fun(*this, &GDocument::saveAsDefaults));
| +
| +
| + // *** Start "Document" Page ***
| + Gtk::Box * box = NULL;
| + xml_->get_widget("DocumentClass", box);
| + // Prevent combo making dialog super-wide due to long class names
| + classcombo_.set_size_request(1,-1);
Ooo space after ',' missing.
| Index: ghelpers.h
| ===================================================================
| RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gtk/ghelpers.h,v
| retrieving revision 1.7
| diff -u -p -r1.7 ghelpers.h
| --- ghelpers.h 16 Nov 2004 00:20:59 -0000 1.7
| +++ ghelpers.h 10 Mar 2005 21:33:32 -0000
| @@ -24,20 +24,32 @@ class FuncRequest;
| namespace lyx {
| namespace frontend {
|
| +std::string const getLengthFromWidgets(
| + Gtk::Adjustment const & adj,
| + Gtk::ComboBoxText const & combo);
| +
| +void setWidgetsFromLength(
| + Gtk::Adjustment & adj,
| + Gtk::ComboBoxText & combo,
| + LyXLength const & length);
| +
| +int comboBoxTextSet(Gtk::ComboBoxText & combo, Glib::ustring target);
| +
| +void populateUnitCombo(Gtk::ComboBoxText & combo, bool const userelative);
Drop the bool const and use only bool here. On declarations: not const
on pods, in definitions it is ok.
| +void unitsComboFromLength(
| + Gtk::ComboBox * combo,
| + Gtk::TreeModelColumn<Glib::ustring> const & stringcol,
| + LyXLength const & len,
| + std::string defunit);
defunit cannot be a const ref?
| -std::vector<std::string> const buildLengthNoRelUnitList();
| +std::vector<std::string> const buildLengthUnitList(bool const userelative);
ditto 'bool const' -> 'bool'
--
Lgb
