From 0794bd0815be1702f5b5e016b3bc142d22d67276 Mon Sep 17 00:00:00 2001
From: Derek Atkins <derek@ihtfp.com>
Date: Fri, 8 Oct 2004 23:21:18 +0000
Subject: [PATCH] Andreas Rottmann's patch to support g-wrap 1.9.

	* engine/gw-engine-spec.scm:
	* gnome-search/dialog-search.h:
	* report/report-gnome/dialog-column-view.h:
	  Andreas Rottmann's patch to support g-wrap 1.9.
	  - don't wrap non-existent objects
	  - protect headers from multiple inclusion
	  - include gtk.h header when we use gtk objects.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@10298 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/engine/gw-engine-spec.scm                | 2 --
 src/gnome-search/dialog-search.h             | 2 ++
 src/report/report-gnome/dialog-column-view.h | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/engine/gw-engine-spec.scm b/src/engine/gw-engine-spec.scm
index da378f3476..5f3a99bfad 100644
--- a/src/engine/gw-engine-spec.scm
+++ b/src/engine/gw-engine-spec.scm
@@ -97,8 +97,6 @@
 (gw:wrap-as-wct ws '<gnc:id-type> "QofIdType" "QofIdTypeConst")
 (gw:wrap-as-wct ws '<gnc:Account*> "Account*" "const Account*")
 (gw:wrap-as-wct ws '<gnc:Account**> "Account**" "const Account**")
-(gw:wrap-as-wct ws '<gnc:InvAcct*> "InvAcct*" "const InvAcct*")
-(gw:wrap-as-wct ws '<gnc:AccInfo*> "AccInfo*" "const AccInfo*")
 (gw:wrap-as-wct ws '<gnc:AccountGroup*> "AccountGroup*" "const AccountGroup*")
 (gw:wrap-as-wct ws '<gnc:Book*> "QofBook*" "const QofBook*")
 (gw:wrap-as-wct ws '<gnc:Lot*> "GNCLot*" "const GNCLot*")
diff --git a/src/gnome-search/dialog-search.h b/src/gnome-search/dialog-search.h
index dd2a63c657..584f45e5bc 100644
--- a/src/gnome-search/dialog-search.h
+++ b/src/gnome-search/dialog-search.h
@@ -24,6 +24,8 @@
 #ifndef _GNC_DIALOG_SEARCH_H
 #define _GNC_DIALOG_SEARCH_H
 
+#include <gtk/gtk.h>
+
 #include "GNCId.h"
 #include "QueryNew.h"
 
diff --git a/src/report/report-gnome/dialog-column-view.h b/src/report/report-gnome/dialog-column-view.h
index c9a859075c..c6e79af006 100644
--- a/src/report/report-gnome/dialog-column-view.h
+++ b/src/report/report-gnome/dialog-column-view.h
@@ -20,8 +20,14 @@
  * Boston, MA  02111-1307,  USA       gnu@gnu.org                   *
  ********************************************************************/
 
+#ifndef GNC_DIALOG_COLUMN_VIEW_H
+#define GNC_DIALOG_COLUMN_VIEW_H
+
 #include <libguile.h>
+#include <gtk/gtk.h>
 
 typedef struct gncp_column_view_edit gnc_column_view_edit;
 
 GtkWidget * gnc_column_view_edit_options(SCM options, SCM view);
+
+#endif