glom r2021 - in trunk: . glom glom/bakery

[murrayc svn gnome org]

Author: murrayc
Date: Tue Mar 24 01:35:22 2009
New Revision: 2021
URL: http://svn.gnome.org/viewvc/glom?rev=2021&view=rev

Log:
2009-03-24  Murray Cumming  <murrayc murrayc com>

* glom/application.[h|cc]: Remove add_ui_from_string() because it is 
in App_WithDoc_Gtk too.
* glom/bakery/App_WithDoc_Gtk.h: Make init_menus_file_recentfiles() 
non virtual because nothing overrides it.

Modified:
   trunk/ChangeLog
   trunk/glom/application.cc
   trunk/glom/application.h
   trunk/glom/bakery/App.cc
   trunk/glom/bakery/App.h
   trunk/glom/bakery/App_WithDoc_Gtk.h

Modified: trunk/glom/application.cc
==============================================================================
--- trunk/glom/application.cc	(original)
+++ trunk/glom/application.cc	Tue Mar 24 01:35:22 2009
@@ -250,20 +250,6 @@
 */
 }
 
-//We could put this in Bakery instead, but it's hard enough just getting updates 
-//into Ubuntu, so we override this GlomBakery::App method here.
-void App_Glom::add_ui_from_string(const Glib::ustring& ui_description)
-{
-  try
-  {
-    m_refUIManager->add_ui_from_string(ui_description);
-  }  
-  catch(const Glib::Error& error)
-  {
-    std::cerr << "App_Glom::add_ui_from_string(): exception: " << error.what() << std::endl;
-  }
-}
-
 void App_Glom::init_menus_file()
 {
   //Overridden to remove the Save and Save-As menu items,

Modified: trunk/glom/application.h
==============================================================================
--- trunk/glom/application.h	(original)
+++ trunk/glom/application.h	Tue Mar 24 01:35:22 2009
@@ -91,8 +91,6 @@
   virtual void init_toolbars(); //override
   virtual void init_create_document(); //override
   virtual bool on_document_load(); //override.
-  
-  virtual void add_ui_from_string(const Glib::ustring& ui_description);
 
   bool offer_new_or_existing();
 

Modified: trunk/glom/bakery/App.cc
==============================================================================
--- trunk/glom/bakery/App.cc	(original)
+++ trunk/glom/bakery/App.cc	Tue Mar 24 01:35:22 2009
@@ -112,13 +112,6 @@
   
 }
 
-/*
-void App::on_menu_help_about()
-{
-  
-}
-*/
-
 void App::on_about_close()
 {
   m_bAboutShown = false;

Modified: trunk/glom/bakery/App.h
==============================================================================
--- trunk/glom/bakery/App.h	(original)
+++ trunk/glom/bakery/App.h	Tue Mar 24 01:35:22 2009
@@ -128,7 +128,6 @@
 
   virtual void on_menu_help_about() = 0;
 
-
   virtual void on_about_close();
 
 protected:

Modified: trunk/glom/bakery/App_WithDoc_Gtk.h
==============================================================================
--- trunk/glom/bakery/App_WithDoc_Gtk.h	(original)
+++ trunk/glom/bakery/App_WithDoc_Gtk.h	Tue Mar 24 01:35:22 2009
@@ -84,7 +84,7 @@
 
 protected:
   virtual void init_layout(); //Arranges the menu, toolbar, etc.
-  virtual void init_menus_file_recentfiles(const Glib::ustring& path); // call this in init_menus_file()
+  void init_menus_file_recentfiles(const Glib::ustring& path); // call this in init_menus_file()
   virtual void init_ui_manager(); //Override this to add more UI placeholders
   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.
@@ -92,15 +92,14 @@
   virtual void init_menus_help(); //Call this from init_menus() to add the standard help menu.	
   virtual void init_toolbars();
 
-  virtual void add_ui_from_string(const Glib::ustring& ui_description); //Convenience function
+  void add_ui_from_string(const Glib::ustring& ui_description); //Convenience function
 
   virtual void on_hide(); //override.
 
+  //Overrides from App_WithDoc:
   virtual void document_history_add(const Glib::ustring& file_uri); //overridden.
   virtual void document_history_remove(const Glib::ustring& file_uri); //overridden.
-
   virtual void update_window_title();
-
   virtual void ui_warning(const Glib::ustring& text, const Glib::ustring& secondary_text);
   virtual Glib::ustring ui_file_select_open(const Glib::ustring& starting_folder_uri = Glib::ustring());
   virtual Glib::ustring ui_file_select_save(const Glib::ustring& old_file_uri);
@@ -111,8 +110,9 @@
   //Signal handlers:
 
   //Menus:
-  virtual void on_menu_help_about();
 
+  //Overrides from App:
+  virtual void on_menu_help_about();
   virtual void on_about_close();