glom r1675 - in trunk: . glom glom/mode_data glom/mode_design/print_layouts

[jhs svn gnome org]

Author: jhs
Date: Thu Aug 28 12:08:46 2008
New Revision: 1675
URL: http://svn.gnome.org/viewvc/glom?rev=1675&view=rev

Log:
2008-08-28  Johannes Schmid <johannes schmid openismus com>

	* glom/application.cc:
	* glom/mode_data/box_data_details.cc:
	* glom/mode_data/notebook_data.cc:
	Correctly unset the menu item when layout toolbar is shown and don\'t hide
	layout toolbar when an item is dragged
	* glom/mode_design/print_layouts/window_print_layout_edit.cc: 
	(on_canvas_drag_drop, on_canvas_drag_motion)
	Fixed build error with gtkmm 2.12 (const_cast, see comment)

Modified:
   trunk/ChangeLog
   trunk/glom/application.cc
   trunk/glom/mode_data/box_data_details.cc
   trunk/glom/mode_data/notebook_data.cc
   trunk/glom/mode_design/print_layouts/window_print_layout_edit.cc

Modified: trunk/glom/application.cc
==============================================================================
--- trunk/glom/application.cc	(original)
+++ trunk/glom/application.cc	Thu Aug 28 12:08:46 2008
@@ -567,6 +567,9 @@
 {
   if(m_pFrame)
     m_pFrame->on_menu_userlevel_Developer(m_action_menu_userlevel_developer, m_action_menu_userlevel_operator);
+  Glib::RefPtr<Gtk::ToggleAction> action = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic(
+    m_refActionGroup_Others->get_action ("GlomAction_Menu_Developer_ShowLayoutToolbar"));
+  action->set_active(false);
 }
 
 void App_Glom::on_menu_userlevel_operator()

Modified: trunk/glom/mode_data/box_data_details.cc
==============================================================================
--- trunk/glom/mode_data/box_data_details.cc	(original)
+++ trunk/glom/mode_data/box_data_details.cc	Thu Aug 28 12:08:46 2008
@@ -213,7 +213,6 @@
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   m_FlowTable.set_design_mode(m_design_mode);
-  m_Dragbar.hide();
 #endif
 }
 

Modified: trunk/glom/mode_data/notebook_data.cc
==============================================================================
--- trunk/glom/mode_data/notebook_data.cc	(original)
+++ trunk/glom/mode_data/notebook_data.cc	Thu Aug 28 12:08:46 2008
@@ -57,6 +57,7 @@
   add_view(&m_Box_Details);
 
   show_all_children();
+  m_Box_Details.show_layout_toolbar(false);
 }
 
 Notebook_Data::~Notebook_Data()

Modified: trunk/glom/mode_design/print_layouts/window_print_layout_edit.cc
==============================================================================
--- trunk/glom/mode_design/print_layouts/window_print_layout_edit.cc	(original)
+++ trunk/glom/mode_design/print_layouts/window_print_layout_edit.cc	Thu Aug 28 12:08:46 2008
@@ -334,7 +334,9 @@
   //Cause our drag_data_received callback to be called:
   //Note that this isn't necessary when using DEST_DEFAULT_DEFAULTS (or DEST_DEFAULT_DROP), 
   //because that would allow us to just return true to make this happen automatically.
-  m_canvas.drag_get_data(drag_context, target, timestamp);
+  // Seems the const version of the method was added in gtkmm 2.14 so we do this const_cast here
+  // to allow compiling with 2.12 (jhs)
+  m_canvas.drag_get_data(drag_context, const_cast<Glib::ustring&>(target), timestamp);
 
   return true; //Allow the drop.
 }
@@ -354,7 +356,9 @@
     //This will cause our drag_data_received callback to be called, with that information.
     //Note: This does not work (and grabs the cursor) if we call dest_set() with the flags for default actions, such as DEST_DEFAULT_DEFAULTS.
     m_drag_preview_requested = true;
-    m_canvas.drag_get_data(drag_context, target, timestamp);
+    // Seems the const version of the method was added in gtkmm 2.14 so we do this const_cast here
+    // to allow compiling with 2.12 (jhs)
+    m_canvas.drag_get_data(drag_context, const_cast<Glib::ustring&>(target), timestamp);
     return true;
   }