Merge branch 'master' into nikitakit_master

[synfig.git] / synfig-studio / src / gtkmm / canvasview.h

diff --git a/synfig-studio/src/gtkmm/canvasview.h b/synfig-studio/src/gtkmm/canvasview.h
index cddcbe2..11005d3 100644 (file)
--- a/synfig-studio/src/gtkmm/canvasview.h
+++ b/synfig-studio/src/gtkmm/canvasview.h
@@ -277,14 +277,16 @@ private:
        bool changing_resolution_;
        Gtk::Adjustment quality_adjustment_;
        Gtk::SpinButton *quality_spin;
+       Gtk::Adjustment future_onion_adjustment_;
        Gtk::Adjustment past_onion_adjustment_;
        Gtk::SpinButton *past_onion_spin;
-       Gtk::Adjustment future_onion_adjustment_;
        Gtk::SpinButton *future_onion_spin;
        bool updating_quality_;
        Gtk::ToggleButton *show_grid;
        Gtk::ToggleButton *snap_grid;
        Gtk::ToggleButton *onion_skin;
+       Gtk::Button *render_options_button;
+       Gtk::Button *preview_options_button;
        bool toggling_show_grid;
        bool toggling_snap_grid;
        bool toggling_onion_skin;