X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fwidgets.c;h=26a5dac4fd33f79c30545d1d3dae304727c71bdd;hb=5dbf5abcbed01f04422d4dead1c0ae0bb7efde4f;hp=042b8fcee76ddaafa2e409d27dbd042709a4f3ac;hpb=06e8e51fefd41d3343c08fb4b5b3bce805bd69ce;p=pspp

diff --git a/src/ui/gui/widgets.c b/src/ui/gui/widgets.c
index 042b8fcee7..26a5dac4fd 100644
--- a/src/ui/gui/widgets.c
+++ b/src/ui/gui/widgets.c
@@ -1,6 +1,24 @@
+/* 
+PSPP - a program for statistical analysis.
+Copyright (C) 2017 Free Software Foundation, Inc.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #include <config.h>
 
-#include <gtksourceview/gtksourceview.h>
+#include <gtksourceview/gtksource.h>
 
 #include "widgets.h"
 
@@ -8,8 +26,7 @@
 
 #include "psppire-dialog.h"
 #include "psppire-selector.h"
-#include "psppire-vbuttonbox.h"
-#include "psppire-hbuttonbox.h"
+#include "psppire-buttonbox.h"
 #include "psppire-keypad.h"
 #include "psppire-acr.h"
 #include "psppire-dictview.h"
@@ -35,6 +52,7 @@
 #include "psppire-dialog-action-histogram.h"
 #include "psppire-dialog-action-indep-samps.h"
 #include "psppire-dialog-action-k-related.h"
+#include "psppire-dialog-action-k-independent.h"
 #include "psppire-dialog-action-1sks.h"
 #include "psppire-dialog-action-kmeans.h"
 #include "psppire-dialog-action-logistic.h"
@@ -43,7 +61,8 @@
 #include "psppire-dialog-action-oneway.h"
 #include "psppire-means-layer.h"
 #include "psppire-dialog-action-rank.h"
-#include "psppire-dialog-action-recode.h"
+#include "psppire-dialog-action-recode-same.h"
+#include "psppire-dialog-action-recode-different.h"
 #include "psppire-dialog-action-regression.h"
 #include "psppire-dialog-action-reliability.h"
 #include "psppire-dialog-action-roc.h"
@@ -85,6 +104,7 @@ static const get_type_func dialog_action_types[]=
   psppire_dialog_action_histogram_get_type,
   psppire_dialog_action_logistic_get_type,
   psppire_dialog_action_kmeans_get_type,
+  psppire_dialog_action_k_independent_get_type,
   psppire_dialog_action_k_related_get_type,
   psppire_dialog_action_means_get_type,
   psppire_dialog_action_oneway_get_type,
@@ -92,7 +112,8 @@ static const get_type_func dialog_action_types[]=
   psppire_dialog_action_indep_samps_get_type,
   psppire_dialog_action_var_info_get_type,
   psppire_dialog_action_rank_get_type,
-  psppire_dialog_action_recode_get_type,
+  psppire_dialog_action_recode_same_get_type,
+  psppire_dialog_action_recode_different_get_type,
   psppire_dialog_action_reliability_get_type,
   psppire_dialog_action_regression_get_type,
   psppire_dialog_action_roc_get_type,
@@ -170,7 +191,7 @@ preregister_misc (void)
 
   g_value_register_transform_func (G_TYPE_STRING, G_TYPE_DOUBLE, tx_string_to_double);
   g_value_register_transform_func (G_TYPE_STRING, G_TYPE_INT, tx_string_to_int);
-  
+
   g_value_register_transform_func (measure_enum_type, G_TYPE_STRING, enum_to_string);
   g_value_register_transform_func (align_enum_type, G_TYPE_STRING, enum_to_string);
   g_value_register_transform_func (role_enum_type, G_TYPE_STRING, enum_to_string);
@@ -178,7 +199,7 @@ preregister_misc (void)
 
 
 /* Any custom widgets which are to be used in GtkBuilder ui files
-   need to be preregistered, otherwise GtkBuilder refuses to 
+   need to be preregistered, otherwise GtkBuilder refuses to
    acknowledge their existence. */
 void
 preregister_widgets (void)
@@ -186,8 +207,7 @@ preregister_widgets (void)
   psppire_val_chooser_get_type ();
   psppire_dialog_get_type ();
   psppire_selector_get_type ();
-  psppire_vbutton_box_get_type ();
-  psppire_hbutton_box_get_type ();
+  psppire_buttonbox_get_type ();
   psppire_keypad_get_type ();
   psppire_acr_get_type ();
   psppire_dict_view_get_type ();