Remove internal edit mode and add "content" tool.

[ardour.git] / gtk2_ardour / big_clock_window.cc

diff --git a/gtk2_ardour/big_clock_window.cc b/gtk2_ardour/big_clock_window.cc
index 5b369a68c10c2222879557dd6595c49fbdf051b2..d625b87dec387c8c07f6b844bf381d83ba66ce8c 100644 (file)
--- a/gtk2_ardour/big_clock_window.cc
+++ b/gtk2_ardour/big_clock_window.cc
@@ -19,6 +19,7 @@
 
 #include <algorithm>
 #include <string>
+#include <vector>
 
 #include "ardour_ui.h"
 #include "audio_clock.h"
@@ -30,6 +31,7 @@
 
 using std::min;
 using std::string;
+using namespace ARDOUR_UI_UTILS;
 
 BigClockWindow::BigClockWindow (AudioClock& c) 
        : ArdourWindow (_("Big Clock"))
@@ -101,7 +103,7 @@ BigClockWindow::on_size_allocate (Gtk::Allocation& alloc)
 void
 BigClockWindow::reset_aspect_ratio ()
 {
-       Gtk::Requisition req;
+       Gtk::Requisition req = { 0, 0 };
 
        clock.size_request (req);
 
@@ -138,11 +140,11 @@ BigClockWindow::text_resizer (int, int)
        if (size != current_size) {
 
                string family = fd.get_family();
-               char buf[family.length()+16];
-               snprintf (buf, family.length()+16, "%s %d", family.c_str(), size);
+               std::vector<char> buf(family.length()+16);
+               snprintf (&buf[0], family.length()+16, "%s %d", family.c_str(), size);
 
                try {
-                       Pango::FontDescription fd (buf);
+                       Pango::FontDescription fd (&buf[0]);
                        Glib::RefPtr<Gtk::RcStyle> rcstyle = clock.get_modifier_style ();
                        rcstyle->set_font (fd);
                        clock.modify_style (rcstyle);