X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdockdialog.cpp;h=3fff0d9f7694371e48e44b76c4c4c5c53be0e3bd;hb=c17ff8c0593a678801a38e3dc400ace6bc57a4bb;hp=6a6e3ebde00459c5c4a1a6c2c210cf28b743b192;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/dockdialog.cpp b/synfig-studio/trunk/src/gtkmm/dockdialog.cpp
index 6a6e3eb..3fff0d9 100644
--- a/synfig-studio/trunk/src/gtkmm/dockdialog.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dockdialog.cpp
@@ -87,7 +87,7 @@ DockDialog::DockDialog():
 	widget_comp_select=new Widget_CompSelect();
 	
 	// Give ourselves an ID that is most likely unique
-	set_id(synfig::UniqueID().get_uid()^reinterpret_cast<int>(this));
+	set_id(synfig::UniqueID().get_uid()^reinterpret_cast<long>(this));
 	
 	set_role(strprintf("dock_dialog_%d",get_id()));
 	GRAB_HINT_DATA(
@@ -98,7 +98,6 @@ DockDialog::DockDialog():
 		Gdk::WINDOW_TYPE_HINT_UTILITY
 #endif
 	);
-	set_keep_below(true);
 	set_keep_above(false);
 	
 	// Set up the window
@@ -128,7 +127,7 @@ DockDialog::DockDialog():
 */
 
 	add_accel_group(App::ui_manager()->get_accel_group());
-	App::signal_present_all().connect(sigc::mem_fun(*this,&DockDialog::present));
+	App::signal_present_all().connect(sigc::mem_fun0(*this,&DockDialog::present));
 
 }
 
@@ -481,9 +480,9 @@ DockDialog::set_contents(const synfig::String& z)
 	synfig::String str(z);
 	while(!str.empty())
 	{
-		unsigned int separator=str.find_first_of('-');
+		synfig::String::size_type separator=str.find_first_of('-');
 		{
-			unsigned int sep2=str.find_first_of('|');
+			synfig::String::size_type sep2=str.find_first_of('|');
 			if(separator!=synfig::String::npos || sep2!=synfig::String::npos)
 			{
 				if((separator==synfig::String::npos || sep2<separator) && sep2!=synfig::String::npos)