[glom] Tests: derived instantiation: Test an extra dialog.

[Murray Cumming <murrayc src gnome org>]

commit fab7ff8cf9f3385a392f86dcf3f0e7ce3824a78e
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Sep 10 14:24:02 2010 +0200

    Tests: derived instantiation: Test an extra dialog.
    
    * glom/mode_design/layout/dialog_layout_calendar_related.h: Correct the
      name of the header guard, to avoid a clash.
    * tests/test_glade_derived_instantiation.cc: Enable the test for this
      dialog.

 ChangeLog                                          |    9 +++++++++
 .../layout/dialog_layout_calendar_related.h        |    6 +++---
 tests/test_glade_derived_instantiation.cc          |   14 +++++++-------
 3 files changed, 19 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 793ccfb..e27379e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-10  Murray Cumming  <murrayc murrayc com>
+
+	Tests: derived instantiation: Test an extra dialog.
+
+	* glom/mode_design/layout/dialog_layout_calendar_related.h: Correct the
+  name of the header guard, to avoid a clash.
+	* tests/test_glade_derived_instantiation.cc: Enable the test for this
+  dialog.
+
 2010-09-10  David King  <davidk openismus com>
 
 	Make pc.in file unversioned
diff --git a/glom/mode_design/layout/dialog_layout_calendar_related.h b/glom/mode_design/layout/dialog_layout_calendar_related.h
index 8c5b766..b23d80f 100644
--- a/glom/mode_design/layout/dialog_layout_calendar_related.h
+++ b/glom/mode_design/layout/dialog_layout_calendar_related.h
@@ -18,8 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef GLOM_MODE_DATA_DIALOG_LAYOUT_LIST_RELATED_H
-#define GLOM_MODE_DATA_DIALOG_LAYOUT_LIST_RELATED_H
+#ifndef GLOM_MODE_DATA_DIALOG_LAYOUT_CALENDAR_RELATED_H
+#define GLOM_MODE_DATA_DIALOG_LAYOUT_CALENDAR_RELATED_H
 
 #include <glom/mode_design/layout/dialog_layout_list.h>
 #include <libglom/data_structure/layout/layoutitem_calendarportal.h>
@@ -83,4 +83,4 @@ private:
 
 } //namespace Glom
 
-#endif //GLOM_MODE_DATA_DIALOG_LAYOUT_LIST_RELATED_H
+#endif //GLOM_MODE_DATA_DIALOG_LAYOUT_CALENDAR_RELATED_H
diff --git a/tests/test_glade_derived_instantiation.cc b/tests/test_glade_derived_instantiation.cc
index 5923a9f..d77b688 100644
--- a/tests/test_glade_derived_instantiation.cc
+++ b/tests/test_glade_derived_instantiation.cc
@@ -59,14 +59,14 @@ bool instantiate_widget()
 {
   //Test that the widget can be instantiated with its own glade ID.
   T_Widget* widget = 0;
-  Glom::Utils::get_glade_widget_derived_with_warning(widget);    
+  Glom::Utils::get_glade_widget_derived_with_warning(widget);
   if(!widget)
   {
     std::cerr << "Test: Failed to instantiate widget of type: " << typeid(T_Widget).name() << std::endl;
     exit(EXIT_FAILURE); //Make sure that our test case fails.
     return false;
   }
-    
+
   delete widget;
   return true;
 }
@@ -85,8 +85,8 @@ int main(int argc, char *argv[])
   instantiate_widget<Dialog_Import_CSV>();
   instantiate_widget<Dialog_Import_CSV_Progress>();
   instantiate_widget<DataWidgetChildren::Dialog_ChooseID>();
-  instantiate_widget<DataWidgetChildren::Dialog_ChooseDate>(); 
-  instantiate_widget<Dialog_InvalidData>();   
+  instantiate_widget<DataWidgetChildren::Dialog_ChooseDate>();
+  instantiate_widget<Dialog_InvalidData>();
   instantiate_widget<Dialog_Image_Progress>();
   instantiate_widget<Dialog_ProgressCreating>();
 
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
   instantiate_widget<Dialog_Layout_Calendar_Related>();
   instantiate_widget<Dialog_Layout_Details>();
   instantiate_widget<Dialog_Layout_List>();
-  //TODO: instantiate_widget<Dialog_Layout_List_Related>();
+  instantiate_widget<Dialog_Layout_List_Related>();
   instantiate_widget<Dialog_ButtonScript>();
   instantiate_widget<Dialog_FlowTable>();
   instantiate_widget<Dialog_ChooseRelationship>();
@@ -122,7 +122,7 @@ int main(int argc, char *argv[])
   instantiate_widget<Dialog_NewGroup>();
   instantiate_widget<Dialog_UsersList>();
   instantiate_widget<Dialog_GroupsList>();
-  instantiate_widget<Dialog_ChooseUser>(); 
+  instantiate_widget<Dialog_ChooseUser>();
   instantiate_widget<Dialog_User>();
   instantiate_widget<Dialog_TextFormatting>();
   instantiate_widget<Dialog_Layout_Export>();
@@ -130,6 +130,6 @@ int main(int argc, char *argv[])
   instantiate_widget<Dialog_Database_Preferences>();
   instantiate_widget<Dialog_Fields>();
   instantiate_widget<Dialog_InitialPassword>();
-   
+
   return EXIT_SUCCESS;
 }