[glom/feature_choices_related_layout: 2/2] Merge branch 'master' into feature_choices_related_layout

[Murray Cumming <murrayc src gnome org>]

commit e9d560949f679f0ddf345eca2d2b41784657d3dd
Merge: 83bdae2 ac247bb
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Sep 8 11:56:09 2010 +0200

    Merge branch 'master' into feature_choices_related_layout

 ChangeLog |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
---
diff --cc ChangeLog
index 80525f5,1ffaabf..9646a23
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,26 -1,10 +1,33 @@@
+ 2010-09-07  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Dialog_Properties: Remove the unnecessary virtual keywords.
+ 
+ 	* glom/utility_widgets/dialog_properties.h: Make methods non-virtual
+   because nothing overrides them.
+ 
 +2010-09-08  Murray Cumming  <murrayc murrayc com>
 +
 +	Combo widgets: Support multiple extra fields.
 +
 +	* glom/libglom/utils.cc: get_choice_values(): Actually get extra values other
 +  than than the first one, by actually using the index instead of just 1.
 +	* glom/mode_data/datawidget/combochoiceswithtreemodel.[h|cc]:
 +  Added a virtual create_model(), to create model columns dynamically. So far
 +  they are just text columns.
 +  set_choices_with_second(): Recreate the model here each time.
 +	* glom/mode_data/datawidget/combo.[h|cc]:
 +	* glom/mode_data/datawidget/comboentry.[h|cc]: Override create_model() to
 +  also set up the view columns using the widgets' specific API.
 +	* glom/mode_data/datawidget/combochoices.h: set_choices_related():
 +  Stop this from being virtual because we no longer override it.
 +
 +2010-09-07  Murray Cumming  <murrayc murrayc com>
 +
 +	Dialog_Properties: Remove the unnecessary virtual keywords.
 +
 +	* glom/utility_widgets/dialog_properties.h: Make methods non-virtual
 +  because nothing overrides them.
 +
  2010-09-07  Murray Cumming  <murrayc murrayc com>
  
  	Dialog_FieldsList: Fix a crash.