[gnumeric] Make changes necessary for win32 compile of component.



commit 5c1785c0b3385f8c466fdaca0a3ccee8fa732784
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Fri Jun 26 22:27:37 2009 -0600

    Make changes necessary for win32 compile of component.
    
    2009-06-25  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* component/gnumeric.c (go_gnm_component_edit): call
    	  set_uifilename
    	* src/Makefile.am: add new headers
    	* src/wbc-gtk-impl.h (set_uifilename): new
    	* src/wbc-gtk.c (set_uifilename): new

 ChangeLog            |    8 ++++++++
 component/gnumeric.c |    3 +--
 src/Makefile.am      |    8 ++++++++
 src/wbc-gtk-impl.h   |    4 ++++
 src/wbc-gtk.c        |    8 ++++++++
 5 files changed, 29 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5587220..b1553fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-06-25  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* component/gnumeric.c (go_gnm_component_edit): call 
+	  set_uifilename
+	* src/Makefile.am: add new headers
+	* src/wbc-gtk-impl.h (set_uifilename): new
+	* src/wbc-gtk.c (set_uifilename): new
+
 2009-06-24  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* gnumeric.spec.in: updated to something a touch more recent
diff --git a/component/gnumeric.c b/component/gnumeric.c
index b83fb00..390308e 100644
--- a/component/gnumeric.c
+++ b/component/gnumeric.c
@@ -161,7 +161,6 @@ cb_gognm_save (GtkAction *a, WBCGtk *wbcg)
 	go_component_emit_changed (component);
 }
 
-extern char const *uifilename;
 static GtkActionEntry const actions[] = {
 /* File */
 	{ "FileSaveEmbed", GTK_STOCK_SAVE, NULL,
@@ -198,7 +197,7 @@ go_gnm_component_edit (GOComponent *component)
 		wv = wb_view_new_from_input (input, NULL, io_context, NULL);
 		g_object_unref (io_context);
 	}
-	uifilename =  "Gnumeric-embed.xml";
+	set_uifilename ("Gnumeric-embed.xml");
 	gognm->edited = wbc_gtk_new (wv, NULL, NULL, NULL);
 	gtk_action_group_add_actions (gognm->edited->actions,
 		actions, G_N_ELEMENTS (actions), gognm->edited);
diff --git a/src/Makefile.am b/src/Makefile.am
index 05d07c2..32925d8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -224,13 +224,21 @@ libspreadsheet_include_HEADERS = 	\
 	func-builtin.h				\
 	gnm-command-impl.h			\
 	gnm-commands-slicer.h			\
+	gnm-data-cache-source.h			\
 	gnm-datetime.h				\
 	gnm-format.h				\
 	gnm-graph-window.h			\
 	gnm-pane.h				\
+	gnm-sheet-slicer.h			\
 	gnm-style-impl.h			\
 	gnumeric.h				\
 	gnumeric-simple-canvas.h		\
+	go-data-cache-source.h 			\
+	go-data-cache.h 			\
+	go-data-cache-field.h 			\
+	go-data-slicer.h			\
+	go-data-slicer-field.h			\
+	go-val.h				\
 	graph.h					\
 	gutils.h				\
 	gui-clipboard.h				\
diff --git a/src/wbc-gtk-impl.h b/src/wbc-gtk-impl.h
index 321761a..8b07c9b 100644
--- a/src/wbc-gtk-impl.h
+++ b/src/wbc-gtk-impl.h
@@ -167,6 +167,10 @@ void	 wbc_gtk_markup_changer	(WBCGtk *wbcg);
 
 gboolean wbc_gtk_load_templates (WBCGtk *gtk);
 
+#ifndef HILDON
+	G_MODULE_EXPORT void set_uifilename (char const *name);
+#endif
+
 G_END_DECLS
 
 #endif /* _GNM_WBC_GTK_IMPL_H_ */
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index ad04105..d77bbdf 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -98,6 +98,14 @@ static GObjectClass *parent_class = NULL;
 
 /****************************************************************************/
 
+#ifndef HILDON
+G_MODULE_EXPORT void
+set_uifilename (char const *name)
+{
+	uifilename = name;
+}
+#endif
+
 static void
 wbc_gtk_set_action_sensitivity (WBCGtk const *wbcg,
 				char const *action, gboolean sensitive)



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