[glom] Avoid deprecated Gtk::HandleBox with latest gtkmm.

[Murray Cumming <murrayc src gnome org>]

commit 0040b65e1c5f595b7a84e63c49c1606a9a64168a
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Oct 26 23:01:24 2011 +0200

    Avoid deprecated Gtk::HandleBox with latest gtkmm.
    
    * glom/utility_widgets/sidebar.[h|cc]: Removed, because Gtk::HandleBox
    is deprecated.
    * Makefile_glom.am: Remove mention of this file.
    * glom/utility_widgets/layouttoolbar.[h|cc]: Derive directly from
    Gtk::ToolPalette instead.
    * glom/mode_design/print_layouts/print_layout_toolbar.[h|cc]: Adapt.
    
    * glom/mode_design/print_layouts/window_print_layout_edit.h: The glade
    file still has a GtkHandleBox which we should remove, but in the
    meantime just use it via Gtk::Box.

 ChangeLog                                          |   15 ++++
 Makefile_glom.am                                   |    4 +-
 .../print_layouts/print_layout_toolbar.cc          |    6 +-
 .../print_layouts/print_layout_toolbar.h           |    6 +-
 .../print_layouts/window_print_layout_edit.h       |    2 +-
 glom/utility_widgets/layouttoolbar.cc              |    4 +-
 glom/utility_widgets/layouttoolbar.h               |    7 +--
 glom/utility_widgets/sidebar.cc                    |   72 --------------------
 glom/utility_widgets/sidebar.h                     |   57 ---------------
 9 files changed, 26 insertions(+), 147 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 18f5fd3..3cc978c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2011-10-26  Murray Cumming  <murrayc murrayc com>
+
+	Avoid deprecated Gtk::HandleBox with latest gtkmm.
+
+	* glom/utility_widgets/sidebar.[h|cc]: Removed, because Gtk::HandleBox
+	is deprecated.
+	* Makefile_glom.am: Remove mention of this file.
+	* glom/utility_widgets/layouttoolbar.[h|cc]: Derive directly from 
+	Gtk::ToolPalette instead.
+	* glom/mode_design/print_layouts/print_layout_toolbar.[h|cc]: Adapt.
+
+	* glom/mode_design/print_layouts/window_print_layout_edit.h: The glade 
+	file still has a GtkHandleBox which we should remove, but in the
+	meantime just use it via Gtk::Box.
+
 2011-10-25  Murray Cumming  <murrayc murrayc com>
 
 	Change #includes for the latest glibmm.
diff --git a/Makefile_glom.am b/Makefile_glom.am
index c6c203a..cf1ae7b 100644
--- a/Makefile_glom.am
+++ b/Makefile_glom.am
@@ -383,9 +383,7 @@ glom_source_files +=							\
 	glom/utility_widgets/layouttoolbarbutton.cc			\
 	glom/utility_widgets/layouttoolbarbutton.h			\
 	glom/utility_widgets/notebooklabelglom.cc			\
-	glom/utility_widgets/notebooklabelglom.h			\
-	glom/utility_widgets/sidebar.cc					\
-	glom/utility_widgets/sidebar.h
+	glom/utility_widgets/notebooklabelglom.h
 endif
 
 glom_source_files +=							\
diff --git a/glom/mode_design/print_layouts/print_layout_toolbar.cc b/glom/mode_design/print_layouts/print_layout_toolbar.cc
index 4abf616..13ee52a 100644
--- a/glom/mode_design/print_layouts/print_layout_toolbar.cc
+++ b/glom/mode_design/print_layouts/print_layout_toolbar.cc
@@ -58,9 +58,9 @@ PrintLayoutToolbar::PrintLayoutToolbar()
   //Note for translators: These are layout items, like widgets in GTK+.
   m_group_records.add(m_drag_related_records);
 
-  add_group(m_group_items);
-  add_group(m_group_lines);
-  add_group(m_group_records);
+  add(m_group_items);
+  add(m_group_lines);
+  add(m_group_records);
 
   set_drag_source();
 
diff --git a/glom/mode_design/print_layouts/print_layout_toolbar.h b/glom/mode_design/print_layouts/print_layout_toolbar.h
index e2541cb..0dab764 100644
--- a/glom/mode_design/print_layouts/print_layout_toolbar.h
+++ b/glom/mode_design/print_layouts/print_layout_toolbar.h
@@ -24,15 +24,13 @@
 #include <gtkmm/box.h>
 #include <glom/mode_design/print_layouts/print_layout_toolbar_button.h>
 #include <gtkmm/window.h>
-#include <gtkmm/handlebox.h>
+#include <gtkmm/toolpalette.h>
 #include <gtkmm/toolitemgroup.h>
 
-#include <glom/utility_widgets/sidebar.h>
-
 namespace Glom
 {
 
-class PrintLayoutToolbar : public SideBar
+class PrintLayoutToolbar : public Gtk::ToolPalette
 {
 public:
   PrintLayoutToolbar();
diff --git a/glom/mode_design/print_layouts/window_print_layout_edit.h b/glom/mode_design/print_layouts/window_print_layout_edit.h
index 2970ed1..ca3de9d 100644
--- a/glom/mode_design/print_layouts/window_print_layout_edit.h
+++ b/glom/mode_design/print_layouts/window_print_layout_edit.h
@@ -196,7 +196,7 @@ private:
     m_action_align_left, m_action_align_right;
 
   //Toolbar:
-  Gtk::HandleBox* m_palette_handle_box; //TODO: The toolbar is already a HandleBox.
+  Gtk::Bin* m_palette_handle_box; //TODO: The toolbar is already a HandleBox. //TODO: Remove the HandleBox from the .glade file.
   std::vector<Gtk::TargetEntry> m_drag_targets_all;
   PrintLayoutToolbar m_toolbar;
   
diff --git a/glom/utility_widgets/layouttoolbar.cc b/glom/utility_widgets/layouttoolbar.cc
index f9db400..74260b0 100644
--- a/glom/utility_widgets/layouttoolbar.cc
+++ b/glom/utility_widgets/layouttoolbar.cc
@@ -62,8 +62,8 @@ LayoutToolbar::LayoutToolbar()
   m_group_items.add(m_drag_text);
   m_group_items.add(m_drag_image);
   
-  add_group(m_group_containers);
-  add_group(m_group_items);
+  add(m_group_containers);
+  add(m_group_items);
 
   set_drag_source();
   
diff --git a/glom/utility_widgets/layouttoolbar.h b/glom/utility_widgets/layouttoolbar.h
index 5520c48..315107e 100644
--- a/glom/utility_widgets/layouttoolbar.h
+++ b/glom/utility_widgets/layouttoolbar.h
@@ -24,15 +24,12 @@
 #include <gtkmm/box.h>
 #include <glom/utility_widgets/layouttoolbarbutton.h>
 #include <gtkmm/window.h>
-#include <gtkmm/handlebox.h>
-
-
-#include "sidebar.h"
+#include <gtkmm/toolpalette.h>
 
 namespace Glom
 {
 
-class LayoutToolbar : public SideBar
+class LayoutToolbar : public Gtk::ToolPalette
 {
 public:
   LayoutToolbar();