[glom] Fix the build.



commit a86529f5e54c2f6da540acd91cd8ec8f557c5c4c
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Nov 18 11:38:58 2013 +0100

    Fix the build.

 .../mode_design/fields/dialog_defaultformatting.cc |    2 +-
 glom/mode_design/fields/dialog_fieldcalculation.cc |    2 +-
 glom/mode_design/fields/dialog_fielddefinition.cc  |    8 ++++----
 .../layout_item_dialogs/dialog_buttonscript.cc     |    2 +-
 .../layout_item_dialogs/dialog_imageobject.cc      |    2 +-
 .../layout/layout_item_dialogs/dialog_line.cc      |    2 +-
 .../layout_item_dialogs/dialog_textobject.cc       |    2 +-
 .../script_library/dialog_script_library.cc        |    2 +-
 glom/utility_widgets/dialog_properties.cc          |   13 +++++++++----
 glom/utility_widgets/dialog_properties.h           |    6 +++++-
 10 files changed, 25 insertions(+), 16 deletions(-)
---
diff --git a/glom/mode_design/fields/dialog_defaultformatting.cc 
b/glom/mode_design/fields/dialog_defaultformatting.cc
index 7e667a2..d6d363d 100644
--- a/glom/mode_design/fields/dialog_defaultformatting.cc
+++ b/glom/mode_design/fields/dialog_defaultformatting.cc
@@ -51,7 +51,7 @@ Dialog_DefaultFormatting::Dialog_DefaultFormatting(BaseObjectType* cobject, cons
 
   if(m_box_formatting)
   {
-    on_foreach_connect(m_box_formatting);
+    connect_each_widget(m_box_formatting);
 
     //Plus an extra signal for the related extra show-also fields:
     m_box_formatting->signal_modified().connect(
diff --git a/glom/mode_design/fields/dialog_fieldcalculation.cc 
b/glom/mode_design/fields/dialog_fieldcalculation.cc
index d103882..c540e9e 100644
--- a/glom/mode_design/fields/dialog_fieldcalculation.cc
+++ b/glom/mode_design/fields/dialog_fieldcalculation.cc
@@ -45,7 +45,7 @@ Dialog_FieldCalculation::Dialog_FieldCalculation(BaseObjectType* cobject, const
   builder->get_widget("label_triggered_by", m_label_triggered_by);
 
   m_button_test->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_FieldCalculation::on_button_test) );
-  //on_foreach_connect(this);
+  //connect_each_widget(this);
 
   if(m_text_view)
   {
diff --git a/glom/mode_design/fields/dialog_fielddefinition.cc 
b/glom/mode_design/fields/dialog_fielddefinition.cc
index edc5a4c..e17a33b 100644
--- a/glom/mode_design/fields/dialog_fielddefinition.cc
+++ b/glom/mode_design/fields/dialog_fielddefinition.cc
@@ -93,9 +93,9 @@ Dialog_FieldDefinition::Dialog_FieldDefinition(BaseObjectType* cobject, const Gl
   on_combo_type_changed();
 
 
-  on_foreach_connect(this);
-  on_foreach_connect(m_pBox_DefaultValueSimple);
-  on_foreach_connect(m_pBox_ValueTab);
+  connect_each_widget(this);
+  connect_each_widget(m_pBox_DefaultValueSimple);
+  connect_each_widget(m_pBox_ValueTab);
 
   Dialog_Properties::set_modified(false);
 
@@ -150,7 +150,7 @@ void Dialog_FieldDefinition::set_field(const sharedptr<const Field>& field, cons
   if(!m_pDataWidget_DefaultValueSimple->get_data_child_widget())
     std::cerr << G_STRFUNC << ": The DataWidget did not create a child widget." << std::endl;
 
-  on_foreach_connect(m_pDataWidget_DefaultValueSimple);
+  connect_each_widget(m_pDataWidget_DefaultValueSimple);
 
   Gtk::Label* pLabel = m_pDataWidget_DefaultValueSimple->get_label();
   if(!pLabel->get_text().empty())
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.cc 
b/glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.cc
index 3ff5637..f20ba8b 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.cc
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.cc
@@ -47,7 +47,7 @@ Dialog_ButtonScript::Dialog_ButtonScript(BaseObjectType* cobject, const Glib::Re
 
   // Set a monospace font
   m_text_view_script->override_font(Pango::FontDescription("Monospace"));
-  //on_foreach_connect(this);
+  //connect_each_widget(this);
 
   //Dialog_Properties::set_modified(false);
 
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.cc 
b/glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.cc
index 656c593..5fb4a04 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.cc
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.cc
@@ -46,7 +46,7 @@ Dialog_ImageObject::Dialog_ImageObject(BaseObjectType* cobject, const Glib::RefP
   builder->get_widget("button_choose_image", m_button_choose_image);
   m_button_choose_image->signal_clicked().connect(sigc::mem_fun(*this, 
&Dialog_ImageObject::on_button_choose));
 
-  //on_foreach_connect(this);
+  //connect_each_widget(this);
 
   //Dialog_Properties::set_modified(false);
 
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_line.cc 
b/glom/mode_design/layout/layout_item_dialogs/dialog_line.cc
index 7a096b6..a5c1d24 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_line.cc
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_line.cc
@@ -40,7 +40,7 @@ Dialog_Line::Dialog_Line(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builde
   builder->get_widget("spinbutton_line_width",  m_spinbutton_line_width);
   builder->get_widget("colorbutton",  m_colorbutton);
 
-  //on_foreach_connect(this);
+  //connect_each_widget(this);
 
   //Dialog_Properties::set_modified(false);
 
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_textobject.cc 
b/glom/mode_design/layout/layout_item_dialogs/dialog_textobject.cc
index 157b48c..d267c10 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_textobject.cc
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_textobject.cc
@@ -42,7 +42,7 @@ Dialog_TextObject::Dialog_TextObject(BaseObjectType* cobject, const Glib::RefPtr
   builder->get_widget("entry_title",  m_entry_title);
   builder->get_widget("textview_text",  m_text_view);
 
-  //on_foreach_connect(this);
+  //connect_each_widget(this);
 
   //Dialog_Properties::set_modified(false);
 
diff --git a/glom/mode_design/script_library/dialog_script_library.cc 
b/glom/mode_design/script_library/dialog_script_library.cc
index 179985e..93e17af 100644
--- a/glom/mode_design/script_library/dialog_script_library.cc
+++ b/glom/mode_design/script_library/dialog_script_library.cc
@@ -53,7 +53,7 @@ Dialog_ScriptLibrary::Dialog_ScriptLibrary(BaseObjectType* cobject, const Glib::
   m_button_add->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_ScriptLibrary::on_button_add) );
   m_button_remove->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_ScriptLibrary::on_button_remove) );
   m_combobox_name->signal_changed().connect( sigc::mem_fun(*this, 
&Dialog_ScriptLibrary::on_combo_name_changed) );
-  //on_foreach_connect(this);
+  //connect_each_widget(this);
 
   //Dialog_Properties::set_modified(false);
 
diff --git a/glom/utility_widgets/dialog_properties.cc b/glom/utility_widgets/dialog_properties.cc
index c43b0a1..4887cec 100644
--- a/glom/utility_widgets/dialog_properties.cc
+++ b/glom/utility_widgets/dialog_properties.cc
@@ -69,7 +69,7 @@ void Dialog_Properties::add(Gtk::Widget& /*widget */)
 {
   //TODO: Remove this method?
   //Connect the widgets signals:
-  //on_foreach_connect(widget);
+  //connect_each_widget(widget);
 }
 
 void Dialog_Properties::widget_connect_changed_signal(Gtk::Widget* widget)
@@ -136,7 +136,7 @@ void Dialog_Properties::on_anything_changed()
   }
 }
 
-void Dialog_Properties::on_foreach_connect(Gtk::Widget* widget)
+void Dialog_Properties::connect_each_widget(Gtk::Widget* widget)
 {
   if(!widget)
   {
@@ -144,10 +144,15 @@ void Dialog_Properties::on_foreach_connect(Gtk::Widget* widget)
     return;
   }
 
-  widget_connect_changed_signal(widget); //Connect the appropriate signal
+  on_foreach_connect(*widget);
+}
+
+void Dialog_Properties::on_foreach_connect(Gtk::Widget& widget)
+{
+  widget_connect_changed_signal(&widget); //Connect the appropriate signal
 
   //Recurse through children:
-  Gtk::Container* pContainer = dynamic_cast<Gtk::Container*>(widget);
+  Gtk::Container* pContainer = dynamic_cast<Gtk::Container*>(&widget);
   if(pContainer)
   {
     pContainer->foreach( sigc::mem_fun(*this, &Dialog_Properties::on_foreach_connect)); //recursive
diff --git a/glom/utility_widgets/dialog_properties.h b/glom/utility_widgets/dialog_properties.h
index b2112c5..a6ff7d6 100644
--- a/glom/utility_widgets/dialog_properties.h
+++ b/glom/utility_widgets/dialog_properties.h
@@ -56,9 +56,13 @@ protected:
   /// Disable/enable other controls when a control is selected.
   virtual void enforce_constraints();
 
-  void on_foreach_connect(Gtk::Widget* widget);
+  /** Handle the relevant signal for each of the widget's child widgets,
+   * calling set_modified(true) in the signal handler.
+   */
+  void connect_each_widget(Gtk::Widget* widget);
 
 private:
+  void on_foreach_connect(Gtk::Widget& widget);
   void widget_connect_changed_signal(Gtk::Widget* widget);
 
 protected:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]