[gtkmm-documentation] Main Menu example: Add back the toolbar.

[Murray Cumming <murrayc src gnome org>]

commit ee3acee540c0fddfb31f192b0b30b764f7fbbd73
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Sep 26 13:29:19 2013 +0200

    Main Menu example: Add back the toolbar.
    
    Note that we have to use the C API
    ( gtk_actionable_set_detailed_action_name() )
    because we cannot add the new Gtk::Actionable base class to
    the various classes, such as Gtk::ToolButton, without breaking
    the gtkmm ABI.

 examples/book/menus/main_menu/examplewindow.cc |   30 +++++++++++++----------
 examples/book/toolpalette/examplewindow.cc     |    1 -
 2 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/examples/book/menus/main_menu/examplewindow.cc b/examples/book/menus/main_menu/examplewindow.cc
index f90f56d..72813cb 100644
--- a/examples/book/menus/main_menu/examplewindow.cc
+++ b/examples/book/menus/main_menu/examplewindow.cc
@@ -176,13 +176,6 @@ ExampleWindow::ExampleWindow()
     "  </menu>"
     "</interface>";
 
-/* TODO:
-        "  <toolbar  name='ToolBar'>"
-        "    <toolitem action='FileNewStandard'/>"
-        "    <toolitem action='FileQuit'/>"
-        "  </toolbar>"
-*/
-
   try
   {
     m_refBuilder->add_from_string(ui_info);
@@ -192,7 +185,7 @@ ExampleWindow::ExampleWindow()
     std::cerr << "building menus failed: " <<  ex.what();
   }
 
-  //Get the menubar and toolbar widgets, and add them to a container widget:
+  //Get the menubar and add it to a container widget:
   Glib::RefPtr<Glib::Object> object =
     m_refBuilder->get_object("menu-example");
   Glib::RefPtr<Gio::Menu> gmenu =
@@ -204,11 +197,22 @@ ExampleWindow::ExampleWindow()
   Gtk::MenuBar* pMenubar = new Gtk::MenuBar(gmenu);
   m_Box.pack_start(*pMenubar, Gtk::PACK_SHRINK);
 
-/* TODO:
-  Gtk::Widget* pToolbar = m_refBuilder->get_widget("/ToolBar") ;
-  if(pToolbar)
-    m_Box.pack_start(*pToolbar, Gtk::PACK_SHRINK);
-*/
+
+  //Create the toolbar and add it to a container widget:
+  Gtk::Toolbar* toolbar = Gtk::manage(new Gtk::Toolbar());
+  Gtk::ToolButton* button = Gtk::manage(new Gtk::ToolButton());
+  button->set_icon_name("document-new");
+  //We can't do this until we can break the ToolButton ABI: button->set_detailed_action_name("example.new");
+  gtk_actionable_set_detailed_action_name (GTK_ACTIONABLE (button->gobj()), "example.newstandard");
+  toolbar->add(*button);
+
+  button = Gtk::manage(new Gtk::ToolButton());
+  button->set_icon_name("application-exit");
+  //We can't do this until we can break the ToolButton ABI: button->set_detailed_action_name("example.quit");
+  gtk_actionable_set_detailed_action_name (GTK_ACTIONABLE (button->gobj()), "example.quit");
+  toolbar->add(*button);
+
+  m_Box.pack_start(*toolbar, Gtk::PACK_SHRINK);
 
   show_all_children();
 }
diff --git a/examples/book/toolpalette/examplewindow.cc b/examples/book/toolpalette/examplewindow.cc
index 040a9fc..f1c75bd 100644
--- a/examples/book/toolpalette/examplewindow.cc
+++ b/examples/book/toolpalette/examplewindow.cc
@@ -55,7 +55,6 @@ void ExampleWindow::load_icon_items()
       if(icons_count >= max_icons)
         break;
     }
-      
   }
 }