#include <string>
#include <vector>
+#include "gtkmm2ext/utils.h"
+
#include "ardour_ui.h"
#include "audio_clock.h"
#include "big_clock_window.h"
#include "public_editor.h"
#include "utils.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using std::min;
using std::string;
using namespace ARDOUR_UI_UTILS;
-BigClockWindow::BigClockWindow (AudioClock& c)
+BigClockWindow::BigClockWindow (AudioClock& c)
: ArdourWindow (_("Big Clock"))
, clock (c)
{
BigClockWindow::on_unmap ()
{
ArdourWindow::on_unmap ();
-
- PublicEditor::instance().reset_focus ();
+ ARDOUR_UI::instance()->reset_focus (this);
}
bool
BigClockWindow::on_realize ()
{
ArdourWindow::on_realize ();
- /* (try to) ensure that resizing is possible.
- */
- get_window()->set_decorations (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH);
-
- /* try to force a fixed aspect ratio so that we don't distort the font
- */
+ /* (try to) ensure that resizing is possible and the window can be moved (and closed) */
+ get_window()->set_decorations (Gdk::DECOR_BORDER | Gdk::DECOR_RESIZEH | Gdk::DECOR_TITLE | Gdk::DECOR_MENU);
+ /* try to force a fixed aspect ratio so that we don't distort the font */
float aspect = default_size.width/(float)default_size.height;
Gdk::Geometry geom;