Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/gtkmm/renddesc.cpp b/synfig-studio/trunk/src/gtkmm/renddesc.cpp
index 3093f92..c88ac87 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/renddesc.cpp
+++ b/synfig-studio/trunk/src/gtkmm/renddesc.cpp
@@ -6,6 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -36,7 +37,9 @@
 #include <gtkmm/box.h>
 #include <ETL/misc>
 #include <synfig/general.h>
-//#include <gtkmm/seperator.h>
+//#include <gtkmm/separator.h>
+
+#include "general.h"
 
 #endif
 
@@ -57,10 +60,6 @@ using namespace studio;
 #define SYNFIG_MAX_PIXEL_HEIGHT        (~(1<<31))
 #endif
 
-#if ! defined(_)
-#define _(x)   (x)
-#endif
-
 #ifndef DPM2DPI
 #define DPM2DPI(x)     ((x)/39.3700787402)
 #define DPI2DPM(x)     ((x)*39.3700787402)
@@ -402,7 +401,6 @@ Widget_RendDesc::create_widgets()
        toggle_im_height->set_alignment(0, 0.5);
        toggle_im_span=manage(new Gtk::CheckButton(_("Image _Span"), true));
        toggle_im_span->set_alignment(0, 0.5);
-       time_frame=manage(new Gtk::Frame(_("Time")));
 }
 
 void
@@ -531,9 +529,9 @@ Widget_RendDesc::create_time_tab()
        Gtk::VBox *panelBox = manage(new Gtk::VBox(false, 12)); // for future widgets
        paddedPanel->add(*panelBox);
 
-       Gtk::Frame *time_frame = manage(new Gtk::Frame("Time Settings"));
+       time_frame = manage(new Gtk::Frame(_("Time Settings")));
        time_frame->set_shadow_type(Gtk::SHADOW_NONE);
-       ((Gtk::Label *) time_frame->get_label_widget())->set_markup("<b>Time Settings</b>");
+       ((Gtk::Label *) time_frame->get_label_widget())->set_markup(_("<b>Time Settings</b>"));
        panelBox->pack_start(*time_frame, false, false, 0);
 
        Gtk::Alignment *timeFramePadding = manage(new Gtk::Alignment(0, 0, 1, 1));