[Gnucash-changes] Temporary workaround so that a compile in a freshly checked out tree

David Hampton hampton at cvs.gnucash.org
Sun Jun 5 16:54:39 EDT 2005 

Log Message:
-----------
Temporary workaround so that a compile in a freshly checked out
tree will finish and the executable will run.  The code needs
to be restructured so this isn't necessary.

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash/src:
        gnc-ui.h
    gnucash/src/gnome:
        gnc-main-window.h
        gnc-window.h
        gw-gnc-spec.scm
    gnucash/src/gnome-utils:
        gw-gnome-utils-spec.scm
    gnucash/src/report/report-gnome:
        gw-report-gnome-spec.scm
    gnucash/src/report/stylesheets:
        Makefile.am

Revision Data
-------------
Index: gnc-ui.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnc-ui.h,v
retrieving revision 1.30.4.6
retrieving revision 1.30.4.7
diff -Lsrc/gnc-ui.h -Lsrc/gnc-ui.h -u -r1.30.4.6 -r1.30.4.7
--- src/gnc-ui.h
+++ src/gnc-ui.h
@@ -28,6 +28,10 @@
 #include "gnc-pricedb.h"
 
 
+/* Temporary workaround until restructuring is done. */
+typedef struct GncWindow GncWindow;
+typedef struct GncMainWindow GncMainWindow;
+
 /** Help Files ******************************************************/
 #define HF_USAGE             "gnucash-help/usage.html"
 #define HF_CUSTOM            "gnucash-help/custom-gnucash.html"
Index: gnc-window.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-window.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lsrc/gnome/gnc-window.h -Lsrc/gnome/gnc-window.h -u -r1.1.2.2 -r1.1.2.3
--- src/gnome/gnc-window.h
+++ src/gnome/gnc-window.h
@@ -26,6 +26,7 @@
 #define __GNC_WINDOW_H
 
 #include <gtk/gtkwindow.h>
+#include "gnc-ui.h"
 #include "gnc-plugin-page.h"
 
 G_BEGIN_DECLS
@@ -39,7 +40,7 @@
 #define GNC_WINDOW_GET_IFACE(o)  (G_TYPE_INSTANCE_GET_INTERFACE ((o), GNC_TYPE_WINDOW, GncWindowIface))
 
 /* typedefs & structures */
-typedef struct GncWindow GncWindow; /* dummy typedef */
+//typedef struct GncWindow GncWindow; /* dummy typedef */
 
 typedef struct {
 	GTypeInterface parent;
Index: gnc-main-window.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-main-window.h,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -Lsrc/gnome/gnc-main-window.h -Lsrc/gnome/gnc-main-window.h -u -r1.1.2.14 -r1.1.2.15
--- src/gnome/gnc-main-window.h
+++ src/gnome/gnc-main-window.h
@@ -37,6 +37,7 @@
 
 #include <gtk/gtk.h>
 
+#include "gnc-ui.h"
 #include "gnc-plugin-page.h"
 
 G_BEGIN_DECLS
@@ -54,13 +55,13 @@
 /* typedefs & structures */
 typedef struct GncMainWindowPrivate GncMainWindowPrivate;
 
-typedef struct {
+struct GncMainWindow {
 	GtkWindow parent;
 
 	GtkUIManager *ui_merge;
 
 	GncMainWindowPrivate *priv;
-} GncMainWindow;
+};
 
 typedef struct {
 	GtkWindowClass parent;
Index: gw-gnc-spec.scm
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/gw-gnc-spec.scm,v
retrieving revision 1.14.4.12
retrieving revision 1.14.4.13
diff -Lsrc/gnome/gw-gnc-spec.scm -Lsrc/gnome/gw-gnc-spec.scm -u -r1.14.4.12 -r1.14.4.13
--- src/gnome/gw-gnc-spec.scm
+++ src/gnome/gw-gnc-spec.scm
@@ -50,8 +50,6 @@
       "#include <dialog-scheduledxaction.h>\n"
       "#include <dialog-sxsincelast.h>\n" )))
 
