[glom] Remove GtkHandleBox from the .glade file too.

[Murray Cumming <murrayc src gnome org>]

commit d8606a56d66d5fe9d10dca614fd59329e5cd9372
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Oct 27 10:37:02 2011 +0200

    Remove GtkHandleBox from the .glade file too.
    
    * ui/developer/window_print_layout_edit.glade:
    * glom/mode_design/print_layouts/window_print_layout_edit.[h|cc]:
    Use a GtkBox instead of a GtkHandleBox.

 ChangeLog                                          |    8 ++++++++
 configure.ac                                       |    2 +-
 .../print_layouts/window_print_layout_edit.cc      |    4 ++--
 .../print_layouts/window_print_layout_edit.h       |    2 +-
 ui/developer/window_print_layout_edit.glade        |   12 +++++++-----
 5 files changed, 19 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8ae5982..18fc7b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-10-27  Murray Cumming  <murrayc murrayc com>
+
+	Remove GtkHandleBox from the .glade file too.
+	
+	* ui/developer/window_print_layout_edit.glade:
+	* glom/mode_design/print_layouts/window_print_layout_edit.[h|cc]:
+	Use a GtkBox instead of a GtkHandleBox.
+
 2011-10-26  Murray Cumming  <murrayc murrayc com>
 
 	Add and move #includes for the latest glibmm. 
diff --git a/configure.ac b/configure.ac
index 8b242a1..3af7315 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,7 +139,7 @@ AS_IF([test "x$glom_host_win32" != xyes],
       [REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS libepc-1.0 >= 0.4.0"])
 
 # Libraries used by Glom:
-REQUIRED_GLOM_LIBS="$REQUIRED_LIBGLOM_LIBS gtkmm-3.0 >= 3.0.0 goocanvasmm-2.0 >= 1.90.6 evince-view-3.0"
+REQUIRED_GLOM_LIBS="$REQUIRED_LIBGLOM_LIBS gtkmm-3.0 >= 3.0.0 goocanvasmm-2.0 >= 1.90.8 evince-view-3.0"
 
 # Do not require iso-codes in client-only mode, or on Windows:
 # TODO: Package iso-codes for Windows?
diff --git a/glom/mode_design/print_layouts/window_print_layout_edit.cc b/glom/mode_design/print_layouts/window_print_layout_edit.cc
index 2ea0f84..ffe9cff 100644
--- a/glom/mode_design/print_layouts/window_print_layout_edit.cc
+++ b/glom/mode_design/print_layouts/window_print_layout_edit.cc
@@ -132,7 +132,7 @@ Window_PrintLayout_Edit::Window_PrintLayout_Edit(BaseObjectType* cobject, const
   gimp_ruler_set_unit(m_hruler, GIMP_UNIT_MM);
   gimp_ruler_set_unit(m_vruler, GIMP_UNIT_MM);
 
-  builder->get_widget("handle_box", m_palette_handle_box);
+  builder->get_widget("toolpalette_box", m_palette_box);
 
 
   builder->get_widget("button_close", m_button_close);
@@ -163,7 +163,7 @@ Window_PrintLayout_Edit::Window_PrintLayout_Edit(BaseObjectType* cobject, const
 
   init_menu();
 
-  m_palette_handle_box->add(m_toolbar);
+  m_palette_box->add(m_toolbar); //TODO: Just put the GtkToolPalette in the glade file and use get_widget_derived()?
   m_toolbar.show();
 
   m_scrolled_window.get_hadjustment()->signal_changed().connect(
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 94c6557..09e0eab 100644
--- a/glom/mode_design/print_layouts/window_print_layout_edit.h
+++ b/glom/mode_design/print_layouts/window_print_layout_edit.h
@@ -197,7 +197,7 @@ private:
     m_action_align_left, m_action_align_right;
 
   //Toolbar:
-  Gtk::Bin* m_palette_handle_box; //TODO: The toolbar is already a HandleBox. //TODO: Remove the HandleBox from the .glade file.
+  Gtk::Box* m_palette_box;
   std::vector<Gtk::TargetEntry> m_drag_targets_all;
   PrintLayoutToolbar m_toolbar;
   
diff --git a/ui/developer/window_print_layout_edit.glade b/ui/developer/window_print_layout_edit.glade
index 66d10b2..1efd0d8 100644
--- a/ui/developer/window_print_layout_edit.glade
+++ b/ui/developer/window_print_layout_edit.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window_print_layout_edit">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Print Layout Editor</property>
@@ -262,6 +262,7 @@
                     <child>
                       <object class="GtkButton" id="button_close">
                         <property name="label">gtk-close</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="can_default">True</property>
@@ -290,13 +291,14 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHandleBox" id="handle_box">
+              <object class="GtkBox" id="toolpalette_box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="handle_position">right</property>
-                <property name="snap_edge">right</property>
-                <property name="snap_edge_set">True</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>