X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fabout.cpp;h=e00e627ef0d040e158ac5d562ad50a9314502fd7;hb=98b0b5b6cc30e2faef4e14a97c5ec6b17b4386ef;hp=6c487a7a5c00ed483ef2afb7fcc95d5647c094c6;hpb=ea5537774c9f663f0d918d1445e75bedee35574a;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/about.cpp b/synfig-studio/trunk/src/gtkmm/about.cpp index 6c487a7..e00e627 100644 --- a/synfig-studio/trunk/src/gtkmm/about.cpp +++ b/synfig-studio/trunk/src/gtkmm/about.cpp @@ -158,25 +158,25 @@ public: /* === M E T H O D S ======================================================= */ About::About(): - Gtk::Window(Gtk::WINDOW_POPUP), + Gtk::Window(getenv("SYNFIG_DISABLE_POPUP_WINDOWS") ? Gtk::WINDOW_TOPLEVEL : Gtk::WINDOW_POPUP), can_self_destruct(true) { int image_w=300,image_h=350; std::string imagepath; #ifdef WIN32 - imagepath=App::get_base_path()+ETL_DIRECTORY_SEPERATOR+IMAGE_DIR; + imagepath=App::get_base_path()+ETL_DIRECTORY_SEPARATOR+IMAGE_DIR; #else imagepath=IMAGE_DIR; #endif char* synfig_root=getenv("SYNFIG_ROOT"); if(synfig_root) { imagepath=synfig_root; - imagepath+=ETL_DIRECTORY_SEPERATOR; + imagepath+=ETL_DIRECTORY_SEPARATOR; imagepath+="share/pixmaps"; } - imagepath+=ETL_DIRECTORY_SEPERATOR; + imagepath+=ETL_DIRECTORY_SEPARATOR; // Create the Logo @@ -203,7 +203,7 @@ About::About(): Pango::FontDescription fd = Pango::FontDescription("Sans, 11"); l->set_font_description(fd); l->set_justify(Pango::ALIGN_CENTER); - fd.set_size(size*Pango::SCALE); + fd.set_size(int(size*Pango::SCALE)); l->set_font_description(fd); l->get_pixel_size(width,height); while( width >= image_w-6 ){ @@ -248,7 +248,7 @@ About::About(): fd = Pango::FontDescription("Sans, 11"); l->set_font_description(fd); l->set_justify(Pango::ALIGN_CENTER); - fd.set_size(size*Pango::SCALE); + fd.set_size(int(size*Pango::SCALE)); l->set_font_description(fd); l->get_pixel_size(width,height); while( width >= image_w-6 ){