From ab19dd4c7b6f45b3dbc1bd17c9e1d29f57a37f68 Mon Sep 17 00:00:00 2001
From: Derek Atkins <derek@ihtfp.com>
Date: Tue, 2 Jul 2002 15:40:48 +0000
Subject: [PATCH] 	* add a menubar to the Invoice Window in glade

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@7069 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 ChangeLog                                       |  2 ++
 src/business/business-gnome/dialog-invoice.c    | 15 +--------------
 src/business/business-gnome/glade/invoice.glade | 11 ++++++++++-
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c0a69a16f9..596a8e81f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
 	popup.  Only set the popup for Read-Write invoices.
 	* business/business-gnome/glade/invoice.glade: define the popup
 	menu in glade.
+
+	* add a menubar to the Invoice Window in glade
 	
 2002-07-01  Derek Atkins  <derek@ihtfp.com>
 
diff --git a/src/business/business-gnome/dialog-invoice.c b/src/business/business-gnome/dialog-invoice.c
index 03b614b9e8..7e00557023 100644
--- a/src/business/business-gnome/dialog-invoice.c
+++ b/src/business/business-gnome/dialog-invoice.c
@@ -1100,6 +1100,7 @@ gnc_invoice_new_window (GNCBook *bookp, InvoiceDialogType type,
 
   /* grab the menubar widgets */
   iw->menubar_dock = glade_xml_get_widget (xml, "menu_dock");
+  iw->menubar = glade_xml_get_widget (xml, "menubar1");
 
   /* grab the statusbar */
   iw->statusbar = glade_xml_get_widget (xml, "status_bar");
@@ -1135,20 +1136,6 @@ gnc_invoice_new_window (GNCBook *bookp, InvoiceDialogType type,
   /* Set the entry_ledger's invoice */
   gnc_entry_ledger_set_default_invoice (entry_ledger, invoice);
 
-  /* load the menu bar */
-  /*
-  {
-    GtkWidget *menubar;
-
-    menubar = gnc_invoice_window_create_menubar (iw);
-    gtk_container_set_border_width (GTK_CONTAINER (menubar), 2);
-    gtk_container_add (GTK_CONTAINER (iw->menubar_dock), menubar);
-    gtk_widget_show_all (iw->menubar_dock);
-  }
-  */
-
-  gtk_widget_show_all (glade_xml_get_widget (xml, "dock1"));
-
   /* Setup initial values */
   iw->invoice_guid = *gncInvoiceGetGUID (invoice);
 
diff --git a/src/business/business-gnome/glade/invoice.glade b/src/business/business-gnome/glade/invoice.glade
index 16184114cb..93024a2039 100644
--- a/src/business/business-gnome/glade/invoice.glade
+++ b/src/business/business-gnome/glade/invoice.glade
@@ -457,7 +457,16 @@
       <shadow_type>GTK_SHADOW_OUT</shadow_type>
 
       <widget>
-	<class>Placeholder</class>
+	<class>GtkMenuBar</class>
+	<name>menubar1</name>
+	<shadow_type>GTK_SHADOW_OUT</shadow_type>
+
+	<widget>
+	  <class>GtkMenuItem</class>
+	  <name>placeholder1</name>
+	  <label>PlaceHolder</label>
+	  <right_justify>False</right_justify>
+	</widget>
       </widget>
     </widget>