[glom] Remove the toolbar widget because we hide it anyway.

[Murray Cumming <murrayc src gnome org>]

commit c995c0700323ec1b0f02b75e72adf8a3e2f22f35
Author: Murray Cumming <murrayc murrayc com>
Date:   Sun Jul 5 12:09:03 2009 +0200

    Remove the toolbar widget because we hide it anyway.

 ChangeLog                      |    6 ++++++
 glom/application.cc            |   13 -------------
 glom/bakery/app_withdoc_gtk.cc |   12 ------------
 glom/bakery/app_withdoc_gtk.h  |    6 ------
 4 files changed, 6 insertions(+), 31 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2c5a691..9b009a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-05  Murray Cumming  <murrayc murrayc com>
+
+	* glom/application.cc:
+	* glom/bakery/app_withdoc_gtk.[h|cc]: Remove the toolbar widget because 
+	we hide it anyway.
+
 2009-07-05  Murray Cumming  <murrayc murrayc-x61>
 
 	* glom/application.cc: update_network_shared_ui(): Un-ifndef this for 
diff --git a/glom/application.cc b/glom/application.cc
index 4fb96f5..380b64b 100644
--- a/glom/application.cc
+++ b/glom/application.cc
@@ -137,9 +137,6 @@ App_Glom::App_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& bu
   builder->get_widget_derived("vbox_frame", m_pFrame); //This one is derived. There's a lot happening here.
 
   add_mime_type("application/x-glom"); //TODO: make this actually work - we need to register it properly.
-
-  //Hide the toolbar because it doesn't contain anything useful for this app.
-  m_HandleBox_Toolbar.hide(); //TODO: Remove this from our fork of Bakery.
   
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   //Install UI hooks for this:
@@ -215,9 +212,6 @@ bool App_Glom::init(const Glib::ustring& document_uri)
 
   //m_pFrame->set_shadow_type(Gtk::SHADOW_IN);
 
-  //Hide the toolbar because it doesn't contain anything useful for this app.
-  //m_HandleBox_Toolbar.hide();
-
   if(document_uri.empty())
   {
     Document* pDocument = static_cast<Document*>(get_document());
@@ -261,15 +255,8 @@ void App_Glom::init_layout()
   m_pBoxTop->pack_start(*pMenuBar, Gtk::PACK_SHRINK);
 #endif
 
-  //Do not create the toolbar because it doesn't contain anything useful for this app.
-  //Gtk::Toolbar* pToolBar = static_cast<Gtk::Toolbar*>(m_refUIManager->get_widget("/Bakery_ToolBar"));
-  //m_HandleBox_Toolbar.add(*pToolBar);
-  //m_HandleBox_Toolbar.show();
-
   add_accel_group(m_refUIManager->get_accel_group());
 
-  //m_pBoxTop->pack_start(m_HandleBox_Toolbar, Gtk::PACK_SHRINK);
-
   //Add placeholder, to be used by add():
   //m_pBoxTop->pack_start(m_VBox_PlaceHolder);
   //m_VBox_PlaceHolder.show();
diff --git a/glom/bakery/app_withdoc_gtk.cc b/glom/bakery/app_withdoc_gtk.cc
index b39e8e7..d75dd1c 100644
--- a/glom/bakery/app_withdoc_gtk.cc
+++ b/glom/bakery/app_withdoc_gtk.cc
@@ -125,18 +125,6 @@ void App_WithDoc_Gtk::init_layout()
   m_pVBox->pack_start(*pMenuBar, Gtk::PACK_SHRINK);
 #endif
 
-  Gtk::Toolbar* pToolBar = static_cast<Gtk::Toolbar*>(m_refUIManager->get_widget("/Bakery_ToolBar"));
-  if(pToolBar)
-  {
-#ifdef GLOM_ENABLE_MAEMO
-    add_toolbar(*pToolBar);
-#else
-    m_HandleBox_Toolbar.add(*pToolBar);
-    m_HandleBox_Toolbar.show();
-    m_pVBox->pack_start(m_HandleBox_Toolbar, Gtk::PACK_SHRINK);
-#endif
-  }
-
   add_accel_group(m_refUIManager->get_accel_group());
 
 
diff --git a/glom/bakery/app_withdoc_gtk.h b/glom/bakery/app_withdoc_gtk.h
index 76498b0..34ef551 100644
--- a/glom/bakery/app_withdoc_gtk.h
+++ b/glom/bakery/app_withdoc_gtk.h
@@ -133,12 +133,6 @@ protected:
   Gtk::VBox* m_pVBox;
   Gtk::VBox m_VBox_PlaceHolder;
 
-  //Gtk::MenuBar m_MenuBar;
-  //Gtk::Menu m_Menu_File, m_Menu_Edit, m_Menu_Help;
-
-  Gtk::HandleBox m_HandleBox_Toolbar;
-  //Gtk::Toolbar m_Toolbar;
-
   Gtk::Window* m_pAbout; //About box.
 
   //Menu stuff: