diff options
Diffstat (limited to 'libs/gtkmm2ext')
51 files changed, 223 insertions, 223 deletions
diff --git a/libs/gtkmm2ext/actions.cc b/libs/gtkmm2ext/actions.cc index a4c8be1774..9471067de9 100644 --- a/libs/gtkmm2ext/actions.cc +++ b/libs/gtkmm2ext/actions.cc @@ -259,7 +259,7 @@ ActionManager::enable_accelerators () for (acts = gtk_action_group_list_actions (group); acts; acts = g_list_next (acts)) { ui_string += "<accelerator action=\""; - + /* OK, this is pretty stupid ... there is the full * accel path returned by gtk_action_get_accel_path () * but of course the UIManager doesn't use that, but @@ -338,7 +338,7 @@ ActionManager::disable_active_actions () } // save all action's states to action_states_to_restore save_action_states (); - + // set all action's states disabled for (ActionStates::iterator i = action_states_to_restore.begin(); i != action_states_to_restore.end(); ++i) { if ((*i).sensitive) { @@ -391,7 +391,7 @@ ActionManager::get_action (const char* path) *slash = '\0'; return get_action (©[0], ++slash); - + } RefPtr<Action> @@ -493,7 +493,7 @@ void ActionManager::set_toggleaction_state (string n, bool s) { char const * name = n.c_str (); - + const char *last_slash = strrchr (name, '/'); if (last_slash == 0) { @@ -526,13 +526,13 @@ string ActionManager::get_key_representation (const string& accel_path, AccelKey& key) { bool known = lookup_entry (accel_path, key); - + if (known) { uint32_t k = possibly_translate_legal_accelerator_to_real_key (key.get_key()); key = AccelKey (k, Gdk::ModifierType (key.get_mod())); return ui_manager->get_accel_group()->get_label (key.get_key(), Gdk::ModifierType (key.get_mod())); } - + return unbound_string; } diff --git a/libs/gtkmm2ext/binding_proxy.cc b/libs/gtkmm2ext/binding_proxy.cc index 87473adcd2..dfa2b4ac7c 100644 --- a/libs/gtkmm2ext/binding_proxy.cc +++ b/libs/gtkmm2ext/binding_proxy.cc @@ -37,12 +37,12 @@ guint BindingProxy::bind_statemask = Gdk::CONTROL_MASK; BindingProxy::BindingProxy (boost::shared_ptr<Controllable> c) : prompter (0), controllable (c) -{ +{ } BindingProxy::BindingProxy () : prompter (0) -{ +{ } BindingProxy::~BindingProxy () @@ -89,7 +89,7 @@ BindingProxy::button_press_handler (GdkEventButton *ev) } return true; } - + return false; } diff --git a/libs/gtkmm2ext/cairo_packer.cc b/libs/gtkmm2ext/cairo_packer.cc index d9449ebb6b..71f35fcf36 100644 --- a/libs/gtkmm2ext/cairo_packer.cc +++ b/libs/gtkmm2ext/cairo_packer.cc @@ -27,9 +27,9 @@ CairoPacker::draw_background (Gtk::Widget& w, GdkEventExpose*) int x, y; Gtk::Widget* window_parent; Glib::RefPtr<Gdk::Window> win = Gtkmm2ext::window_to_draw_on (w, &window_parent); - + if (win) { - + Cairo::RefPtr<Cairo::Context> context = win->create_cairo_context(); w.translate_coordinates (*window_parent, 0, 0, x, y); diff --git a/libs/gtkmm2ext/cairo_widget.cc b/libs/gtkmm2ext/cairo_widget.cc index aa8f883a7d..a597a7e29d 100644 --- a/libs/gtkmm2ext/cairo_widget.cc +++ b/libs/gtkmm2ext/cairo_widget.cc @@ -38,7 +38,7 @@ void CairoWidget::set_source_rgb_a( cairo_t* cr, Gdk::Color col, float a) //ToD float r = col.get_red_p (); float g = col.get_green_p (); float b = col.get_blue_p (); - + cairo_set_source_rgba(cr, r, g, b, a); } @@ -139,9 +139,9 @@ CairoWidget::on_expose_event (GdkEventExpose *ev) cairo_context->paint (); } #endif - + Gtk::Widget* child = get_child (); - + if (child) { propagate_expose (*child, ev); } @@ -187,9 +187,9 @@ CairoWidget::on_expose_event (GdkEventExpose *ev) /* paint expose area the color of the parent window bg */ - + Gdk::Color bg (get_parent_bg()); - + cr->set_source_rgb (bg.get_red_p(), bg.get_green_p(), bg.get_blue_p()); cr->fill (); @@ -219,7 +219,7 @@ CairoWidget::on_expose_event (GdkEventExpose *ev) #ifdef OPTIONAL_CAIRO_IMAGE_SURFACE } #endif - + return true; } diff --git a/libs/gtkmm2ext/cairocell.cc b/libs/gtkmm2ext/cairocell.cc index 4a6056e192..4de898c832 100644 --- a/libs/gtkmm2ext/cairocell.cc +++ b/libs/gtkmm2ext/cairocell.cc @@ -149,9 +149,9 @@ CairoTextCell::set_size (Cairo::RefPtr<Cairo::Context>& context) for (n = 0; n < lim; ++n) { buf[n] = '0' + digit; } - + context->get_text_extents (&buf[0], ext); - + max_width = max (ext.width + ext.x_bearing, max_width); max_height = max (ext.height, max_height); bsum += ext.x_bearing; @@ -179,7 +179,7 @@ CairoCharCell::set_size (Cairo::RefPtr<Cairo::Context>& context) Cairo::TextExtents ext; _font->apply (context); - + { const char* buf = "8"; context->get_text_extents (buf, ext); @@ -251,7 +251,7 @@ void CairoEditableText::add_cell (CairoCell* cell) { cells.push_back (cell); - + CairoTextCell* tc = dynamic_cast<CairoTextCell*>(cell); if (tc) { @@ -306,7 +306,7 @@ CairoEditableText::on_expose_event (GdkEventExpose* ev) Gtk::Allocation alloc = get_allocation (); double width = alloc.get_width(); double height = alloc.get_height (); - + if (_draw_bg) { context->set_source_rgba (bg_r, bg_g, bg_b, bg_a); if (_corner_radius) { @@ -316,14 +316,14 @@ CairoEditableText::on_expose_event (GdkEventExpose* ev) } context->fill (); } - + for (CellMap::iterator i = cells.begin(); i != cells.end(); ++i) { CairoCell* cell = (*i); /* is cell inside the expose area? */ - + if (cell->intersects (ev->area)) { if (cell == editing_cell) { context->set_source_rgba (edit_r, edit_b, edit_g, edit_a); @@ -413,9 +413,9 @@ CairoEditableText::set_cell_sizes () if (!win) { return; } - + Cairo::RefPtr<Cairo::Context> context = win->create_cairo_context(); - + if (!context) { return; } @@ -432,7 +432,7 @@ CairoEditableText::on_size_request (GtkRequisition* req) max_cell_width = 0; max_cell_height = 0; - + for (CellMap::iterator i = cells.begin(); i != cells.end(); ++i) { max_cell_width += (*i)->width(); max_cell_height = std::max ((double) (*i)->height(), max_cell_height); diff --git a/libs/gtkmm2ext/cell_renderer_color_selector.cc b/libs/gtkmm2ext/cell_renderer_color_selector.cc index 62419b423d..f8093cca1d 100644 --- a/libs/gtkmm2ext/cell_renderer_color_selector.cc +++ b/libs/gtkmm2ext/cell_renderer_color_selector.cc @@ -46,7 +46,7 @@ CellRendererColorSelector::CellRendererColorSelector() c.set_red (0); c.set_green (0); c.set_blue (0); - + property_color() = c; } @@ -70,21 +70,21 @@ CellRendererColorSelector::render_vfunc (const Glib::RefPtr<Gdk::Drawable>& wind cairo_t* cr = gdk_cairo_create (window->gobj()); double r, g, b; Gdk::Color c = _property_color.get_value(); - + cairo_rectangle (cr, expose_area.get_x(), expose_area.get_y(), expose_area.get_width(), expose_area.get_height()); cairo_clip (cr); - + r = c.get_red_p(); g = c.get_green_p(); b = c.get_blue_p(); - + cairo_rectangle_t drawing_rect; - + drawing_rect.x = cell_area.get_x() + property_xpad(); drawing_rect.y = cell_area.get_y() + property_ypad(); drawing_rect.width = cell_area.get_width() - (2 * property_xpad()); drawing_rect.height = cell_area.get_height() - (2 * property_ypad()); - + Gtkmm2ext::rounded_rectangle (cr, drawing_rect.x, drawing_rect.y, drawing_rect.width, drawing_rect.height, 5); cairo_set_source_rgb (cr, r, g, b); cairo_fill (cr); diff --git a/libs/gtkmm2ext/cell_renderer_pixbuf_multi.cc b/libs/gtkmm2ext/cell_renderer_pixbuf_multi.cc index c5c9eb98b0..181e0db0f7 100644 --- a/libs/gtkmm2ext/cell_renderer_pixbuf_multi.cc +++ b/libs/gtkmm2ext/cell_renderer_pixbuf_multi.cc @@ -70,7 +70,7 @@ CellRendererPixbufMulti::render_vfunc (const Glib::RefPtr<Gdk::Drawable>& window offset_width = cell_area.get_x() + (int)(cell_area.get_width() - pb->get_width())/2; offset_height = cell_area.get_y() + (int)(cell_area.get_height() - pb->get_height())/2; - + window->draw_pixbuf (RefPtr<GC>(), pb, 0, 0, offset_width, offset_height, -1, -1, Gdk::RGB_DITHER_NORMAL, 0, 0); } diff --git a/libs/gtkmm2ext/cell_renderer_pixbuf_toggle.cc b/libs/gtkmm2ext/cell_renderer_pixbuf_toggle.cc index 9fefbfb88e..af709b488f 100644 --- a/libs/gtkmm2ext/cell_renderer_pixbuf_toggle.cc +++ b/libs/gtkmm2ext/cell_renderer_pixbuf_toggle.cc @@ -75,7 +75,7 @@ CellRendererPixbufToggle::render_vfunc (const Glib::RefPtr<Gdk::Drawable>& windo { int offset_width = 0; int offset_height = 0; - + if(property_active() == true){ offset_width = cell_area.get_x() + (int)(cell_area.get_width() - inactive_pixbuf->get_width())/2; diff --git a/libs/gtkmm2ext/choice.cc b/libs/gtkmm2ext/choice.cc index 4cce090bcc..5dde9426e7 100644 --- a/libs/gtkmm2ext/choice.cc +++ b/libs/gtkmm2ext/choice.cc @@ -31,7 +31,7 @@ Choice::Choice (string title, string prompt, vector<string> choices, bool center { int n; vector<string>::iterator i; - + if (center) { set_position (Gtk::WIN_POS_CENTER); } else { @@ -49,7 +49,7 @@ Choice::Choice (string title, string prompt, vector<string> choices, bool center get_vbox()->set_border_width (12); get_vbox()->pack_start (*dhbox, true, false); - + set_has_separator (false); set_resizable (false); show_all_children (); diff --git a/libs/gtkmm2ext/click_box.cc b/libs/gtkmm2ext/click_box.cc index 8782acaae8..876c68f665 100644 --- a/libs/gtkmm2ext/click_box.cc +++ b/libs/gtkmm2ext/click_box.cc @@ -135,21 +135,21 @@ ClickBox::on_expose_event (GdkEventExpose *ev) Glib::RefPtr<Gdk::GC> fg_gc (style->get_fg_gc (Gtk::STATE_NORMAL)); Glib::RefPtr<Gdk::GC> bg_gc (style->get_bg_gc (Gtk::STATE_NORMAL)); Glib::RefPtr<Gdk::Window> win (get_window()); - + GdkRectangle base_rect; GdkRectangle draw_rect; gint x, y, width, height, depth; - + win->get_geometry (x, y, width, height, depth); - + base_rect.width = width; base_rect.height = height; base_rect.x = 0; base_rect.y = 0; - + gdk_rectangle_intersect (&ev->area, &base_rect, &draw_rect); win->draw_rectangle (bg_gc, true, draw_rect.x, draw_rect.y, draw_rect.width, draw_rect.height); - + if (twidth && theight) { win->draw_layout (fg_gc, (width - twidth) / 2, (height - theight) / 2, layout); } diff --git a/libs/gtkmm2ext/dndtreeview.cc b/libs/gtkmm2ext/dndtreeview.cc index 06d17fce40..53b212d711 100644 --- a/libs/gtkmm2ext/dndtreeview.cc +++ b/libs/gtkmm2ext/dndtreeview.cc @@ -49,10 +49,10 @@ DnDTreeViewBase::add_drop_targets (list<TargetEntry>& targets) for (list<TargetEntry>::iterator i = targets.begin(); i != targets.end(); ++i) { draggable.push_back (*i); } - + enable_model_drag_source (draggable); enable_model_drag_dest (draggable); -} +} void DnDTreeViewBase::add_object_drag (int column, string type_name) diff --git a/libs/gtkmm2ext/fader.cc b/libs/gtkmm2ext/fader.cc index a899e5906a..9a2f5a2cd9 100644 --- a/libs/gtkmm2ext/fader.cc +++ b/libs/gtkmm2ext/fader.cc @@ -162,7 +162,7 @@ Fader::get_image_scales (double &x_scale, double &y_scale) int pbheight = _face_pixbuf->get_height (); int width = get_width (); int height = get_height (); - + if ((width != pbwidth) || (height != pbheight)) { x_scale = double (width) / double (pbwidth); if (x_scale == 0.0) { @@ -186,17 +186,17 @@ Fader::set_touch_cursor (const Glib::RefPtr<Gdk::Pixbuf>& touch_cursor) void Fader::render (cairo_t* cr, cairo_rectangle_t*) { - + double xscale = 1.0; double yscale = 1.0; - + get_image_scales (xscale, yscale); - + cairo_matrix_t matrix; cairo_get_matrix (cr, &matrix); cairo_matrix_scale (&matrix, xscale, yscale); cairo_set_matrix (cr, &matrix); - + get_handle_position (_last_drawn_x, _last_drawn_y); if (_underlay_pixbuf != 0) { @@ -264,9 +264,9 @@ Fader::on_button_press_event (GdkEventButton* ev) double xscale = 1.0; double yscale = 1.0; - + get_image_scales (xscale, yscale); - + double hw = _handle_pixbuf->get_width() * xscale; double hh = _handle_pixbuf->get_height() * yscale; @@ -276,16 +276,16 @@ Fader::on_button_press_event (GdkEventButton* ev) double ev_pos_x; double ev_pos_y; - + get_closest_point_on_line(_min_pos_x, _min_pos_y, _max_pos_x, _max_pos_y, ev->x, ev->y, ev_pos_x, ev_pos_y ); add_modal_grab (); - + _grab_window = ev->window; _dragging = true; - + gdk_pointer_grab(ev->window,false, GdkEventMask (Gdk::POINTER_MOTION_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK), NULL, @@ -293,7 +293,7 @@ Fader::on_button_press_event (GdkEventButton* ev) ev->time); queue_draw(); - + return true; } @@ -368,7 +368,7 @@ Fader::on_motion_notify_event (GdkEventMotion* ev) if (_dragging) { double ev_pos_x; double ev_pos_y; - + if (ev->window != _grab_window) { _grab_window = ev->window; return true; @@ -378,12 +378,12 @@ Fader::on_motion_notify_event (GdkEventMotion* ev) _max_pos_x, _max_pos_y, _grab_start_handle_x + (ev->x - _grab_start_mouse_x), _grab_start_handle_y + (ev->y - _grab_start_mouse_y), ev_pos_x, ev_pos_y ); - + double const fract = sqrt((ev_pos_x - _min_pos_x) * (ev_pos_x - _min_pos_x) + (ev_pos_y - _min_pos_y) * (ev_pos_y - _min_pos_y)) / sqrt((double)((_max_pos_x - _min_pos_x) * (_max_pos_x - _min_pos_x) + (_max_pos_y - _min_pos_y) * (_max_pos_y - _min_pos_y))); - + adjustment.set_value (adjustment.get_lower() + (adjustment.get_upper() - adjustment.get_lower()) * fract); } return true; diff --git a/libs/gtkmm2ext/grouped_buttons.cc b/libs/gtkmm2ext/grouped_buttons.cc index e9d2c1c422..48a2ed1ab0 100644 --- a/libs/gtkmm2ext/grouped_buttons.cc +++ b/libs/gtkmm2ext/grouped_buttons.cc @@ -46,9 +46,9 @@ GroupedButtons::GroupedButtons (uint32_t nbuttons, uint32_t first_active) for (uint32_t n = 0; n < nbuttons; ++n) { Gtk::ToggleButton *button; - + button = manage (new (Gtk::ToggleButton)); - + if (n == current_active) { button->set_active (true); } diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc index d06e60ccd6..d160146859 100644 --- a/libs/gtkmm2ext/gtk_ui.cc +++ b/libs/gtkmm2ext/gtk_ui.cc @@ -71,12 +71,12 @@ UI::UI (string namestr, int *argc, char ***argv) : AbstractUI<UIRequest> (namestr) , _receiver (*this) , errors (0) - + { theMain = new Main (argc, argv); pthread_set_name ("gui"); - + _active = false; if (!theGtkUI) { @@ -91,7 +91,7 @@ UI::UI (string namestr, int *argc, char ***argv) */ run_loop_thread = Threads::Thread::self(); - + /* store "this" as the UI-for-thread of this thread, same argument as for previous line. */ @@ -144,7 +144,7 @@ UI::load_rcfile (string path, bool themechange) * This does not occur if wiget.get_style is used instead of rc.get_style below, * except that doesn't actually work... */ - + static Glib::RefPtr<Style>* fatal_style = 0; static Glib::RefPtr<Style>* error_style = 0; static Glib::RefPtr<Style>* warning_style = 0; @@ -641,7 +641,7 @@ UI::toggle_errors () } Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act); - + if (tact->get_active()) { errors->set_position (WIN_POS_MOUSE); errors->show (); diff --git a/libs/gtkmm2ext/gtkmm2ext/actions.h b/libs/gtkmm2ext/gtkmm2ext/actions.h index 0336fde242..b03e351cbf 100644 --- a/libs/gtkmm2ext/gtkmm2ext/actions.h +++ b/libs/gtkmm2ext/gtkmm2ext/actions.h @@ -38,7 +38,7 @@ namespace ActionManager { LIBGTKMM2EXT_API extern std::string unbound_string; /* the key string returned if an action is not bound */ LIBGTKMM2EXT_API extern Glib::RefPtr<Gtk::UIManager> ui_manager; - + LIBGTKMM2EXT_API extern void set_sensitive (std::vector<Glib::RefPtr<Gtk::Action> >& actions, bool); LIBGTKMM2EXT_API extern std::string get_key_representation (const std::string& accel_path, Gtk::AccelKey& key); diff --git a/libs/gtkmm2ext/gtkmm2ext/auto_spin.h b/libs/gtkmm2ext/gtkmm2ext/auto_spin.h index 70aedbe50e..da19a1a1f7 100644 --- a/libs/gtkmm2ext/gtkmm2ext/auto_spin.h +++ b/libs/gtkmm2ext/gtkmm2ext/auto_spin.h @@ -74,5 +74,5 @@ class LIBGTKMM2EXT_API AutoSpin }; } /* namespace */ - + #endif /* __gtkmm2ext_auto_spin_h__ */ diff --git a/libs/gtkmm2ext/gtkmm2ext/barcontroller.h b/libs/gtkmm2ext/gtkmm2ext/barcontroller.h index ce10411a2c..f529c5c557 100644 --- a/libs/gtkmm2ext/gtkmm2ext/barcontroller.h +++ b/libs/gtkmm2ext/gtkmm2ext/barcontroller.h @@ -80,4 +80,4 @@ class LIBGTKMM2EXT_API BarController : public Gtk::Alignment }; /* namespace */ -#endif // __gtkmm2ext_bar_controller_h__ +#endif // __gtkmm2ext_bar_controller_h__ diff --git a/libs/gtkmm2ext/gtkmm2ext/bindable_button.h b/libs/gtkmm2ext/gtkmm2ext/bindable_button.h index cf74d3aca0..d96f8145a4 100644 --- a/libs/gtkmm2ext/gtkmm2ext/bindable_button.h +++ b/libs/gtkmm2ext/gtkmm2ext/bindable_button.h @@ -40,7 +40,7 @@ class LIBGTKMM2EXT_API BindableToggleButton : public Gtkmm2ext::StatefulToggleBu BindableToggleButton () {} virtual ~BindableToggleButton() {} - + bool on_button_press_event (GdkEventButton *ev) { if (!binding_proxy.button_press_handler (ev)) { StatefulToggleButton::on_button_press_event (ev); @@ -49,7 +49,7 @@ class LIBGTKMM2EXT_API BindableToggleButton : public Gtkmm2ext::StatefulToggleBu return true; } } - + boost::shared_ptr<PBD::Controllable> get_controllable() { return binding_proxy.get_controllable(); } void set_controllable (boost::shared_ptr<PBD::Controllable> c); void watch (); @@ -67,7 +67,7 @@ class LIBGTKMM2EXT_API BindableButton : public Gtkmm2ext::StatefulButton public: BindableButton (boost::shared_ptr<PBD::Controllable> c) : binding_proxy (c) {} ~BindableButton() {} - + bool on_button_press_event (GdkEventButton *ev) { if (!binding_proxy.button_press_handler (ev)) { StatefulButton::on_button_press_event (ev); diff --git a/libs/gtkmm2ext/gtkmm2ext/binding_proxy.h b/libs/gtkmm2ext/gtkmm2ext/binding_proxy.h index 022a0cbcd9..7108c46eb2 100644 --- a/libs/gtkmm2ext/gtkmm2ext/binding_proxy.h +++ b/libs/gtkmm2ext/gtkmm2ext/binding_proxy.h @@ -39,7 +39,7 @@ class LIBGTKMM2EXT_API BindingProxy : public sigc::trackable BindingProxy (boost::shared_ptr<PBD::Controllable>); BindingProxy (); virtual ~BindingProxy(); - + void set_bind_button_state (guint button, guint statemask); static bool is_bind_action (GdkEventButton *); @@ -51,10 +51,10 @@ class LIBGTKMM2EXT_API BindingProxy : public sigc::trackable protected: Gtkmm2ext::PopUp* prompter; boost::shared_ptr<PBD::Controllable> controllable; - + static guint bind_button; static guint bind_statemask; - + PBD::ScopedConnection learning_connection; void learning_finished (); bool prompter_hiding (GdkEventAny *); diff --git a/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h b/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h index 436dc0382d..b6b4ccd83e 100644 --- a/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h +++ b/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h @@ -39,11 +39,11 @@ public: Gtkmm2ext::ActiveState active_state() const { return _active_state; } Gtkmm2ext::VisualState visual_state() const { return _visual_state; } - + /* derived widgets can override these two to catch changes in active & visual state */ - + virtual void set_active_state (Gtkmm2ext::ActiveState); virtual void set_visual_state (Gtkmm2ext::VisualState); @@ -80,7 +80,7 @@ public: /* set_focus_handler() will cause all button-press events on any CairoWidget to invoke this slot/functor/function/method/callback. - + We do this because in general, CairoWidgets do not grab keyboard focus, but a button press on them should clear focus from any active text entry. @@ -103,7 +103,7 @@ protected: void on_style_changed (const Glib::RefPtr<Gtk::Style>&); bool on_button_press_event (GdkEventButton*); Gdk::Color get_parent_bg (); - + /* this is an additional virtual "on_..." method. Glibmm does not provide a direct signal for name changes, so this acts as a proxy. */ @@ -125,7 +125,7 @@ protected: Glib::SignalProxyProperty _name_proxy; sigc::connection _parent_style_change; Widget * _current_parent; - + }; #endif diff --git a/libs/gtkmm2ext/gtkmm2ext/cairocell.h b/libs/gtkmm2ext/gtkmm2ext/cairocell.h index a061672fb8..8fe166624f 100644 --- a/libs/gtkmm2ext/gtkmm2ext/cairocell.h +++ b/libs/gtkmm2ext/gtkmm2ext/cairocell.h @@ -36,7 +36,7 @@ class LIBGTKMM2EXT_API CairoCell public: CairoCell(int32_t id); virtual ~CairoCell() {} - + int32_t id() const { return _id; } virtual void render (Cairo::RefPtr<Cairo::Context>&) = 0; @@ -165,7 +165,7 @@ public: void set_width_chars (CairoTextCell* cell, uint32_t); void set_draw_background (bool yn) { _draw_bg = yn; } - + void set_colors (double cr, double cg, double cb, double ca) { r = cr; g = cg; @@ -194,7 +194,7 @@ public: void set_xpad (double x) { _xpad = x; queue_resize(); } double ypad() const { return _ypad; } void set_ypad (double y) { _ypad = y; queue_resize(); } - + double corner_radius() const { return _corner_radius; } void set_corner_radius (double r) { _corner_radius = r; queue_draw (); } diff --git a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h index e84a635fa0..c921976dd3 100644 --- a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h +++ b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h @@ -53,7 +53,7 @@ class LIBGTKMM2EXT_API CellRendererPixbufMulti : public Gtk::CellRenderer Glib::PropertyProxy<uint32_t> property_state(); void set_pixbuf(uint32_t state, Glib::RefPtr<Gdk::Pixbuf> pixbuf); - + typedef sigc::signal<void, const Glib::ustring&> SignalChanged; SignalChanged& signal_changed(); diff --git a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h index 30171dd692..3fd2d65aa9 100644 --- a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h +++ b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h @@ -62,7 +62,7 @@ class LIBGTKMM2EXT_API CellRendererPixbufToggle : public Gtk::CellRenderer private: Glib::Property< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_; Glib::Property<bool> property_active_; - + Glib::RefPtr<Gdk::Pixbuf> active_pixbuf; Glib::RefPtr<Gdk::Pixbuf> inactive_pixbuf; diff --git a/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h b/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h index dd58f77a4c..083fee6378 100644 --- a/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h +++ b/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h @@ -52,7 +52,7 @@ class LIBGTKMM2EXT_API DnDTreeViewBase : public Gtk::TreeView Gtk::TreeView::on_drag_begin (context); start_object_drag (); } - + void on_drag_leave(const Glib::RefPtr<Gdk::DragContext>& context, guint time) { suggested_action = context->get_suggested_action(); TreeView::on_drag_leave (context, time); @@ -73,12 +73,12 @@ class LIBGTKMM2EXT_API DnDTreeViewBase : public Gtk::TreeView struct DragData { DragData () : source (0) {} - + Gtk::TreeView* source; int data_column; std::string object_type; }; - + static DragData drag_data; void start_object_drag () { @@ -112,7 +112,7 @@ class /*LIBGTKMM2EXT_API*/ DnDTreeView : public DnDTreeViewBase selection_data.set (8, (guchar*)&c, 1); } } - + void on_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const Gtk::SelectionData& selection_data, guint info, guint time) { if (suggested_action) { /* this is a drag motion callback. just update the status to @@ -122,14 +122,14 @@ class /*LIBGTKMM2EXT_API*/ DnDTreeView : public DnDTreeViewBase TreeView::on_drag_data_received (context, x, y, selection_data, info, time); return; } - + if (selection_data.get_target() == "GTK_TREE_MODEL_ROW") { - + TreeView::on_drag_data_received (context, x, y, selection_data, info, time); - + } else if (selection_data.get_target() == object_type) { - + end_object_drag (const_cast<Glib::RefPtr<Gdk::DragContext>& > (context), x, y); } else { @@ -147,16 +147,16 @@ class /*LIBGTKMM2EXT_API*/ DnDTreeView : public DnDTreeViewBase if (drag_data.source == 0) { return; } - + Glib::RefPtr<Gtk::TreeModel> model = drag_data.source->get_model(); DataType v; Gtk::TreeSelection::ListHandle_Path selection = drag_data.source->get_selection()->get_selected_rows (); - + for (Gtk::TreeSelection::ListHandle_Path::iterator x = selection.begin(); x != selection.end(); ++x) { model->get_iter (*x)->get_value (drag_data.data_column, v); l.push_back (v); } - + *source = drag_data.source; } diff --git a/libs/gtkmm2ext/gtkmm2ext/dndvbox.h b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h index 940a72859e..84289aff34 100644 --- a/libs/gtkmm2ext/gtkmm2ext/dndvbox.h +++ b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h @@ -24,15 +24,15 @@ namespace Gtkmm2ext { -/** Parent class for children of a DnDVBox */ +/** Parent class for children of a DnDVBox */ class /*LIBGTKMM2EXT_API*/ DnDVBoxChild { public: virtual ~DnDVBoxChild () {} - + /** @return The widget that is to be put into the DnDVBox */ virtual Gtk::Widget& widget () = 0; - + /** @return An EventBox containing the widget that should be used for selection, dragging etc. */ virtual Gtk::EventBox& action_widget () = 0; @@ -68,15 +68,15 @@ public: signal_drag_leave().connect (mem_fun (*this, &DnDVBox::drag_leave)); _internal_vbox.show (); - + drag_dest_set (_targets); signal_drag_data_received().connect (mem_fun (*this, &DnDVBox::drag_data_received)); } - + virtual ~DnDVBox () { clear (); - + delete _drag_icon; } @@ -89,9 +89,9 @@ public: child->action_widget().signal_drag_end().connect (sigc::bind (mem_fun (*this, &DnDVBox::drag_end), child)); child->action_widget().signal_button_press_event().connect (sigc::bind (mem_fun (*this, &DnDVBox::button_press), child)); child->action_widget().signal_button_release_event().connect (sigc::bind (mem_fun (*this, &DnDVBox::button_release), child)); - + _internal_vbox.pack_start (child->widget(), false, false); - + _children.push_back (child); child->widget().show (); } @@ -180,7 +180,7 @@ public: T* after; std::pair<T*, double> r; - + r.second = get_children_around_position (y, &before, &r.first, &after); return r; @@ -206,7 +206,7 @@ public: { return create_or_update_placeholder (get_child_at_position (y).second); } - + /** Children have been reordered by a drag */ sigc::signal<void> Reordered; @@ -241,7 +241,7 @@ private: return bottom; } - + /** Look at a y coordinate and find the children below y, and the ones either side. * @param y y position. * @param before Filled in with the child before, or 0. @@ -270,7 +270,7 @@ private: while (y >= bottom && j != _children.end()) { top = bottom; - + *before = *j; ++i; ++j; @@ -297,13 +297,13 @@ private: void drag_begin (Glib::RefPtr<Gdk::DragContext> const & context, T* child) { _drag_child = child; - + /* make up an icon for the drag */ _drag_icon = new Gtk::Window (Gtk::WINDOW_POPUP); - + Gtk::Allocation a = child->action_widget().get_allocation (); _drag_icon->set_size_request (a.get_width(), a.get_height()); - + _drag_icon->signal_expose_event().connect (sigc::mem_fun (*this, &DnDVBox::icon_expose)); _drag_icon->set_name (get_name ()); @@ -317,7 +317,7 @@ private: int w, h; _drag_icon->get_size (w, h); _drag_icon->drag_set_as_icon (context, w / 2, h / 2); - + _drag_source = this; } @@ -336,22 +336,22 @@ private: cairo_rectangle (cr, 0, 0, w, h); cairo_fill (cr); cairo_destroy (cr); - + return false; } - + void drag_data_get (Glib::RefPtr<Gdk::DragContext> const &, Gtk::SelectionData & selection_data, guint, guint, T* child) { selection_data.set (selection_data.get_target(), 8, (const guchar *) &child, sizeof (&child)); } - + void drag_data_received ( Glib::RefPtr<Gdk::DragContext> const & context, int /*x*/, int y, Gtk::SelectionData const & selection_data, guint /*info*/, guint time ) { /* work out where it was dropped */ std::pair<T*, double> const drop = get_child_at_position (y); - + if (_drag_source == this) { /* dropped from ourselves onto ourselves */ @@ -364,7 +364,7 @@ private: /* where in the list this child should be dropped */ int target = drop.second + 0.5; - + /* find out whether the child was `picked up' from before the drop position */ int n = 0; typename std::list<T*>::const_iterator i = _children.begin (); @@ -372,31 +372,31 @@ private: ++i; ++n; } - + /* if so, adjust the drop position to account for this */ if (n < target) { --target; } - + _internal_vbox.reorder_child (child->widget(), target); } - + } else { - + /* drag started in another DnDVBox; raise a signal to say what happened */ - + std::list<T*> dropped = _drag_source->selection (); DropFromAnotherBox (_drag_source, drop.first, context); } - + context->drag_finish (false, false, time); } - + void drag_end (Glib::RefPtr<Gdk::DragContext> const &, T *) { delete _drag_icon; _drag_icon = 0; - + _drag_child = 0; remove_placeholder (); @@ -474,7 +474,7 @@ private: if (child) { _expecting_unwanted_button_event = true; } - + if (ev->button == 1 || ev->button == 3) { if (!selected (child)) { @@ -492,7 +492,7 @@ private: if (selecting && !was_selected) { add_to_selection (*i); } - + if (!selecting && !done) { if (selected (*i)) { selecting = true; @@ -509,19 +509,19 @@ private: } } else { - + if ((ev->state & Gdk::CONTROL_MASK) == 0) { clear_selection (); } - + if (child) { add_to_selection (child); } } - + SelectionChanged (); /* EMIT SIGNAL */ - + } else { /* XXX THIS NEEDS GENERALIZING FOR OS X */ if (ev->button == 1 && (ev->state & Gdk::CONTROL_MASK)) { @@ -535,7 +535,7 @@ private: return ButtonPress (ev, child); /* EMIT SIGNAL */ } - + bool button_release (GdkEventButton* ev, T* child) { if (_expecting_unwanted_button_event == true && child == 0) { @@ -565,7 +565,7 @@ private: setup_child_state (*i); } } - + void add_to_selection (T* child) { if ( !child->is_selectable() ) @@ -583,21 +583,21 @@ private: setup_child_state (c); } } - + T* child_from_widget (Gtk::Widget const * w) const { typename std::list<T*>::const_iterator i = _children.begin(); while (i != _children.end() && &(*i)->widget() != w) { ++i; } - + if (i == _children.end()) { return 0; } return *i; } - + Gtk::VBox _internal_vbox; std::list<Gtk::TargetEntry> _targets; std::list<T*> _children; @@ -611,12 +611,12 @@ private: Gtk::Label* _placeholder; /** Our child being dragged, or 0 */ T* _drag_child; - + static DnDVBox* _drag_source; - + }; template <class T> DnDVBox<T>* DnDVBox<T>::_drag_source = 0; - + } diff --git a/libs/gtkmm2ext/gtkmm2ext/focus_entry.h b/libs/gtkmm2ext/gtkmm2ext/focus_entry.h index cc0c2ef73a..2dce03cb2b 100644 --- a/libs/gtkmm2ext/gtkmm2ext/focus_entry.h +++ b/libs/gtkmm2ext/gtkmm2ext/focus_entry.h @@ -30,7 +30,7 @@ class LIBGTKMM2EXT_API FocusEntry : public Gtk::Entry { public: FocusEntry (); - + protected: bool on_button_press_event (GdkEventButton*); bool on_button_release_event (GdkEventButton*); diff --git a/libs/gtkmm2ext/gtkmm2ext/grouped_buttons.h b/libs/gtkmm2ext/gtkmm2ext/grouped_buttons.h index 06e7fffe83..15b01bff4f 100644 --- a/libs/gtkmm2ext/gtkmm2ext/grouped_buttons.h +++ b/libs/gtkmm2ext/gtkmm2ext/grouped_buttons.h @@ -36,7 +36,7 @@ class LIBGTKMM2EXT_API GroupedButtons : public sigc::trackable public: GroupedButtons (uint32_t nbuttons, uint32_t first_active); GroupedButtons (std::vector<Gtk::ToggleButton *>&); - + Gtk::ToggleButton& button (uint32_t which) { return *buttons[which]; } diff --git a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h index cc0d67b2ec..868f71fd8d 100644 --- a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h +++ b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h @@ -167,7 +167,7 @@ class LIBGTKMM2EXT_API UI : public AbstractUI<UIRequest> sigc::signal<void> theme_changed; static bool just_hide_it (GdkEventAny *, Gtk::Window *); - + protected: virtual void handle_fatal (const char *); virtual void display_message (const char *prefix, gint prefix_len, diff --git a/libs/gtkmm2ext/gtkmm2ext/keyboard.h b/libs/gtkmm2ext/gtkmm2ext/keyboard.h index 73c9ad7d42..fca5d9f817 100644 --- a/libs/gtkmm2ext/gtkmm2ext/keyboard.h +++ b/libs/gtkmm2ext/gtkmm2ext/keyboard.h @@ -145,7 +145,7 @@ class LIBGTKMM2EXT_API Keyboard : public sigc::trackable, PBD::Stateful static void set_insert_note_button (guint); static guint insert_note_modifier() { return insert_note_mod; } static void set_insert_note_modifier(guint); - + static bool is_edit_event (GdkEventButton*); static bool is_delete_event (GdkEventButton*); static bool is_insert_note_event (GdkEventButton*); diff --git a/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h b/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h index ee3ba167a5..91e7a67a7e 100644 --- a/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h +++ b/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h @@ -103,7 +103,7 @@ class LIBGTKMM2EXT_API MotionFeedback : public Gtk::VBox to a display value (0.0 .. 1.0) */ virtual double to_display_value (double) = 0; - + virtual double adjust (double nominal_delta) = 0; private: @@ -130,5 +130,5 @@ class LIBGTKMM2EXT_API MotionFeedback : public Gtk::VBox }; } /* namespace */ - + #endif // __gtkmm2ext_motion_feedback_h__ diff --git a/libs/gtkmm2ext/gtkmm2ext/persistent_tooltip.h b/libs/gtkmm2ext/gtkmm2ext/persistent_tooltip.h index 0ad9439fa8..9883fd2020 100644 --- a/libs/gtkmm2ext/gtkmm2ext/persistent_tooltip.h +++ b/libs/gtkmm2ext/gtkmm2ext/persistent_tooltip.h @@ -34,7 +34,7 @@ class LIBGTKMM2EXT_API PersistentTooltip : public sigc::trackable public: PersistentTooltip (Gtk::Widget *, bool draggable = false, int margin_y = 0); virtual ~PersistentTooltip (); - + void set_tip (std::string); void set_font (Pango::FontDescription font); void set_center_alignment (bool align_to_center); diff --git a/libs/gtkmm2ext/gtkmm2ext/pixscroller.h b/libs/gtkmm2ext/gtkmm2ext/pixscroller.h index 50586a9028..0a0d2593c7 100644 --- a/libs/gtkmm2ext/gtkmm2ext/pixscroller.h +++ b/libs/gtkmm2ext/gtkmm2ext/pixscroller.h @@ -60,7 +60,7 @@ class LIBGTKMM2EXT_API PixScroller : public Gtk::DrawingArea double grab_start; int overall_height; bool dragging; - + float default_value; void adjustment_changed (); diff --git a/libs/gtkmm2ext/gtkmm2ext/scroomer.h b/libs/gtkmm2ext/gtkmm2ext/scroomer.h index 5d9ca69801..4d957b4868 100644 --- a/libs/gtkmm2ext/gtkmm2ext/scroomer.h +++ b/libs/gtkmm2ext/gtkmm2ext/scroomer.h @@ -56,7 +56,7 @@ public: void set_min_page_size(double page_size); int get_handle_size() { return handle_size; } - + inline int position_of(Component comp) { return position[comp]; } sigc::signal0<void> DragStarting; diff --git a/libs/gtkmm2ext/gtkmm2ext/slider_controller.h b/libs/gtkmm2ext/gtkmm2ext/slider_controller.h index 460f4a88ae..e756180eaf 100644 --- a/libs/gtkmm2ext/gtkmm2ext/slider_controller.h +++ b/libs/gtkmm2ext/gtkmm2ext/slider_controller.h @@ -81,4 +81,4 @@ class LIBGTKMM2EXT_API HSliderController : public SliderController }; /* namespace */ -#endif // __gtkmm2ext_slider_controller_h__ +#endif // __gtkmm2ext_slider_controller_h__ diff --git a/libs/gtkmm2ext/gtkmm2ext/textviewer.h b/libs/gtkmm2ext/gtkmm2ext/textviewer.h index 98d13a2a7d..51af88c005 100644 --- a/libs/gtkmm2ext/gtkmm2ext/textviewer.h +++ b/libs/gtkmm2ext/gtkmm2ext/textviewer.h @@ -48,7 +48,7 @@ class LIBGTKMM2EXT_API TextViewer : public Gtk::Window, public Transmitter void insert_file (const std::string &); void scroll_to_bottom (); - + void deliver (); }; diff --git a/libs/gtkmm2ext/gtkmm2ext/utils.h b/libs/gtkmm2ext/gtkmm2ext/utils.h index 0182fec456..62ffba3b9c 100644 --- a/libs/gtkmm2ext/gtkmm2ext/utils.h +++ b/libs/gtkmm2ext/gtkmm2ext/utils.h @@ -58,16 +58,16 @@ namespace Gtkmm2ext { LIBGTKMM2EXT_API void get_ink_pixel_size (Glib::RefPtr<Pango::Layout>, int& width, int& height); - + LIBGTKMM2EXT_API void get_pixel_size (Glib::RefPtr<Pango::Layout>, int& width, int& height); - + LIBGTKMM2EXT_API void set_size_request_to_display_given_text (Gtk::Widget &w, const gchar *text, gint hpadding, gint vpadding); - + LIBGTKMM2EXT_API void set_size_request_to_display_given_text_width (Gtk::Widget& w, const gchar* htext, gint hpadding, @@ -108,7 +108,7 @@ namespace Gtkmm2ext { LIBGTKMM2EXT_API bool set_active_text_if_present (Gtk::ComboBoxText&, const std::string); - + template<class T> /*LIBGTKMM2EXT_API*/ void deferred_delete (void *ptr) { delete static_cast<T *> (ptr); } @@ -131,7 +131,7 @@ namespace Gtkmm2ext { LIBGTKMM2EXT_API void container_clear (Gtk::Container&); /* C++ API for rounded rectangles */ - + LIBGTKMM2EXT_API void rounded_rectangle (Cairo::RefPtr<Cairo::Context> context, double x, double y, double w, double h, double r=10); LIBGTKMM2EXT_API void rounded_top_rectangle (Cairo::RefPtr<Cairo::Context> context, double x, double y, double w, double h, double r=10); LIBGTKMM2EXT_API void rounded_top_left_rectangle (Cairo::RefPtr<Cairo::Context> context, double x, double y, double w, double h, double r=10); diff --git a/libs/gtkmm2ext/gtkmm2ext/widget_state.h b/libs/gtkmm2ext/gtkmm2ext/widget_state.h index 3e873f303b..bb8bd375f0 100644 --- a/libs/gtkmm2ext/gtkmm2ext/widget_state.h +++ b/libs/gtkmm2ext/gtkmm2ext/widget_state.h @@ -14,7 +14,7 @@ namespace Gtkmm2ext { ExplicitActive, ImplicitActive, }; - + enum LIBGTKMM2EXT_API VisualState { /* these can be OR-ed together */ NoVisualState = 0x0, diff --git a/libs/gtkmm2ext/idle_adjustment.cc b/libs/gtkmm2ext/idle_adjustment.cc index 37bb28c1a2..6f5fd13294 100644 --- a/libs/gtkmm2ext/idle_adjustment.cc +++ b/libs/gtkmm2ext/idle_adjustment.cc @@ -44,14 +44,14 @@ void IdleAdjustment::underlying_adjustment_value_changed () { last_vc = g_get_monotonic_time(); - + if (timeout_queued) { return; } Glib::signal_timeout().connect(mem_fun(*this, &IdleAdjustment::timeout_handler), 250); timeout_queued = true; -} +} gint IdleAdjustment::timeout_handler () diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc index b0d952a11a..b08a1e4f8c 100644 --- a/libs/gtkmm2ext/keyboard.cc +++ b/libs/gtkmm2ext/keyboard.cc @@ -644,7 +644,7 @@ Keyboard::reset_bindings () string new_path = user_keybindings_path; new_path += ".old"; - + if (::g_rename (user_keybindings_path.c_str(), new_path.c_str())) { error << string_compose (_("Cannot rename your own keybinding file (%1)"), strerror (errno)) << endmsg; return -1; diff --git a/libs/gtkmm2ext/motionfeedback.cc b/libs/gtkmm2ext/motionfeedback.cc index 458aeeff3b..08436ac6bf 100644 --- a/libs/gtkmm2ext/motionfeedback.cc +++ b/libs/gtkmm2ext/motionfeedback.cc @@ -96,7 +96,7 @@ MotionFeedback::MotionFeedback (Glib::RefPtr<Gdk::Pixbuf> pix, value = new Label; value->set_justify (Gtk::JUSTIFY_RIGHT); value->show (); - + value_packer->add (*value); hpacker = manage (new HBox); @@ -198,7 +198,7 @@ MotionFeedback::pixwin_button_release_event (GdkEventButton *ev) _controllable->set_value (_controllable->lower ()); } break; - + case 3: if (pixwin.has_grab()) { if (grab_is_fine) { @@ -329,7 +329,7 @@ MotionFeedback::pixwin_key_press_event (GdkEventKey *ev) _controllable->set_value (_controllable->upper()); break; } - + return retval; } @@ -343,7 +343,7 @@ MotionFeedback::pixwin_expose_event (GdkEventExpose*) GdkWindow *window = pixwin.get_window()->gobj(); double display_val = to_display_value (_controllable->get_value()); int32_t phase = lrint (display_val * 64.0); - + // skip middle phase except for true middle value if (type == Rotary && phase == 32) { @@ -496,30 +496,30 @@ MotionFeedback::render_pixbuf (int size) GdkColor dark; GdkColor bright; ProlooksHSV* hsv; - + hsv = prolooks_hsv_new_for_gdk_color (base_color->gobj()); bright = (prolooks_hsv_to_gdk_color (hsv, &col2), col2); prolooks_hsv_set_saturation (hsv, 0.66); prolooks_hsv_set_value (hsv, 0.67); dark = (prolooks_hsv_to_gdk_color (hsv, &col3), col3); - + cairo_surface_t *surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, size * 64, size); cairo_t* cr = cairo_create (surface); - + for (int i = 0; i < 64; ++i) { cairo_save (cr); core_draw (cr, i, size, 20, size*i, 0, &bright, &dark); cairo_restore (cr); } - + if (cairo_surface_write_to_png (surface, path) != CAIRO_STATUS_SUCCESS) { error << string_compose (_("motionfeedback: could not save image set to %1"), path) << endmsg; return pixbuf; } - + cairo_destroy (cr); cairo_surface_destroy (surface); - + try { pixbuf = Gdk::Pixbuf::create_from_file (path); } catch (const Gdk::PixbufError &e) { @@ -530,7 +530,7 @@ MotionFeedback::render_pixbuf (int size) g_unlink (path); g_free (path); - + return pixbuf; } @@ -593,7 +593,7 @@ MotionFeedback::core_draw (cairo_t* cr, int phase, double size, double progress_ cairo_arc (cr, xc, yc, progress_radius, start_angle, end_angle); cairo_stroke (cr); - + float r = (value) * (((float)bright->red)/G_MAXUINT16) + (1.0-value)*(((float)dark->red)/G_MAXUINT16); float g = (value) * (((float)bright->green)/G_MAXUINT16) + (1.0-value)*(((float)dark->green)/G_MAXUINT16); float b = (value) * (((float)bright->blue)/G_MAXUINT16) + (1.0-value)*(((float)dark->blue)/G_MAXUINT16); @@ -612,7 +612,7 @@ MotionFeedback::core_draw (cairo_t* cr, int phase, double size, double progress_ cairo_arc (cr, xc, yc, progress_radius_outer-1, 0, 2.0*G_PI); cairo_fill (cr); cairo_pattern_destroy (shade_pattern); - + //black border cairo_set_source_rgb (cr, 0, 0, 0 ); cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND); @@ -640,7 +640,7 @@ MotionFeedback::core_draw (cairo_t* cr, int phase, double size, double progress_ cairo_set_source_rgba (cr, 0.3, 0.3, 0.3, 1 ); cairo_arc (cr, xc, yc, progress_radius_inner-1, 0, 2.0*G_PI); cairo_fill (cr); - + //knob shade shade_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, progress_radius_outer); cairo_pattern_add_color_stop_rgba (shade_pattern, 0, 1,1,1, 0.5); @@ -649,7 +649,7 @@ MotionFeedback::core_draw (cairo_t* cr, int phase, double size, double progress_ cairo_arc (cr, xc, yc, progress_radius_inner-1, 0, 2.0*G_PI); cairo_fill (cr); cairo_pattern_destroy (shade_pattern); - + //inner circle cairo_set_source_rgba (cr, 0.3, 0.3, 0.3, 0.5 ); cairo_arc (cr, xc, yc, progress_radius_inner-5, 0, 2.0*G_PI); diff --git a/libs/gtkmm2ext/persistent_tooltip.cc b/libs/gtkmm2ext/persistent_tooltip.cc index 88be6ef100..c7cb3f4df2 100644 --- a/libs/gtkmm2ext/persistent_tooltip.cc +++ b/libs/gtkmm2ext/persistent_tooltip.cc @@ -138,7 +138,7 @@ PersistentTooltip::show () _window->set_transient_for (*tlw); } } - + set_tip (_tip); if (!_window->is_visible ()) { @@ -146,7 +146,7 @@ PersistentTooltip::show () int sw = gdk_screen_width (); _target->get_window()->get_origin (rx, ry); - + /* the window needs to be realized first * for _window->get_width() to be correct. */ diff --git a/libs/gtkmm2ext/pixscroller.cc b/libs/gtkmm2ext/pixscroller.cc index 570d04c1c3..55bbef8c80 100644 --- a/libs/gtkmm2ext/pixscroller.cc +++ b/libs/gtkmm2ext/pixscroller.cc @@ -104,7 +104,7 @@ PixScroller::on_expose_event (GdkEventExpose* ev) context->paint(); context->restore(); } - + if (gdk_rectangle_intersect (sliderrect.gobj(), &ev->area, &intersect)) { context->save(); @@ -136,7 +136,7 @@ PixScroller::on_button_press_event (GdkEventButton* ev) default: break; } - + return false; } @@ -145,7 +145,7 @@ bool PixScroller::on_button_release_event (GdkEventButton* ev) { double scale; - + if (ev->state & Keyboard::PrimaryModifier) { if (ev->state & Keyboard::SecondaryModifier) { scale = 0.05; @@ -195,7 +195,7 @@ bool PixScroller::on_scroll_event (GdkEventScroll* ev) { double scale; - + if (ev->state & Keyboard::PrimaryModifier) { if (ev->state & Keyboard::SecondaryModifier) { scale = 0.05; @@ -235,7 +235,7 @@ PixScroller::on_motion_notify_event (GdkEventMotion* ev) grab_window = ev->window; return true; } - + if (ev->state & Keyboard::PrimaryModifier) { if (ev->state & Keyboard::SecondaryModifier) { scale = 0.05; @@ -253,7 +253,7 @@ PixScroller::on_motion_notify_event (GdkEventMotion* ev) fract = min (1.0, fract); fract = max (-1.0, fract); - + fract = -fract; adj.set_value (adj.get_value() + scale * fract * (adj.get_upper() - adj.get_lower())); diff --git a/libs/gtkmm2ext/popup.cc b/libs/gtkmm2ext/popup.cc index 028490f11e..898211c986 100644 --- a/libs/gtkmm2ext/popup.cc +++ b/libs/gtkmm2ext/popup.cc @@ -101,7 +101,7 @@ PopUp::touch () set_size_request_to_display_given_text (label, my_text.c_str(), 25, 10); label.set_text (my_text); show_all (); - + if (popdown_time != 0) { timeout = g_timeout_add (popdown_time, remove_prompt_timeout, @@ -137,7 +137,7 @@ PopUp::on_delete_event (GdkEventAny* /*ev*/) if (popdown_time != 0 && timeout != -1) { g_source_remove (timeout); - } + } if (delete_on_hide) { std::cerr << "deleting prompter\n" << endl; diff --git a/libs/gtkmm2ext/prompter.cc b/libs/gtkmm2ext/prompter.cc index 03cfb25be4..1f5e13b923 100644 --- a/libs/gtkmm2ext/prompter.cc +++ b/libs/gtkmm2ext/prompter.cc @@ -52,7 +52,7 @@ Prompter::init () set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG); set_position (Gtk::WIN_POS_MOUSE); set_name ("Prompter"); - + add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); /* @@ -62,7 +62,7 @@ Prompter::init () set_response_sensitive (Gtk::RESPONSE_ACCEPT, false) to prevent the RESPONSE_ACCEPT button from permitting blank strings. */ - + entryLabel.set_line_wrap (true); entryLabel.set_name ("PrompterLabel"); @@ -74,7 +74,7 @@ Prompter::init () get_vbox()->pack_start (entryBox); show_all_children(); -} +} void Prompter::on_show () @@ -117,7 +117,7 @@ Prompter::entry_activated () } else { response (Gtk::RESPONSE_CANCEL); } -} +} void Prompter::on_entry_changed () diff --git a/libs/gtkmm2ext/scroomer.cc b/libs/gtkmm2ext/scroomer.cc index 9b56706d21..69944b4bc7 100644 --- a/libs/gtkmm2ext/scroomer.cc +++ b/libs/gtkmm2ext/scroomer.cc @@ -111,29 +111,29 @@ Scroomer::on_motion_notify_event (GdkEventMotion* ev) unzoomed_page += scale * fract * range; unzoomed_page = min(unzoomed_page, adj.get_upper() - unzoomed_val); unzoomed_page = max(unzoomed_page, min_page_size); - + if (pinch){ temp = unzoomed_val + unzoomed_page; unzoomed_val -= scale * fract * range * 0.5; unzoomed_val = min(unzoomed_val, temp - min_page_size); unzoomed_val = max(unzoomed_val, adj.get_lower()); } - + break; case Handle2: temp = unzoomed_val + unzoomed_page; unzoomed_val += scale * fract * range; unzoomed_val = min(unzoomed_val, temp - min_page_size); unzoomed_val = max(unzoomed_val, adj.get_lower()); - + unzoomed_page = temp - unzoomed_val; - + if (pinch){ - + unzoomed_page -= scale * fract * range; } - - unzoomed_page = min(unzoomed_page, adj.get_upper() - unzoomed_val); + + unzoomed_page = min(unzoomed_page, adj.get_upper() - unzoomed_val); unzoomed_page = max(unzoomed_page, min_page_size); break; default: @@ -145,10 +145,10 @@ Scroomer::on_motion_notify_event (GdkEventMotion* ev) * We don't start doing zoom until we are at least one scroomer width outside the scroomer's * area. */ - + if (ev->x > (get_width() * 2)) { zoom = ev->x - get_width(); - + double higher = unzoomed_val + unzoomed_page - half_min_page - val_at_pointer; double lower = val_at_pointer - (unzoomed_val + half_min_page); @@ -204,7 +204,7 @@ Scroomer::on_motion_notify_event (GdkEventMotion* ev) adj.set_page_size (rint (page)); adj.set_value (rint (val)); adj.value_changed(); - + return true; } @@ -241,7 +241,7 @@ Scroomer::on_button_press_event (GdkEventButton* ev) unzoomed_val = adj.get_value(); unzoomed_page = adj.get_page_size(); grab_window = ev->window; - + if (ev->button == 3){ pinch = true; } else { @@ -250,7 +250,7 @@ Scroomer::on_button_press_event (GdkEventButton* ev) DragStarting (); /* EMIT SIGNAL */ } - + if (ev->type == GDK_2BUTTON_PRESS && ev->button == 1) { DoubleClicked(); } @@ -289,7 +289,7 @@ Scroomer::on_button_release_event (GdkEventButton* ev) default: break; } - + grab_comp = None; remove_modal_grab(); diff --git a/libs/gtkmm2ext/selector.cc b/libs/gtkmm2ext/selector.cc index 55499967d1..04fbd13001 100644 --- a/libs/gtkmm2ext/selector.cc +++ b/libs/gtkmm2ext/selector.cc @@ -157,7 +157,7 @@ Selector::chosen () { Glib::RefPtr<Gtk::TreeSelection> tree_sel = tview.get_selection(); Gtk::TreeModel::iterator iter = tree_sel->get_selected(); - + if (iter) { choice_made (new Result (tview, tree_sel)); } else { diff --git a/libs/gtkmm2ext/sync-menu.c b/libs/gtkmm2ext/sync-menu.c index c37fb6c3c4..14933e5119 100644 --- a/libs/gtkmm2ext/sync-menu.c +++ b/libs/gtkmm2ext/sync-menu.c @@ -340,7 +340,7 @@ carbon_menu_item_update_accelerator (CarbonMenuItem *carbon_item, default: break; } - + if (realkey != -1) { SetMenuItemCommandKey (carbon_item->menu, carbon_item->index, false, realkey); @@ -381,7 +381,7 @@ carbon_menu_item_update_accelerator (CarbonMenuItem *carbon_item, } /* gdk/quartz maps Command to Meta */ - + if (key->accel_mods & GDK_META_MASK) { use_command = 1; } diff --git a/libs/gtkmm2ext/tearoff.cc b/libs/gtkmm2ext/tearoff.cc index 9890f80ceb..dbe5c3dc5c 100644 --- a/libs/gtkmm2ext/tearoff.cc +++ b/libs/gtkmm2ext/tearoff.cc @@ -65,7 +65,7 @@ TearOff::TearOff (Widget& c, bool allow_resize) VBox* box1; box1 = manage (new VBox); box1->pack_start (close_event_box, false, false, 2); - + window_box.pack_end (*box1, false, false, 2); own_window.add_events (KEY_PRESS_MASK|KEY_RELEASE_MASK|BUTTON_PRESS_MASK|BUTTON_RELEASE_MASK|POINTER_MOTION_MASK|POINTER_MOTION_HINT_MASK); @@ -73,7 +73,7 @@ TearOff::TearOff (Widget& c, bool allow_resize) own_window.set_type_hint (WINDOW_TYPE_HINT_UTILITY); own_window.add (window_box); - + own_window.signal_button_press_event().connect (mem_fun (*this, &TearOff::window_button_press)); own_window.signal_button_release_event().connect (mem_fun (*this, &TearOff::window_button_release)); own_window.signal_motion_notify_event().connect (mem_fun (*this, &TearOff::window_motion)); @@ -171,7 +171,7 @@ TearOff::close_click (GdkEventButton* /*ev*/) { put_it_back (); return true; -} +} void TearOff::put_it_back () @@ -232,7 +232,7 @@ TearOff::window_motion (GdkEventMotion* ev) double x_delta; double y_delta; RefPtr<Gdk::Window> win (own_window.get_window()); - + own_window.get_pointer (mx, my); if (!dragging) { @@ -250,10 +250,10 @@ TearOff::window_motion (GdkEventMotion* ev) win->get_root_origin (x, y); win->move ((gint) floor (x + x_delta), (gint) floor (y + y_delta)); - + drag_x = ev->x_root; drag_y = ev->y_root; - + return true; } diff --git a/libs/gtkmm2ext/textviewer.cc b/libs/gtkmm2ext/textviewer.cc index e62725acb4..995cbc8eaa 100644 --- a/libs/gtkmm2ext/textviewer.cc +++ b/libs/gtkmm2ext/textviewer.cc @@ -108,7 +108,7 @@ TextViewer::scroll_to_bottom () adj = scrollwin.get_vadjustment(); adj->set_value (MAX(0,(adj->get_upper() - adj->get_page_size()))); } - + void TextViewer::deliver () diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc index 24940c718c..4cfc0b26a0 100644 --- a/libs/gtkmm2ext/utils.cc +++ b/libs/gtkmm2ext/utils.cc @@ -53,7 +53,7 @@ Gtkmm2ext::get_ink_pixel_size (Glib::RefPtr<Pango::Layout> layout, int& height) { Pango::Rectangle ink_rect = layout->get_ink_extents (); - + width = PANGO_PIXELS(ink_rect.get_width()); height = PANGO_PIXELS(ink_rect.get_height()); } @@ -72,7 +72,7 @@ Gtkmm2ext::set_size_request_to_display_given_text (Gtk::Widget &w, const gchar * { int width, height; w.ensure_style (); - + get_pixel_size (w.create_pango_layout (text), width, height); w.set_size_request(width + hpadding, height + vpadding); } @@ -117,7 +117,7 @@ Gtkmm2ext::set_size_request_to_display_given_text (Gtk::Widget &w, std::string c { int width, height; w.ensure_style (); - + get_pixel_size (w.create_pango_layout (text), width, height); w.set_size_request(width + hpadding, height + vpadding); } @@ -141,7 +141,7 @@ Gtkmm2ext::set_size_request_to_display_given_text (Gtk::Widget &w, break; } } - + if (i == strings.end()) { /* make a copy of the strings then add one that has a descender */ copy = strings; @@ -150,7 +150,7 @@ Gtkmm2ext::set_size_request_to_display_given_text (Gtk::Widget &w, } else { to_use = &strings; } - + for (vector<string>::const_iterator i = to_use->begin(); i != to_use->end(); ++i) { get_pixel_size (w.create_pango_layout (*i), width, height); width_max = max(width_max,width); @@ -211,7 +211,7 @@ Gtkmm2ext::convert_bgra_to_rgba (guint8 const* src, { guint8 const* src_pixel = src; guint8* dst_pixel = dst; - + /* cairo pixel data is endian-dependent ARGB with A in the most significant 8 bits, with premultipled alpha values (see preceding function) @@ -251,7 +251,7 @@ Gtkmm2ext::convert_bgra_to_rgba (guint8 const* src, #else #error ardour does not currently support PDP-endianess -#endif +#endif dst_pixel += 4; src_pixel += 4; @@ -277,16 +277,16 @@ Gtkmm2ext::pixbuf_from_string(const string& name, const Pango::FontDescription& cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, clip_width, clip_height); cairo_t* cr = cairo_create (surface); cairo_text_extents_t te; - + cairo_set_source_rgba (cr, fg.get_red_p(), fg.get_green_p(), fg.get_blue_p(), 1.0); cairo_select_font_face (cr, font.get_family().c_str(), CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); cairo_set_font_size (cr, font.get_size() / Pango::SCALE); cairo_text_extents (cr, name.c_str(), &te); - + cairo_move_to (cr, 0.5, int (0.5 - te.height / 2 - te.y_bearing + clip_height / 2)); cairo_show_text (cr, name.c_str()); - + convert_bgra_to_rgba(cairo_image_surface_get_data (surface), buf->get_pixels(), clip_width, clip_height); cairo_destroy(cr); @@ -765,10 +765,10 @@ Gtkmm2ext::fit_to_pixels (const string& str, int pixel_width, Pango::FontDescrip /* XXX: might need special care to get the ellipsis character, not sure how that works - */ + */ string s = string (layout->get_text ().substr(line->get_start_index(), line->get_length())); - + cerr << "fit to pixels of " << str << " returns " << s << endl; return s; diff --git a/libs/gtkmm2ext/window_title.cc b/libs/gtkmm2ext/window_title.cc index 11342ab1d7..eaf25a9f74 100644 --- a/libs/gtkmm2ext/window_title.cc +++ b/libs/gtkmm2ext/window_title.cc @@ -24,7 +24,7 @@ using namespace std; namespace { - + // I don't know if this should be translated. const char* const title_separator = X_(" - "); |