glom r1476 - in trunk: . glom/mode_data glom/utility_widgets

[jhs svn gnome org]

Author: jhs
Date: Fri Mar 28 16:07:56 2008
New Revision: 1476
URL: http://svn.gnome.org/viewvc/glom?rev=1476&view=rev

Log:
2008-03-28  Johannes Schmid  <jhs idefix>

	* glom/mode_data/flowtablewithfields.cc:
	Fixed expanding of LabelGlom
	* glom/utility_widgets/flowtable.cc:
	Fixed dragging on Gtk::TextView

Modified:
   trunk/ChangeLog
   trunk/glom/mode_data/flowtablewithfields.cc
   trunk/glom/utility_widgets/flowtable.cc

Modified: trunk/glom/mode_data/flowtablewithfields.cc
==============================================================================
--- trunk/glom/mode_data/flowtablewithfields.cc	(original)
+++ trunk/glom/mode_data/flowtablewithfields.cc	Fri Mar 28 16:07:56 2008
@@ -525,16 +525,15 @@
   apply_formatting(*label, layoutitem_text->get_formatting_used());
 
   add_layoutwidgetbase(label, add_before);
-  //add_view(button); //So it can get the document.
 
   const Glib::ustring title = layoutitem_text->get_title();
   if(title.empty())
 	{
 		Gtk::Widget* widget = dynamic_cast<Gtk::Widget*>(*add_before);
 	  if (widget)
-  	  insert_before (*alignment_label, *widget, true /* expand */);
+  	  insert_before (*alignment_label, *widget, false /* expand */);
   	else
-			add(*alignment_label, true /* expand */);
+			add(*alignment_label, false /* expand */);
 	}
   else
   {
@@ -549,9 +548,9 @@
 
 		Gtk::Widget* widget = dynamic_cast<Gtk::Widget*>(*add_before);
 	  if (widget)
-  	  insert_before (*alignment_title, *alignment_label, *widget, true /* expand */);
+  	  insert_before (*alignment_title, *alignment_label, *widget, false /* expand */);
   	else
-			add(*alignment_title, *alignment_label, true /* expand */);
+			add(*alignment_title, *alignment_label, false /* expand */);
   }
 }
 
@@ -1195,8 +1194,7 @@
 {
   // create the text label
   sharedptr<LayoutItem_Text> textobject = sharedptr<LayoutItem_Text>::create();
-  textobject->set_title(_("Title")); //Give the button a default title, so it is big enough, and so people see that they should change it.
-  textobject->set_text(_("Text"));
+  textobject->set_title(_("Texttitle")); //Give the button a default title, so it is big enough, and so people see that they should change it.
   sharedptr<LayoutItem> layout_item = sharedptr<LayoutItem>::cast_dynamic(textobject);
 
   dnd_add_to_layout_group (layout_item, above);

Modified: trunk/glom/utility_widgets/flowtable.cc
==============================================================================
--- trunk/glom/utility_widgets/flowtable.cc	(original)
+++ trunk/glom/utility_widgets/flowtable.cc	Fri Mar 28 16:07:56 2008
@@ -436,9 +436,10 @@
       dynamic_cast<FlowTable*>(&child))
     return;
   
-	// Call this method recursive for all children
+	// Call this method recursive for all (real) children
   Gtk::Container* container = dynamic_cast<Gtk::Container*>(&child);
-  if (container)
+  Gtk::TextView* text_view = dynamic_cast<Gtk::TextView*>(&child);
+  if (container && !text_view)
   {
     typedef Glib::ListHandle<Gtk::Widget*>::const_iterator CI;
     Glib::ListHandle<Gtk::Widget*> children = container->get_children();
@@ -449,7 +450,6 @@
     }
     return;
   }
-  
   if (!(child.get_flags() & Gtk::NO_WINDOW))
   {
     std::list<Gtk::TargetEntry> new_targets;
@@ -461,7 +461,6 @@
     {
       targets->add (new_targets);
       child.drag_dest_set_target_list (targets);
-      //std::cout << "(added)";
     }
     else
       child.drag_dest_set(new_targets, Gtk::DEST_DEFAULT_ALL,