Commit 8035d4cc authored by Jody Goldberg's avatar Jody Goldberg

more wbcg wcg_gtk merging.

svn path=/trunk/; revision=15736
parent 3b70db54
......@@ -79,7 +79,7 @@ typedef struct {
GOComponent parent;
WorkbookView *wv;
WorkbookControlGUI *edited;
WBCGtk *edited;
Sheet *sheet;
int col_start, col_end, row_start, row_end;
int width, height;
......@@ -361,7 +361,7 @@ go_gnm_component_print (GOComponent *component, GnomePrintContext *gpc,
#endif
static void
cb_gognm_save (GtkAction *a, WorkbookControlGUI *wbcg)
cb_gognm_save (GtkAction *a, WBCGtk *wbcg)
{
GOComponent *component = GO_COMPONENT (g_object_get_data (G_OBJECT (wbcg), "component"));
go_component_emit_changed (component);
......@@ -409,7 +409,7 @@ go_gnm_component_edit (GOComponent *component)
uifilename = "Gnumeric-embed.xml";
extra_actions = actions;
nb_extra_actions = G_N_ELEMENTS (actions);
gognm->edited = WORKBOOK_CONTROL_GUI (workbook_control_gui_new (wv, NULL, NULL));
gognm->edited = WBC_GTK (workbook_control_gui_new (wv, NULL, NULL));
g_object_set_data (G_OBJECT (gognm->edited), "component", gognm);
g_signal_connect_swapped (gognm->edited->toplevel, "destroy",
G_CALLBACK (editor_destroyed_cb), gognm);
......
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -10,3 +10,5 @@ GNOME_Gnumeric-common.c
GNOME_Gnumeric-skels.c
GNOME_Gnumeric-stubs.c
stamp_Gnumeric_idl
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
.deps
.libs
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile.in
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -35,34 +35,25 @@
#include <mathfunc.h>
#include <rangefunc.h>
#include <regression.h>
#include <workbook.h>
#include <sheet.h>
#include <cell.h>
#include <collect.h>
#include <number-match.h>
#include <value.h>
#include <expr.h>
#include <expr-impl.h>
#include <func-builtin.h>
#include <gnm-i18n.h>
#include <goffice/app/go-plugin.h>
#include <goffice/utils/go-cspline.h>
#include <gnm-plugin.h>
#include <tools/analysis-tools.h>
#include <stdlib.h>
#include <workbook-control-gui.h>
/* for white spaces removal */
#include <workbook.h>
#include <number-match.h>
#include <gui-util.h>
#include <gtk/gtkactiongroup.h>
#include <gtk/gtktoggleaction.h>
#include <math.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
GNM_PLUGIN_MODULE_HEADER;
enum {
......
......@@ -5,3 +5,5 @@ Makefile
.deps
.libs
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile.in
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile.in
*.lo
*.la
plugin.xml
*.loT
*.sw*
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <glib.h>
#include <workbook-control-gui.h>
#include <wbc-gtk.h>
#include <gui-util.h>
#include <gnm-plugin.h>
#include <goffice/app/go-plugin.h>
#include <gnm-plugin.h>
#include <glib/gi18n-lib.h>
GNM_PLUGIN_MODULE_HEADER;
......@@ -21,7 +17,7 @@ view_data_sources (GnmAction const *action, WorkbookControl *wbc)
if (!g_spawn_async (NULL, argv, NULL, G_SPAWN_SEARCH_PATH,
NULL, NULL, NULL, NULL))
go_gtk_notice_dialog (wbcg_toplevel (WORKBOOK_CONTROL_GUI (wbc)),
go_gtk_notice_dialog (wbcg_toplevel (WBC_GTK (wbc)),
GTK_MESSAGE_INFO,
_("Could not run GNOME database configuration tool"));
}
......
Makefile.in
Makefile
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile.in
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -6,3 +6,5 @@ liblotus.la
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile.in
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile.in
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -6,3 +6,5 @@ Makefile.in
*.la
plugin.xml
xsinit.c
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile.in
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile.in
*.lo
*.la
plugin.xml
*.loT
*.sw*
Makefile.in
Makefile
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@
Makefile.in
Makefile
plugin.xml
*.loT
*.sw*
......@@ -5,22 +5,22 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <stdlib.h>
#include <string.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <command-context.h>
#include <workbook-control-gui.h>
#include <goffice/app/go-plugin.h>
#include <goffice/app/module-plugin-defs.h>
#include "gnm-python.h"
#include "python-loader.h"
#include "py-interpreter-selector.h"
#include "py-command-line.h"
#include "py-console.h"
#include <goffice/app/go-plugin.h>
#include <goffice/app/module-plugin-defs.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n-lib.h>
#include <stdlib.h>
#include <string.h>
typedef enum {
FORMAT_COMMAND,
FORMAT_RESULT,
......
......@@ -7,13 +7,11 @@
#include <gnumeric-config.h>
#include <Python.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
#include <glib.h>
#include "pygobject.h"
#include "application.h"
#include "workbook.h"
#include "workbook-control-gui.h"
#include "cell.h"
#include "mstyle.h"
#include "sheet.h"
......@@ -23,11 +21,14 @@
#include "expr.h"
#include "func.h"
#include "str.h"
#include "wbc-gtk.h"
#include <goffice/app/go-plugin.h>
#include "parse-util.h"
#include "gnm-py-interpreter.h"
#include "py-gnumeric.h"
#include <glib/gi18n-lib.h>
static PyTypeObject py_Boolean_object_type;
typedef struct _py_Boolean_object py_Boolean_object;
static PyObject *py_new_Boolean_object (gboolean value);
......@@ -1732,7 +1733,7 @@ py_Workbook_gui_add (py_Workbook_object *self, PyObject *args)
(void)workbook_sheet_add (self->wb, -1);
wbc = workbook_control_gui_new (NULL, self->wb, NULL);
result = py_new_Gui_object ((WorkbookControlGUI *)wbc);
result = py_new_Gui_object ((WBCGtk *)wbc);
g_object_unref (wbc); /* py_new_Gui_object added a reference */
return result;
}
......@@ -1807,7 +1808,7 @@ static PyTypeObject py_Workbook_object_type = {
struct _py_Gui_object {
PyObject_HEAD
WorkbookControlGUI *wbcg;
WBCGtk *wbcg;
};
static PyObject *
......@@ -1864,7 +1865,7 @@ py_Gui_object_dealloc (py_Gui_object *self)
}
PyObject *
py_new_Gui_object (WorkbookControlGUI *wbcg)
py_new_Gui_object (WBCGtk *wbcg)
{
py_Gui_object *self;
......
......@@ -15,6 +15,6 @@ GnmValue *call_python_function (PyObject *python_fn,
gchar *py_exc_to_string (void);
PyObject *py_new_Sheet_object (Sheet *sheet);
PyObject *py_new_Workbook_object (Workbook *wb);
PyObject *py_new_Gui_object (WorkbookControlGUI *wbcg);
PyObject *py_new_Gui_object (WBCGtk *wbcg);
#endif /* PLUGIN_PY_GNUMERIC_H */
......@@ -14,20 +14,19 @@
#include "py-gnumeric.h"
#include "gnm-python.h"
#include "gnm-plugin.h"
#include "application.h"
#include "workbook.h"
#include "sheet.h"
#include "workbook-view.h"
#include "workbook-control-gui.h"
#include "wbc-gtk.h"
#include "gui-util.h"
#include "value.h"
#include "expr.h"
#include "expr-impl.h"
#include "func.h"
#include <goffice/app/io-context.h>
#include "gnm-plugin.h"
#include <goffice/app/go-plugin.h>
#include <goffice/app/io-context.h>
#include <goffice/app/go-plugin-service.h>
#include <goffice/app/go-plugin-loader.h>
#include <goffice/app/module-plugin-defs.h>
......@@ -715,7 +714,7 @@ gplp_func_exec_action (GOPluginService *service,
return;
}
ret = PyObject_CallFunction (fn, (char *) "N",
py_new_Gui_object (WORKBOOK_CONTROL_GUI (wbc)));
py_new_Gui_object (WBC_GTK (wbc)));
if (ret == NULL) {
*ret_error = error_info_new_str (py_exc_to_string ());
PyErr_Clear ();
......
......@@ -5,3 +5,5 @@ Makefile.in
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
.deps
.libs
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
.deps
.libs
plugin.xml
*.loT
*.sw*
......@@ -5,3 +5,5 @@ Makefile
*.lo
*.la
plugin.xml
*.loT
*.sw*
......@@ -5,14 +5,10 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <glib.h>
#include <workbook-control-gui.h>
#include <wbc-gtk.h>
#include <gui-util.h>
#include <gnm-plugin.h>
#include <goffice/app/go-plugin.h>
#include <gnm-plugin.h>
#include <glib/gi18n-lib.h>
GNM_PLUGIN_MODULE_HEADER;
......@@ -35,7 +31,7 @@ hello_message (GnmAction const *action, WorkbookControl *wbc)
char *msg = g_strdup_printf (
_("This is message from the \"%s\" plugin."),
go_plugin_get_name (uihello_plugin));
go_gtk_notice_dialog (wbcg_toplevel (WORKBOOK_CONTROL_GUI (wbc)), GTK_MESSAGE_INFO, msg);
go_gtk_notice_dialog (wbcg_toplevel (WBC_GTK (wbc)), GTK_MESSAGE_INFO, msg);
g_free (msg);
}
......
......@@ -6,3 +6,5 @@ libxbase.a
.libs
.deps
plugin.xml
*.loT
*.sw*
......@@ -145,12 +145,11 @@ libspreadsheet_la_SOURCES = \
value-sheet.c \
workbook.c \
workbook-cmd-format.c \
workbook-edit.c \
workbook-view.c \
workbook-control.c \
workbook-control-gui.c \
wbc-gtk.c \
wbcg-actions.c \
wbc-gtk-actions.c \
wbc-gtk-edit.c \
xml-io.c \
xml-sax-read.c \
xml-sax-write.c \
......@@ -273,11 +272,10 @@ libspreadsheet_include_HEADERS = \
workbook.h \
workbook-priv.h \
workbook-cmd-format.h \
workbook-edit.h \
workbook-view.h \
workbook-control.h \
workbook-control-priv.h \
workbook-control-gui.h \
workbook-edit.h \
workbook-control-gui-priv.h \
wbc-gtk.h \
xml-io.h \
......
......@@ -250,7 +250,7 @@ cb_about_animate (GnmAboutState *state)
}
void
dialog_about (WorkbookControlGUI *wbcg)
dialog_about (WBCGtk *wbcg)
{
GnmAboutState *state;
GogObject *chart, *tmp;
......
......@@ -169,7 +169,7 @@ advanced_filter_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
*
**/
void
dialog_advanced_filter (WorkbookControlGUI *wbcg)
dialog_advanced_filter (WBCGtk *wbcg)
{
AdvancedFilterState *state;
WorkbookControl *wbc;
......
......@@ -296,7 +296,7 @@ dialog_tool_cmp (GtkTableChild *tchild, GtkWidget *widget)
**/
gboolean
dialog_tool_init (GenericToolState *state,
WorkbookControlGUI *wbcg,
WBCGtk *wbcg,
Sheet *sheet,
char const *help_file,
char const *gui_name,
......@@ -575,7 +575,7 @@ corr_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
*
**/
int
dialog_correlation_tool (WorkbookControlGUI *wbcg, Sheet *sheet)
dialog_correlation_tool (WBCGtk *wbcg, Sheet *sheet)
{
GenericToolState *state;
......@@ -694,7 +694,7 @@ cov_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
*
**/
int
dialog_covariance_tool (WorkbookControlGUI *wbcg, Sheet *sheet)
dialog_covariance_tool (WBCGtk *wbcg, Sheet *sheet)
{
GenericToolState *state;
......@@ -784,7 +784,7 @@ rank_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
*
**/
int
dialog_ranking_tool (WorkbookControlGUI *wbcg, Sheet *sheet)
dialog_ranking_tool (WBCGtk *wbcg, Sheet *sheet)
{
GenericToolState *state;
......@@ -875,7 +875,7 @@ fourier_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
*
**/
int
dialog_fourier_tool (WorkbookControlGUI *wbcg, Sheet *sheet)
dialog_fourier_tool (WBCGtk *wbcg, Sheet *sheet)
{
GenericToolState *state;
......@@ -1086,7 +1086,7 @@ desc_stat_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy,
*
**/
int
dialog_descriptive_stat_tool (WorkbookControlGUI *wbcg, Sheet *sheet)
dialog_descriptive_stat_tool (WBCGtk *wbcg, Sheet *sheet)
{
DescriptiveStatState *state;
......@@ -1450,7 +1450,7 @@ dialog_ttest_realized (G_GNUC_UNUSED GtkWidget *widget,
*
**/
int
dialog_ttest_tool (WorkbookControlGUI *wbcg, Sheet *sheet, ttest_type test)
dialog_ttest_tool (WBCGtk *wbcg, Sheet *sheet, ttest_type test)
{
TTestState *state;
GtkDialog *dialog;
......@@ -1643,7 +1643,7 @@ ftest_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy,
*
**/
int
dialog_ftest_tool (WorkbookControlGUI *wbcg, Sheet *sheet)
dialog_ftest_tool (WBCGtk *wbcg, Sheet *sheet)
{
FTestToolState *state;
......@@ -1836,7 +1836,7 @@ dialog_sampling_realized (G_GNUC_UNUSED GtkWidget *widget,
*
**/
int
dialog_sampling_tool (WorkbookControlGUI *wbcg, Sheet *sheet)
dialog_sampling_tool (WBCGtk *wbcg, Sheet *sheet)
{
SamplingState *state;
......@@ -2047,7 +2047,7 @@ regression_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy,
*
**/
int
dialog_regression_tool (WorkbookControlGUI *wbcg, Sheet *sheet)
dialog_regression_tool (WBCGtk *wbcg, Sheet *sheet)
{
RegressionToolState *state;
......@@ -2175,7 +2175,7 @@ exp_smoothing_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy,
*
**/
int
dialog_exp_smoothing_tool (WorkbookControlGUI *wbcg, Sheet *sheet)
dialog_exp_smoothing_tool (WBCGtk *wbcg, Sheet *sheet)
{
ExpSmoothToolState *state;
......@@ -2307,7 +2307,7 @@ average_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy,
*
**/
int
dialog_average_tool (WorkbookControlGUI *wbcg, Sheet *sheet)
dialog_average_tool (WBCGtk *wbcg, Sheet *sheet)
{
AverageToolState *state;
......@@ -2519,7 +2519,7 @@ histogram_tool_set_calculated (G_GNUC_UNUSED GtkWidget *widget,
*
**/
int
dialog_histogram_tool (WorkbookControlGUI *wbcg, Sheet *sheet)
dialog_histogram_tool (WBCGtk *wbcg, Sheet *sheet)
{
HistogramToolState *state;
......@@ -2701,7 +2701,7 @@ anova_single_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy,
*
**/
int
dialog_anova_single_factor_tool (WorkbookControlGUI *wbcg, Sheet *sheet)
dialog_anova_single_factor_tool (WBCGtk *wbcg, Sheet *sheet)
{
AnovaSingleToolState *state;
......@@ -2927,7 +2927,7 @@ anova_two_factor_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy,
*
**/
int
dialog_anova_two_factor_tool (WorkbookControlGUI *wbcg, Sheet *sheet)
dialog_anova_two_factor_tool (WBCGtk *wbcg, Sheet *sheet)
{
AnovaTwoFactorToolState *state;
......
......@@ -59,7 +59,7 @@ typedef struct {
GladeXML *gui;
GtkWidget *dialog;