X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdockdialog.cpp;h=9995445fb0d3079b43b82a8a8121963bc4f0703a;hb=c4e19f09a44e804066b1fa54b0f8ca5319210ff8;hp=5f72be01bf587942f393dafea55720973d1737be;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/dockdialog.cpp b/synfig-studio/trunk/src/gtkmm/dockdialog.cpp
index 5f72be0..9995445 100644
--- a/synfig-studio/trunk/src/gtkmm/dockdialog.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dockdialog.cpp
@@ -5,16 +5,17 @@
 **	$Id: dockdialog.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
@@ -86,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(
@@ -97,7 +98,6 @@ DockDialog::DockDialog():
 		Gdk::WINDOW_TYPE_HINT_UTILITY
 #endif
 	);
-	set_keep_below(true);
 	set_keep_above(false);
 	
 	// Set up the window
@@ -127,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));
 
 }