-  (gw:wrap-as-wct ws '<gtk:Window*> "GtkWindow*" "const GtkWindow*")
-
   (gw:wrap-function
    ws
    'gnc:ui-hierarchy-druid
@@ -140,10 +138,6 @@
    '()
    "Destroy the UI.")
 
-  (gw:wrap-as-wct ws
-                  '<gnc:Window*>
-                  "GncWindow *" "const GncWindow *")
-
   (gw:wrap-function
    ws
    'gnc:window-set-progressbar-window
@@ -152,10 +146,6 @@
    '((<gnc:Window*> window))
    "Set the progressbar window from the given GncWindow.")
 
-  (gw:wrap-as-wct ws
-                  '<gnc:MainWindow*>
-                  "GncMainWindow *" "const GncMainWindow *")
-
   (gw:wrap-function
    ws
    'gnc:new-account-tree
Index: gw-gnome-utils-spec.scm
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gw-gnome-utils-spec.scm,v
retrieving revision 1.19.4.7
retrieving revision 1.19.4.8
diff -Lsrc/gnome-utils/gw-gnome-utils-spec.scm -Lsrc/gnome-utils/gw-gnome-utils-spec.scm -u -r1.19.4.7 -r1.19.4.8
--- src/gnome-utils/gw-gnome-utils-spec.scm
+++ src/gnome-utils/gw-gnome-utils-spec.scm
@@ -66,10 +66,13 @@
    "Shutdown the GnuCash gnome system.")
 
   (gw:wrap-as-wct ws '<gtk:Widget*> "GtkWidget*" "const GtkWidget*")
+  (gw:wrap-as-wct ws '<gtk:Window*> "GtkWindow*" "const GtkWindow*")
   (gw:wrap-as-wct ws '<gnc:UIWidget> "gncUIWidget" "const gncUIWidget")
   (gw:wrap-as-wct ws '<gnc:mdi-info*> "GNCMDIInfo*" "const GNCMDIInfo*")
   (gw:wrap-as-wct ws '<gnc:OptionWin*> "GNCOptionWin*" "const GNCOptionWin*")
   (gw:wrap-as-wct ws '<gnc:url-type> "URLType" "const URLType")
+  (gw:wrap-as-wct ws '<gnc:Window*> "GncWindow *" "const GncWindow *")
+  (gw:wrap-as-wct ws '<gnc:MainWindow*> "GncMainWindow *" "const GncMainWindow *")
 
   ;;
   ;; URLTypes
Index: gw-report-gnome-spec.scm
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/report/report-gnome/gw-report-gnome-spec.scm,v
retrieving revision 1.5.4.2
retrieving revision 1.5.4.3
diff -Lsrc/report/report-gnome/gw-report-gnome-spec.scm -Lsrc/report/report-gnome/gw-report-gnome-spec.scm -u -r1.5.4.2 -r1.5.4.3
--- src/report/report-gnome/gw-report-gnome-spec.scm
+++ src/report/report-gnome/gw-report-gnome-spec.scm
@@ -9,7 +9,6 @@
 (use-modules (g-wrap gw-wct-spec))
 (use-modules (g-wrap gw-glib-spec))
 
-(use-modules (g-wrapped gw-gnc-spec))
 (use-modules (g-wrapped gw-engine-spec))
 (use-modules (g-wrapped gw-gnome-utils-spec))
 
@@ -19,7 +18,6 @@
   (gw:wrapset-depends-on ws "gw-wct")
   (gw:wrapset-depends-on ws "gw-glib")
 
-  (gw:wrapset-depends-on ws "gw-gnc")
   (gw:wrapset-depends-on ws "gw-engine")
   (gw:wrapset-depends-on ws "gw-gnome-utils")
 
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/report/stylesheets/Makefile.am,v
retrieving revision 1.6.4.4
retrieving revision 1.6.4.5
diff -Lsrc/report/stylesheets/Makefile.am -Lsrc/report/stylesheets/Makefile.am -u -r1.6.4.4 -r1.6.4.5
--- src/report/stylesheets/Makefile.am
+++ src/report/stylesheets/Makefile.am
@@ -18,6 +18,7 @@
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/gnc-module \
+  -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src/gnome \
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/report/report-gnome \

More information about the gnucash-changes mailing list