Correcting revision 251. We should include <gtkmm/tooltips.h> into preview.h, not...

[synfig.git] / synfig-studio / trunk / src / gtkmm / dockdialog.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/dockdialog.cpp b/synfig-studio/trunk/src/gtkmm/dockdialog.cpp
index a6cbc19..3fff0d9 100644 (file)
--- 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(
@@ -480,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)