[glom] Refactor: Remove init_toolbars()



commit 36936d97e134c7af4db4d6b97b53a59cf1692f46
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Sep 13 21:55:33 2013 +0200

    Refactor: Remove init_toolbars()
    
    We don't have any toolbars.

 glom/appwindow.cc        |   25 +------------------------
 glom/appwindow.h         |    1 -
 glom/bakery/appwindow.cc |    6 ------
 glom/bakery/appwindow.h  |    2 --
 4 files changed, 1 insertions(+), 33 deletions(-)
---
diff --git a/glom/appwindow.cc b/glom/appwindow.cc
index 60c94ec..b4853db 100644
--- a/glom/appwindow.cc
+++ b/glom/appwindow.cc
@@ -179,7 +179,7 @@ void AppWindow::init()
 
 bool AppWindow::init_with_document(const Glib::ustring& document_uri, bool restore)
 {
-  init(); //calls init_menus() and init_toolbars()
+  init(); //calls init_menus()
 
   //m_pFrame->set_shadow_type(Gtk::SHADOW_IN);
 
@@ -242,29 +242,6 @@ void AppWindow::init_layout()
   //m_VBox_PlaceHolder.show();
 }
 
-void AppWindow::init_toolbars()
-{
-  //We override this because
-  //a) We don't want a toolbar, and
-  //b) The default toolbar layout has actions that we don't have.
-
-/*
-  //Build part of the menu structure, to be merged in by using the "PH" placeholders:
-  static const Glib::ustring ui_description =
-    "<ui>"
-    "  <toolbar name='Bakery_ToolBar'>"
-    "    <placeholder name='Bakery_ToolBarItemsPH'>"
-    "      <toolitem action='BakeryAction_File_New' />"
-    "      <toolitem action='BakeryAction_File_Open' />"
-    "      <toolitem action='BakeryAction_File_Save' />"
-    "    </placeholder>"
-    "  </toolbar>"
-    "</ui>";
-
-  add_ui_from_string(ui_description);
-*/
-}
-
 void AppWindow::init_menus_file()
 {
   //Overridden to remove the Save and Save-As menu items,
diff --git a/glom/appwindow.h b/glom/appwindow.h
index f9baeb8..ef08382 100644
--- a/glom/appwindow.h
+++ b/glom/appwindow.h
@@ -180,7 +180,6 @@ protected:
   virtual void init_menus(); //Override this to add more or different menus.
   virtual void init_menus_file(); //Call this from init_menus() to add the standard file menu.
   virtual void init_menus_edit(); //Call this from init_menus() to add the standard edit menu
-  virtual void init_toolbars();
 
   void add_ui_from_string(const Glib::ustring& ui_description); //Convenience function
 
diff --git a/glom/bakery/appwindow.cc b/glom/bakery/appwindow.cc
index 1fd666a..ace148a 100644
--- a/glom/bakery/appwindow.cc
+++ b/glom/bakery/appwindow.cc
@@ -51,7 +51,6 @@ void AppWindow::init()
 
   init_ui_manager();
   init_menus();
-  init_toolbars();
 
   //on_document_load(); //Show the document (even if it is empty).
 }
@@ -72,11 +71,6 @@ void AppWindow::init_menus()
   //Override this to add more menus.
 }
 
-void AppWindow::init_toolbars()
-{
-  
-}
-
 void AppWindow::on_menu_file_new()
 {
   new_instance();
diff --git a/glom/bakery/appwindow.h b/glom/bakery/appwindow.h
index 9f844b8..90a02bf 100644
--- a/glom/bakery/appwindow.h
+++ b/glom/bakery/appwindow.h
@@ -83,8 +83,6 @@ protected:
   /** Call this from init_menus() to add the standard edit menu
    */ 
   virtual void init_menus_edit() = 0;
-
-  virtual void init_toolbars();
   
   virtual void new_instance(const Glib::ustring& uri = Glib::ustring()) = 0; //Must override in order to 
new() the derived document class.
 


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