X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fgtkmm2ext%2Fcairocell.cc;h=c449cae5920ed1d4dcc07f0221512c0795ea14cb;hb=86f56de6564728d0715191756373f48d983f4328;hp=5a7f4309ed5ac0118ec3d6d691131de0df0c1243;hpb=106024330230fca331e2f611fec42ec1f4f43e5a;p=ardour.git diff --git a/libs/gtkmm2ext/cairocell.cc b/libs/gtkmm2ext/cairocell.cc index 5a7f4309ed..c449cae592 100644 --- a/libs/gtkmm2ext/cairocell.cc +++ b/libs/gtkmm2ext/cairocell.cc @@ -25,6 +25,7 @@ #include "gtkmm2ext/utils.h" using std::string; +using std::vector; using std::map; using std::max; using std::cerr; @@ -132,7 +133,7 @@ void CairoTextCell::set_size (Cairo::RefPtr& context) { const uint32_t lim = (uint32_t) ceil (_width_chars); - char buf[lim+1]; + vector buf(lim+1); uint32_t n; double max_width = 0.0; double max_height = 0.0; @@ -149,7 +150,7 @@ CairoTextCell::set_size (Cairo::RefPtr& context) buf[n] = '0' + digit; } - context->get_text_extents (buf, ext); + context->get_text_extents (&buf[0], ext); max_width = max (ext.width + ext.x_bearing, max_width); max_height = max (ext.height, max_height); @@ -211,7 +212,6 @@ CairoEditableText::CairoEditableText (boost::shared_ptr fo set_flags (Gtk::CAN_FOCUS); set_can_default (true); - set_receives_default (true); } CairoEditableText::~CairoEditableText () @@ -232,13 +232,13 @@ CairoEditableText::on_scroll_event (GdkEventScroll* ev) } bool -CairoEditableText::on_focus_in_event (GdkEventFocus* ev) +CairoEditableText::on_focus_in_event (GdkEventFocus*) { return false; } bool -CairoEditableText::on_focus_out_event (GdkEventFocus* ev) +CairoEditableText::on_focus_out_event (GdkEventFocus*) { if (editing_cell) { queue_draw_cell (editing_cell);