diff options
Diffstat (limited to 'libs/gtkmm2ext')
82 files changed, 311 insertions, 311 deletions
diff --git a/libs/gtkmm2ext/actions.cc b/libs/gtkmm2ext/actions.cc index 60ca2f0910..a4c8be1774 100644 --- a/libs/gtkmm2ext/actions.cc +++ b/libs/gtkmm2ext/actions.cc @@ -303,9 +303,9 @@ ActionManager::save_action_states () GList* acts; for (node = list; node; node = g_list_next (node)) { - + GtkActionGroup* group = (GtkActionGroup*) node->data; - + for (acts = gtk_action_group_list_actions (group); acts; acts = g_list_next (acts)) { GtkAction* action = (GtkAction*) acts->data; action_states_to_restore.push_back (ActionState (action, gtk_action_get_sensitive (action))); @@ -531,7 +531,7 @@ ActionManager::get_key_representation (const string& accel_path, AccelKey& key) 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/application.cc b/libs/gtkmm2ext/application.cc index eb1cea1b5f..7292928855 100644 --- a/libs/gtkmm2ext/application.cc +++ b/libs/gtkmm2ext/application.cc @@ -1,4 +1,4 @@ -/* GTK+ Integration with platform-specific application-wide features +/* GTK+ Integration with platform-specific application-wide features * such as the OS X menubar and application delegate concepts. * * Copyright (C) 2007 Pioneer Research Center USA, Inc. diff --git a/libs/gtkmm2ext/binding_proxy.cc b/libs/gtkmm2ext/binding_proxy.cc index bf21c19bce..87473adcd2 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 () @@ -76,7 +76,7 @@ BindingProxy::is_bind_action (GdkEventButton *ev) bool BindingProxy::button_press_handler (GdkEventButton *ev) { - if ( controllable && is_bind_action(ev) ) { + if ( controllable && is_bind_action(ev) ) { if (Controllable::StartLearning (controllable.get())) { string prompt = _("operate controller now"); if (prompter == 0) { diff --git a/libs/gtkmm2ext/bindings.cc b/libs/gtkmm2ext/bindings.cc index 7e0b528d27..788f26751f 100644 --- a/libs/gtkmm2ext/bindings.cc +++ b/libs/gtkmm2ext/bindings.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -40,7 +40,7 @@ uint32_t Bindings::_ignored_state = 0; MouseButton::MouseButton (uint32_t state, uint32_t keycode) { uint32_t ignore = Bindings::ignored_state(); - + if (gdk_keyval_is_upper (keycode) && gdk_keyval_is_lower (keycode)) { /* key is not subject to case, so ignore SHIFT */ @@ -75,7 +75,7 @@ MouseButton::make_button (const string& str, MouseButton& b) string::size_type lastmod = str.find_last_of ('-'); uint32_t button_number; - + if (lastmod == string::npos) { button_number = PBD::atoi (str); } else { @@ -90,12 +90,12 @@ string MouseButton::name () const { int s = state(); - + string str; if (s & Keyboard::PrimaryModifier) { str += "Primary"; - } + } if (s & Keyboard::SecondaryModifier) { if (!str.empty()) { str += '-'; @@ -107,14 +107,14 @@ MouseButton::name () const str += '-'; } str += "Tertiary"; - } + } if (s & Keyboard::Level4Modifier) { if (!str.empty()) { str += '-'; } str += "Level4"; } - + if (!str.empty()) { str += '-'; } @@ -129,7 +129,7 @@ MouseButton::name () const KeyboardKey::KeyboardKey (uint32_t state, uint32_t keycode) { uint32_t ignore = Bindings::ignored_state(); - + if (gdk_keyval_is_upper (keycode) && gdk_keyval_is_lower (keycode)) { /* key is not subject to case, so ignore SHIFT */ @@ -146,12 +146,12 @@ string KeyboardKey::name () const { int s = state(); - + string str; if (s & Keyboard::PrimaryModifier) { str += "Primary"; - } + } if (s & Keyboard::SecondaryModifier) { if (!str.empty()) { str += '-'; @@ -163,14 +163,14 @@ KeyboardKey::name () const str += '-'; } str += "Tertiary"; - } + } if (s & Keyboard::Level4Modifier) { if (!str.empty()) { str += '-'; } str += "Level4"; } - + if (!str.empty()) { str += '-'; } @@ -323,7 +323,7 @@ Bindings::activate (MouseButton bb, Operation op) } MouseButtonBindingMap::iterator b = bbm->find (bb); - + if (b == bbm->end()) { /* no entry for this key in the state map */ return false; @@ -373,7 +373,7 @@ Bindings::remove (MouseButton bb, Operation op) bbm = &button_release_bindings; break; } - + MouseButtonBindingMap::iterator b = bbm->find (bb); if (b != bbm->end()) { @@ -387,7 +387,7 @@ Bindings::save (const string& path) XMLTree tree; XMLNode* root = new XMLNode (X_("Bindings")); tree.set_root (root); - + save (*root); if (!tree.write (path)) { @@ -457,7 +457,7 @@ Bindings::load (const string& path) if (!tree.read (path)) { return false; } - + press_bindings.clear (); release_bindings.clear (); @@ -475,27 +475,27 @@ void Bindings::load (const XMLNode& node) { if (node.name() == X_("Press") || node.name() == X_("Release")) { - + Operation op; - + if (node.name() == X_("Press")) { op = Press; } else { op = Release; } - + const XMLNodeList& children (node.children()); - + for (XMLNodeList::const_iterator p = children.begin(); p != children.end(); ++p) { - + XMLProperty* ap; XMLProperty* kp; XMLProperty* bp; - + ap = (*p)->property ("action"); kp = (*p)->property ("key"); bp = (*p)->property ("button"); - + if (!ap || (!kp && !bp)) { continue; } @@ -504,7 +504,7 @@ Bindings::load (const XMLNode& node) if (action_map) { act = action_map->find_action (ap->value()); - } + } if (!act) { string::size_type slash = ap->value().find ('/'); @@ -514,11 +514,11 @@ Bindings::load (const XMLNode& node) act = ActionManager::get_action (group.c_str(), action.c_str()); } } - + if (!act) { continue; } - + if (kp) { KeyboardKey k; if (!KeyboardKey::make_key (kp->value(), k)) { @@ -534,7 +534,7 @@ Bindings::load (const XMLNode& node) } } } -} +} RefPtr<Action> ActionMap::find_action (const string& name) @@ -548,7 +548,7 @@ ActionMap::find_action (const string& name) return RefPtr<Action>(); } -RefPtr<Action> +RefPtr<Action> ActionMap::register_action (const char* path, const char* name, const char* label, sigc::slot<void> sl) { @@ -566,9 +566,9 @@ ActionMap::register_action (const char* path, return act; } -RefPtr<Action> +RefPtr<Action> ActionMap::register_radio_action (const char* path, Gtk::RadioAction::Group& rgroup, - const char* name, const char* label, + const char* name, const char* label, sigc::slot<void,GtkAction*> sl, int value) { @@ -588,7 +588,7 @@ ActionMap::register_radio_action (const char* path, Gtk::RadioAction::Group& rgr return act; } -RefPtr<Action> +RefPtr<Action> ActionMap::register_toggle_action (const char* path, const char* name, const char* label, sigc::slot<void> sl) { diff --git a/libs/gtkmm2ext/cairo_packer.cc b/libs/gtkmm2ext/cairo_packer.cc index c701a9aca9..d9449ebb6b 100644 --- a/libs/gtkmm2ext/cairo_packer.cc +++ b/libs/gtkmm2ext/cairo_packer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libs/gtkmm2ext/cairocell.cc b/libs/gtkmm2ext/cairocell.cc index c449cae592..4a6056e192 100644 --- a/libs/gtkmm2ext/cairocell.cc +++ b/libs/gtkmm2ext/cairocell.cc @@ -82,7 +82,7 @@ CairoFontDescription::CairoFontDescription (Pango::FontDescription& fd) } face = fd.get_family(); -} +} CairoCell::CairoCell (int32_t id) : _id (id) @@ -147,7 +147,7 @@ CairoTextCell::set_size (Cairo::RefPtr<Cairo::Context>& context) for (int digit = 0; digit < 10; digit++) { for (n = 0; n < lim; ++n) { - buf[n] = '0' + digit; + buf[n] = '0' + digit; } context->get_text_extents (&buf[0], ext); diff --git a/libs/gtkmm2ext/cell_renderer_color_selector.cc b/libs/gtkmm2ext/cell_renderer_color_selector.cc index 1dd163685e..62419b423d 100644 --- a/libs/gtkmm2ext/cell_renderer_color_selector.cc +++ b/libs/gtkmm2ext/cell_renderer_color_selector.cc @@ -1,6 +1,6 @@ /* Copyright (C) 2011 Paul Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -54,13 +54,13 @@ CellRendererColorSelector::~CellRendererColorSelector () { } -Glib::PropertyProxy<Gdk::Color> +Glib::PropertyProxy<Gdk::Color> CellRendererColorSelector::property_color() { return _property_color.get_proxy(); -} +} -void +void CellRendererColorSelector::render_vfunc (const Glib::RefPtr<Gdk::Drawable>& window, Gtk::Widget& /*widget*/, const Gdk::Rectangle& /*background_area*/, const Gdk::Rectangle& cell_area, const Gdk::Rectangle& expose_area, Gtk::CellRendererState /*flags*/) { Gdk::Color c = _property_color.get_value(); diff --git a/libs/gtkmm2ext/cell_renderer_pixbuf_multi.cc b/libs/gtkmm2ext/cell_renderer_pixbuf_multi.cc index feb445a108..c5c9eb98b0 100644 --- a/libs/gtkmm2ext/cell_renderer_pixbuf_multi.cc +++ b/libs/gtkmm2ext/cell_renderer_pixbuf_multi.cc @@ -1,6 +1,6 @@ /* Copyright (C) 2009 Paul Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -30,7 +30,7 @@ using namespace Glib; using namespace Gtkmm2ext; -CellRendererPixbufMulti::CellRendererPixbufMulti() : +CellRendererPixbufMulti::CellRendererPixbufMulti() : Glib::ObjectBase( typeid(CellRendererPixbufMulti) ), Gtk::CellRenderer(), property_state_(*this, "active", 0) @@ -41,27 +41,27 @@ CellRendererPixbufMulti::CellRendererPixbufMulti() : property_sensitive() = false; } -Glib::PropertyProxy<uint32_t> +Glib::PropertyProxy<uint32_t> CellRendererPixbufMulti::property_state() { return property_state_.get_proxy(); -} +} -// Overridden methods of the parent CellRenderer -Glib::PropertyProxy_Base +// Overridden methods of the parent CellRenderer +Glib::PropertyProxy_Base CellRendererPixbufMulti::_property_renderable() { return property_state(); -} +} -bool +bool CellRendererPixbufMulti::activate_vfunc(GdkEvent*, Gtk::Widget&, const Glib::ustring& path, const Gdk::Rectangle&, const Gdk::Rectangle&, Gtk::CellRendererState) { signal_changed_(path); return true; } -void +void CellRendererPixbufMulti::render_vfunc (const Glib::RefPtr<Gdk::Drawable>& window, Gtk::Widget& /*widget*/, const Gdk::Rectangle& /*background_area*/, const Gdk::Rectangle& cell_area, const Gdk::Rectangle& /*expose_area*/, Gtk::CellRendererState /*flags*/) { int offset_width = 0; @@ -74,7 +74,7 @@ CellRendererPixbufMulti::render_vfunc (const Glib::RefPtr<Gdk::Drawable>& window window->draw_pixbuf (RefPtr<GC>(), pb, 0, 0, offset_width, offset_height, -1, -1, Gdk::RGB_DITHER_NORMAL, 0, 0); } -void +void CellRendererPixbufMulti::get_size_vfunc (Gtk::Widget& /*widget*/, const Gdk::Rectangle* /*cell_area*/, int* /*x_offset*/, int* /*y_offset*/, int* /*width*/, int* /*height*/) const { } @@ -84,7 +84,7 @@ CellRendererPixbufMulti::set_pixbuf(uint32_t which, Glib::RefPtr<Gdk::Pixbuf> pi _pixbufs[which] = pixbuf; } -CellRendererPixbufMulti::SignalChanged& +CellRendererPixbufMulti::SignalChanged& CellRendererPixbufMulti::signal_changed() { return signal_changed_; diff --git a/libs/gtkmm2ext/cell_renderer_pixbuf_toggle.cc b/libs/gtkmm2ext/cell_renderer_pixbuf_toggle.cc index 15cd1cbf1a..9fefbfb88e 100644 --- a/libs/gtkmm2ext/cell_renderer_pixbuf_toggle.cc +++ b/libs/gtkmm2ext/cell_renderer_pixbuf_toggle.cc @@ -1,6 +1,6 @@ /* Copyright (C) 2009 Paul Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -30,7 +30,7 @@ using namespace Glib; using namespace Gtkmm2ext; -CellRendererPixbufToggle::CellRendererPixbufToggle() : +CellRendererPixbufToggle::CellRendererPixbufToggle() : Glib::ObjectBase( typeid(CellRendererPixbufToggle) ), Gtk::CellRenderer(), property_pixbuf_(*this, "pixbuf"), @@ -42,26 +42,26 @@ CellRendererPixbufToggle::CellRendererPixbufToggle() : property_sensitive() = false; } -Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > +Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > CellRendererPixbufToggle::property_pixbuf() { return property_pixbuf_.get_proxy(); -} +} -Glib::PropertyProxy<bool> +Glib::PropertyProxy<bool> CellRendererPixbufToggle::property_active() { return property_active_.get_proxy(); -} +} -// Overridden methods of the parent CellRenderer -Glib::PropertyProxy_Base +// Overridden methods of the parent CellRenderer +Glib::PropertyProxy_Base CellRendererPixbufToggle::_property_renderable() { return property_pixbuf(); -} +} -bool +bool CellRendererPixbufToggle::activate_vfunc(GdkEvent*, Gtk::Widget&, const Glib::ustring& path, const Gdk::Rectangle&, const Gdk::Rectangle&, Gtk::CellRendererState) { signal_toggled_(path); @@ -70,7 +70,7 @@ CellRendererPixbufToggle::activate_vfunc(GdkEvent*, Gtk::Widget&, const Glib::us -void +void CellRendererPixbufToggle::render_vfunc (const Glib::RefPtr<Gdk::Drawable>& window, Gtk::Widget& /*widget*/, const Gdk::Rectangle& /*background_area*/, const Gdk::Rectangle& cell_area, const Gdk::Rectangle& /*expose_area*/, Gtk::CellRendererState /*flags*/) { int offset_width = 0; @@ -91,7 +91,7 @@ CellRendererPixbufToggle::render_vfunc (const Glib::RefPtr<Gdk::Drawable>& windo } } -void +void CellRendererPixbufToggle::get_size_vfunc (Gtk::Widget& /*widget*/, const Gdk::Rectangle* /*cell_area*/, int* /*x_offset*/, int* /*y_offset*/, int* /*width*/, int* /*height*/) const { //cerr << "cell_renderer_pixbuf_toggle get_size" << endl; @@ -108,7 +108,7 @@ CellRendererPixbufToggle::set_inactive_pixbuf(Glib::RefPtr<Gdk::Pixbuf> pixbuf){ inactive_pixbuf = pixbuf; } -CellRendererPixbufToggle::SignalToggled& +CellRendererPixbufToggle::SignalToggled& CellRendererPixbufToggle::signal_toggled() { return signal_toggled_; diff --git a/libs/gtkmm2ext/choice.cc b/libs/gtkmm2ext/choice.cc index 363942eab7..4cce090bcc 100644 --- a/libs/gtkmm2ext/choice.cc +++ b/libs/gtkmm2ext/choice.cc @@ -1,6 +1,6 @@ /* Copyright (C) 1998-99 Paul Barton-Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/libs/gtkmm2ext/click_box.cc b/libs/gtkmm2ext/click_box.cc index 7b2e67d8ab..8782acaae8 100644 --- a/libs/gtkmm2ext/click_box.cc +++ b/libs/gtkmm2ext/click_box.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 1999 Paul Barton-Davis + Copyright (C) 1999 Paul Barton-Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -115,7 +115,7 @@ ClickBox::set_label () void ClickBox::style_changed (const Glib::RefPtr<Gtk::Style>&) { - layout->context_changed (); + layout->context_changed (); layout->get_pixel_size (twidth, theight); } diff --git a/libs/gtkmm2ext/dndtreeview.cc b/libs/gtkmm2ext/dndtreeview.cc index 179423f203..06d17fce40 100644 --- a/libs/gtkmm2ext/dndtreeview.cc +++ b/libs/gtkmm2ext/dndtreeview.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -65,7 +65,7 @@ DnDTreeViewBase::add_object_drag (int column, string type_name) enable_model_drag_dest (draggable); } -bool +bool DnDTreeViewBase::on_drag_drop(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint time) { suggested_action = Gdk::DragAction (0); diff --git a/libs/gtkmm2ext/fader.cc b/libs/gtkmm2ext/fader.cc index 0fedd33696..a899e5906a 100755..100644 --- a/libs/gtkmm2ext/fader.cc +++ b/libs/gtkmm2ext/fader.cc @@ -46,23 +46,23 @@ static void get_closest_point_on_line(double xa, double ya, double xb, double yb // Storing vector A->B double a_to_b_x = xb - xa; double a_to_b_y = yb - ya; - + // Storing vector A->P double a_to_p_x = xp - xa; double a_to_p_y = yp - ya; - + // Basically finding the squared magnitude // of a_to_b double atb2 = a_to_b_x * a_to_b_x + a_to_b_y * a_to_b_y; - + // The dot product of a_to_p and a_to_b double atp_dot_atb = a_to_p_x * a_to_b_x + a_to_p_y * a_to_b_y; - + // The normalized "distance" from a to // your closest point double t = atp_dot_atb / atb2; - + // Add the distance to A, moving // towards B double x = xa + a_to_b_x * t; @@ -116,7 +116,7 @@ Fader::Fader (Gtk::Adjustment& adj, const Glib::RefPtr<Gdk::Pixbuf>& underlay_pixbuf, const Glib::RefPtr<Gdk::Pixbuf>& handle_pixbuf, const Glib::RefPtr<Gdk::Pixbuf>& active_handle_pixbuf, - int min_pos_x, + int min_pos_x, int min_pos_y, int max_pos_x, int max_pos_y, @@ -208,8 +208,8 @@ Fader::render (cairo_t* cr, cairo_rectangle_t*) } gdk_cairo_set_source_pixbuf (cr, - ((get_state () == Gtk::STATE_ACTIVE) && (_active_face_pixbuf != 0)) ? - _active_face_pixbuf->gobj() : + ((get_state () == Gtk::STATE_ACTIVE) && (_active_face_pixbuf != 0)) ? + _active_face_pixbuf->gobj() : _face_pixbuf->gobj(), 0, 0); @@ -241,11 +241,11 @@ bool Fader::on_button_press_event (GdkEventButton* ev) { focus_handler(); - + if (_read_only) { return false; } - + if (ev->type != GDK_BUTTON_PRESS) { return false; } @@ -273,12 +273,12 @@ Fader::on_button_press_event (GdkEventButton* ev) if ((ev->x < (_grab_start_handle_x - hw/2)) || (ev->x > (_grab_start_handle_x + hw/2)) || (ev->y < (_grab_start_handle_y - hh/2)) || (ev->y > (_grab_start_handle_y + hh/2))) { return false; } - + 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, + _max_pos_x, _max_pos_y, ev->x, ev->y, ev_pos_x, ev_pos_y ); add_modal_grab (); @@ -375,7 +375,7 @@ Fader::on_motion_notify_event (GdkEventMotion* ev) } get_closest_point_on_line(_min_pos_x, _min_pos_y, - _max_pos_x, _max_pos_y, + _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 ); diff --git a/libs/gtkmm2ext/focus_entry.cc b/libs/gtkmm2ext/focus_entry.cc index 706fc28e2f..a005fcf205 100644 --- a/libs/gtkmm2ext/focus_entry.cc +++ b/libs/gtkmm2ext/focus_entry.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ FocusEntry::FocusEntry () next_release_selects = false; } -bool +bool FocusEntry::on_button_press_event (GdkEventButton* ev) { if (!has_focus()) { @@ -35,7 +35,7 @@ FocusEntry::on_button_press_event (GdkEventButton* ev) return Entry::on_button_press_event (ev); } -bool +bool FocusEntry::on_button_release_event (GdkEventButton* ev) { if (next_release_selects) { @@ -43,7 +43,7 @@ FocusEntry::on_button_release_event (GdkEventButton* ev) select_region (0, -1); next_release_selects = false; return ret; - } + } return Entry::on_button_release_event (ev); } diff --git a/libs/gtkmm2ext/grouped_buttons.cc b/libs/gtkmm2ext/grouped_buttons.cc index cd45840a04..e9d2c1c422 100644 --- a/libs/gtkmm2ext/grouped_buttons.cc +++ b/libs/gtkmm2ext/grouped_buttons.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2001 Paul Davis + Copyright (C) 2001 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -51,7 +51,7 @@ GroupedButtons::GroupedButtons (uint32_t nbuttons, uint32_t first_active) if (n == current_active) { button->set_active (true); - } + } button->signal_clicked().connect (sigc::bind (mem_fun (*this, &GroupedButtons::one_clicked), n)); buttons.push_back (button); diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc index c4df2b7d5c..d06e60ccd6 100644 --- a/libs/gtkmm2ext/gtk_ui.cc +++ b/libs/gtkmm2ext/gtk_ui.cc @@ -71,7 +71,7 @@ UI::UI (string namestr, int *argc, char ***argv) : AbstractUI<UIRequest> (namestr) , _receiver (*this) , errors (0) - + { theMain = new Main (argc, argv); @@ -142,7 +142,7 @@ UI::load_rcfile (string path, bool themechange) /* Yes, pointers to Glib::RefPtr. If these are not kept around, * a segfault somewhere deep in the wonderfully robust glib will result. * This does not occur if wiget.get_style is used instead of rc.get_style below, - * except that doesn't actually work... + * except that doesn't actually work... */ static Glib::RefPtr<Style>* fatal_style = 0; diff --git a/libs/gtkmm2ext/gtkapplication.c b/libs/gtkmm2ext/gtkapplication.c index c0eb36a07d..d0ff659690 100644 --- a/libs/gtkmm2ext/gtkapplication.c +++ b/libs/gtkmm2ext/gtkapplication.c @@ -1,4 +1,4 @@ -/* GTK+ Integration with platform-specific application-wide features +/* GTK+ Integration with platform-specific application-wide features * such as the OS X menubar and application delegate concepts. * * Copyright (C) 2007 Pioneer Research Center USA, Inc. diff --git a/libs/gtkmm2ext/gtkapplication_win32.c b/libs/gtkmm2ext/gtkapplication_win32.c index 7dd9db4a8d..0aef0fe90a 100644 --- a/libs/gtkmm2ext/gtkapplication_win32.c +++ b/libs/gtkmm2ext/gtkapplication_win32.c @@ -1,4 +1,4 @@ -/* GTK+ Integration with platform-specific application-wide features +/* GTK+ Integration with platform-specific application-wide features * such as the OS X menubar and application delegate concepts (for X11) * * Copyright (C) 2007 Pioneer Research Center USA, Inc. @@ -23,7 +23,7 @@ #include <gtkmm2ext/gtkapplication.h> -int +int gtk_application_init (void) { return 0; @@ -33,12 +33,12 @@ void gtk_application_cleanup (void) { } -void +void gtk_application_set_menu_bar (GtkMenuShell* menushell) { } -void +void gtk_application_add_app_menu_item (GtkApplicationMenuGroup* group, GtkMenuItem* item) { } diff --git a/libs/gtkmm2ext/gtkapplication_x11.c b/libs/gtkmm2ext/gtkapplication_x11.c index 6cf1055c5c..615f48f6d6 100644 --- a/libs/gtkmm2ext/gtkapplication_x11.c +++ b/libs/gtkmm2ext/gtkapplication_x11.c @@ -1,4 +1,4 @@ -/* GTK+ Integration with platform-specific application-wide features +/* GTK+ Integration with platform-specific application-wide features * such as the OS X menubar and application delegate concepts (for X11) * * Copyright (C) 2007 Pioneer Research Center USA, Inc. @@ -23,7 +23,7 @@ #include <gtkmm2ext/gtkapplication.h> -int +int gtk_application_init (void) { return 0; @@ -33,13 +33,13 @@ void gtk_application_cleanup (void) { } -void +void gtk_application_set_menu_bar (GtkMenuShell* menushell) { (void) menushell; } -void +void gtk_application_add_app_menu_item (GtkApplicationMenuGroup* group, GtkMenuItem* item) { (void) group; diff --git a/libs/gtkmm2ext/gtkmm2ext/actions.h b/libs/gtkmm2ext/gtkmm2ext/actions.h index 9ed1480546..0336fde242 100644 --- a/libs/gtkmm2ext/gtkmm2ext/actions.h +++ b/libs/gtkmm2ext/gtkmm2ext/actions.h @@ -93,7 +93,7 @@ namespace ActionManager { LIBGTKMM2EXT_API extern void uncheck_toggleaction (std::string); LIBGTKMM2EXT_API extern void set_toggleaction_state (std::string, bool); - + LIBGTKMM2EXT_API extern void save_action_states (); LIBGTKMM2EXT_API extern void enable_active_actions (); LIBGTKMM2EXT_API extern void disable_active_actions (); diff --git a/libs/gtkmm2ext/gtkmm2ext/application.h b/libs/gtkmm2ext/gtkmm2ext/application.h index e66b6ea2ff..65c4731ce0 100644 --- a/libs/gtkmm2ext/gtkmm2ext/application.h +++ b/libs/gtkmm2ext/gtkmm2ext/application.h @@ -1,4 +1,4 @@ -/* GTK+ Integration with platform-specific application-wide features +/* GTK+ Integration with platform-specific application-wide features * such as the OS X menubar and application delegate concepts. * * Copyright (C) 2009 Paul Davis @@ -38,7 +38,7 @@ namespace Glib { namespace Gtkmm2ext { -class LIBGTKMM2EXT_API Application +class LIBGTKMM2EXT_API Application { public: static Application* instance(); diff --git a/libs/gtkmm2ext/gtkmm2ext/auto_spin.h b/libs/gtkmm2ext/gtkmm2ext/auto_spin.h index 0f5a9467c6..70aedbe50e 100644 --- a/libs/gtkmm2ext/gtkmm2ext/auto_spin.h +++ b/libs/gtkmm2ext/gtkmm2ext/auto_spin.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Barton-Davis + Copyright (C) 2000 Paul Barton-Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -30,7 +30,7 @@ namespace Gtkmm2ext { -class LIBGTKMM2EXT_API AutoSpin +class LIBGTKMM2EXT_API AutoSpin { public: diff --git a/libs/gtkmm2ext/gtkmm2ext/barcontroller.h b/libs/gtkmm2ext/gtkmm2ext/barcontroller.h index 3db3a275a8..ce10411a2c 100644 --- a/libs/gtkmm2ext/gtkmm2ext/barcontroller.h +++ b/libs/gtkmm2ext/gtkmm2ext/barcontroller.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 Paul Davis + Copyright (C) 2004 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/libs/gtkmm2ext/gtkmm2ext/bindings.h b/libs/gtkmm2ext/gtkmm2ext/bindings.h index 5c8ca44f9b..5277fd772d 100644 --- a/libs/gtkmm2ext/gtkmm2ext/bindings.h +++ b/libs/gtkmm2ext/gtkmm2ext/bindings.h @@ -21,12 +21,12 @@ class LIBGTKMM2EXT_API KeyboardKey KeyboardKey () { _val = GDK_VoidSymbol; } - + KeyboardKey (uint32_t state, uint32_t keycode); - + uint32_t state() const { return _val >> 32; } uint32_t key() const { return _val & 0xffff; } - + bool operator<(const KeyboardKey& other) const { return _val < other._val; } @@ -75,7 +75,7 @@ class LIBGTKMM2EXT_API ActionMap { Glib::RefPtr<Gtk::Action> register_action (const char* path, const char* name, const char* label, sigc::slot<void> sl); Glib::RefPtr<Gtk::Action> register_radio_action (const char* path, Gtk::RadioAction::Group&, - const char* name, const char* label, + const char* name, const char* label, sigc::slot<void,GtkAction*> sl, int value); Glib::RefPtr<Gtk::Action> register_toggle_action (const char*path, @@ -86,15 +86,15 @@ class LIBGTKMM2EXT_API ActionMap { private: typedef std::map<std::string, Glib::RefPtr<Gtk::Action> > _ActionMap; _ActionMap actions; -}; +}; class LIBGTKMM2EXT_API Bindings { public: - enum Operation { + enum Operation { Press, Release }; - + Bindings(); ~Bindings (); @@ -110,7 +110,7 @@ class LIBGTKMM2EXT_API Bindings { void load (const XMLNode& node); bool save (const std::string& path); void save (XMLNode& root); - + void set_action_map (ActionMap&); static void set_ignored_state (int mask) { diff --git a/libs/gtkmm2ext/gtkmm2ext/cairo_packer.h b/libs/gtkmm2ext/gtkmm2ext/cairo_packer.h index 519720dccf..74f61308a7 100644 --- a/libs/gtkmm2ext/gtkmm2ext/cairo_packer.h +++ b/libs/gtkmm2ext/gtkmm2ext/cairo_packer.h @@ -5,7 +5,7 @@ #include "gtkmm2ext/visibility.h" -class LIBGTKMM2EXT_API CairoPacker +class LIBGTKMM2EXT_API CairoPacker { public: CairoPacker () {} diff --git a/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h b/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h index 036160ab14..436dc0382d 100644 --- a/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h +++ b/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h @@ -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. @@ -89,7 +89,7 @@ public: However, derived types can override the behaviour by defining their own on_button_press_event() handler which returns true under all - conditions (which will block this handler from being called). If + conditions (which will block this handler from being called). If they wish to invoke any existing focus handler from their own button press handler, they can just use: focus_handler(); */ diff --git a/libs/gtkmm2ext/gtkmm2ext/cairocell.h b/libs/gtkmm2ext/gtkmm2ext/cairocell.h index 60a6f743d1..a061672fb8 100644 --- a/libs/gtkmm2ext/gtkmm2ext/cairocell.h +++ b/libs/gtkmm2ext/gtkmm2ext/cairocell.h @@ -244,7 +244,7 @@ private: CairoCell* find_cell (uint32_t x, uint32_t y); void queue_draw_cell (CairoCell* target); void position_cells_and_get_bbox (GdkRectangle&); - void set_cell_sizes (); + void set_cell_sizes (); }; #endif /* __libgtmm2ext_cairocell_h__ */ diff --git a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_color_selector.h b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_color_selector.h index 1360da4c50..38076baacc 100644 --- a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_color_selector.h +++ b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_color_selector.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2011 Paul Davis + Copyright (C) 2011 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ */ -#ifndef __gtkmm2ext_cell_renderer_color_selector_h__ +#ifndef __gtkmm2ext_cell_renderer_color_selector_h__ #define __gtkmm2ext_cell_renderer_color_selector_h__ #include <gtkmm/drawingarea.h> @@ -38,7 +38,7 @@ namespace Gtkmm2ext { class LIBGTKMM2EXT_API CellRendererColorSelector : public Gtk::CellRenderer { public: - CellRendererColorSelector(); + CellRendererColorSelector(); virtual ~CellRendererColorSelector(); virtual void render_vfunc (const Glib::RefPtr<Gdk::Drawable>& window, Gtk::Widget& widget, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, const Gdk::Rectangle& expose_area, Gtk::CellRendererState flags); diff --git a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h index 5e763edefd..e84a635fa0 100644 --- a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h +++ b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2009 Paul Davis + Copyright (C) 2000-2009 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ */ -#ifndef __gtkmm2ext_cell_renderer_pixbuf_multi_h__ +#ifndef __gtkmm2ext_cell_renderer_pixbuf_multi_h__ #define __gtkmm2ext_cell_renderer_pixbuf_multi_h__ #include <map> @@ -39,7 +39,7 @@ class LIBGTKMM2EXT_API CellRendererPixbufMulti : public Gtk::CellRenderer { public: - CellRendererPixbufMulti(); + CellRendererPixbufMulti(); virtual ~CellRendererPixbufMulti(){}; virtual void render_vfunc (const Glib::RefPtr<Gdk::Drawable>& window, Gtk::Widget& widget, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, const Gdk::Rectangle& expose_area, Gtk::CellRendererState flags); @@ -59,9 +59,9 @@ class LIBGTKMM2EXT_API CellRendererPixbufMulti : public Gtk::CellRenderer SignalChanged& signal_changed(); protected: - + private: - Glib::Property<uint32_t> property_state_; + Glib::Property<uint32_t> property_state_; std::map<uint32_t,Glib::RefPtr<Gdk::Pixbuf> > _pixbufs; diff --git a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h index e8ee448755..30171dd692 100644 --- a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h +++ b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2009 Paul Davis + Copyright (C) 2000-2009 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ */ -#ifndef __gtkmm2ext_cell_renderer_pixbuf_toggle_h__ +#ifndef __gtkmm2ext_cell_renderer_pixbuf_toggle_h__ #define __gtkmm2ext_cell_renderer_pixbuf_toggle_h__ #include <gtkmm/drawingarea.h> @@ -36,7 +36,7 @@ class LIBGTKMM2EXT_API CellRendererPixbufToggle : public Gtk::CellRenderer { public: - CellRendererPixbufToggle(); + CellRendererPixbufToggle(); virtual ~CellRendererPixbufToggle(){}; virtual void render_vfunc (const Glib::RefPtr<Gdk::Drawable>& window, Gtk::Widget& widget, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, const Gdk::Rectangle& expose_area, Gtk::CellRendererState flags); @@ -58,10 +58,10 @@ class LIBGTKMM2EXT_API CellRendererPixbufToggle : public Gtk::CellRenderer SignalToggled& signal_toggled(); protected: - + private: - Glib::Property< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_; - Glib::Property<bool> property_active_; + 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/choice.h b/libs/gtkmm2ext/gtkmm2ext/choice.h index df6a90dd30..3a888f2b9d 100644 --- a/libs/gtkmm2ext/gtkmm2ext/choice.h +++ b/libs/gtkmm2ext/gtkmm2ext/choice.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libs/gtkmm2ext/gtkmm2ext/click_box.h b/libs/gtkmm2ext/gtkmm2ext/click_box.h index 3b7fd0f498..5c56a1b3e8 100644 --- a/libs/gtkmm2ext/gtkmm2ext/click_box.h +++ b/libs/gtkmm2ext/gtkmm2ext/click_box.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999 Paul Barton-Davis + Copyright (C) 1999 Paul Barton-Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libs/gtkmm2ext/gtkmm2ext/cursors.h b/libs/gtkmm2ext/gtkmm2ext/cursors.h index 10874b6dbd..8c0a975615 100644 --- a/libs/gtkmm2ext/gtkmm2ext/cursors.h +++ b/libs/gtkmm2ext/gtkmm2ext/cursors.h @@ -27,7 +27,7 @@ namespace Gtkmm2ext { -class LIBGTKMM2EXT_API CursorInfo +class LIBGTKMM2EXT_API CursorInfo { public: static CursorInfo* lookup_cursor_info (const std::string& image_name); @@ -40,7 +40,7 @@ class LIBGTKMM2EXT_API CursorInfo private: CursorInfo (const std::string& image_name, int hotspot_x, int hotspot_y); - + typedef std::map<std::string,CursorInfo*> Infos; static Infos infos; }; diff --git a/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h b/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h index d82688c9c2..dd58f77a4c 100644 --- a/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h +++ b/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -38,7 +38,7 @@ struct /*LIBGTKMM2EXT_API*/ SerializedObjectPointers { DataType data[0]; }; -class LIBGTKMM2EXT_API DnDTreeViewBase : public Gtk::TreeView +class LIBGTKMM2EXT_API DnDTreeViewBase : public Gtk::TreeView { private: public: @@ -92,7 +92,7 @@ template<class DataType> class /*LIBGTKMM2EXT_API*/ DnDTreeView : public DnDTreeViewBase { public: - DnDTreeView() {} + DnDTreeView() {} ~DnDTreeView() {} sigc::signal<void,const std::list<DataType>&,Gtk::TreeView*,int,int,Glib::RefPtr<Gdk::DragContext>&> signal_drop; @@ -171,5 +171,5 @@ class /*LIBGTKMM2EXT_API*/ DnDTreeView : public DnDTreeViewBase }; } // namespace - + #endif /* __gtkmm2ext_dndtreeview_h__ */ diff --git a/libs/gtkmm2ext/gtkmm2ext/dndvbox.h b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h index 9ea93262fe..940a72859e 100644 --- a/libs/gtkmm2ext/gtkmm2ext/dndvbox.h +++ b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Paul Davis + Copyright (C) 2009 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -118,7 +118,7 @@ public: return _selection; } - /** Set the `active' child; this is simply a child which is set to have the + /** Set the `active' child; this is simply a child which is set to have the * visual state "active" for whatever purposes the client may have. * @param c Child, or 0 for none. */ diff --git a/libs/gtkmm2ext/gtkmm2ext/doi.h b/libs/gtkmm2ext/gtkmm2ext/doi.h index bdd83ad3e9..d1d653c85e 100644 --- a/libs/gtkmm2ext/gtkmm2ext/doi.h +++ b/libs/gtkmm2ext/gtkmm2ext/doi.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002 Paul Davis + Copyright (C) 2002 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libs/gtkmm2ext/gtkmm2ext/emscale.h b/libs/gtkmm2ext/gtkmm2ext/emscale.h index 15f32a7d70..97e187adaa 100644 --- a/libs/gtkmm2ext/gtkmm2ext/emscale.h +++ b/libs/gtkmm2ext/gtkmm2ext/emscale.h @@ -26,7 +26,7 @@ #include "gtkmm2ext/visibility.h" -namespace Gtkmm2ext +namespace Gtkmm2ext { class LIBGTKMM2EXT_API EmScale @@ -51,6 +51,6 @@ class LIBGTKMM2EXT_API EmScale static std::map<std::string,EmScale> _emscales; }; -} // namespace +} // namespace #endif /* __libgtkmm2ext_emscale_h__ */ diff --git a/libs/gtkmm2ext/gtkmm2ext/fader.h b/libs/gtkmm2ext/gtkmm2ext/fader.h index 84175d5942..e82771901c 100755..100644 --- a/libs/gtkmm2ext/gtkmm2ext/fader.h +++ b/libs/gtkmm2ext/gtkmm2ext/fader.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2006 Paul Davis + Copyright (C) 2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -37,13 +37,13 @@ namespace Gtkmm2ext { class LIBGTKMM2EXT_API Fader : public CairoWidget { public: - Fader (Gtk::Adjustment& adjustment, + Fader (Gtk::Adjustment& adjustment, const Glib::RefPtr<Gdk::Pixbuf>& face_pixbuf, const Glib::RefPtr<Gdk::Pixbuf>& active_face_pixbuf, const Glib::RefPtr<Gdk::Pixbuf>& underlay_pixbuf, const Glib::RefPtr<Gdk::Pixbuf>& handle_pixbuf, const Glib::RefPtr<Gdk::Pixbuf>& active_handle_pixbuf, - int min_pos_x, + int min_pos_x, int min_pos_y, int max_pos_x, int max_pos_y, diff --git a/libs/gtkmm2ext/gtkmm2ext/focus_entry.h b/libs/gtkmm2ext/gtkmm2ext/focus_entry.h index 9cdbc5cc7a..cc0c2ef73a 100644 --- a/libs/gtkmm2ext/gtkmm2ext/focus_entry.h +++ b/libs/gtkmm2ext/gtkmm2ext/focus_entry.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libs/gtkmm2ext/gtkmm2ext/grouped_buttons.h b/libs/gtkmm2ext/gtkmm2ext/grouped_buttons.h index da4136be0e..06e7fffe83 100644 --- a/libs/gtkmm2ext/gtkmm2ext/grouped_buttons.h +++ b/libs/gtkmm2ext/gtkmm2ext/grouped_buttons.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2001 Paul Davis + Copyright (C) 2001 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h index 177adb00ff..cc0d67b2ec 100644 --- a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h +++ b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999 Paul Barton-Davis + Copyright (C) 1999 Paul Barton-Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -69,13 +69,13 @@ extern BaseUI::RequestType AddIdle; extern BaseUI::RequestType AddTimeout; struct LIBGTKMM2EXT_API UIRequest : public BaseUI::BaseRequestObject { - + /* this once used anonymous unions to merge elements that are never part of the same request. that makes the creation of a legal copy constructor difficult because of the semantics of the slot member. */ - + Touchable *display; const char *msg; Gtk::StateType new_state; @@ -88,8 +88,8 @@ struct LIBGTKMM2EXT_API UIRequest : public BaseUI::BaseRequestObject { UIRequest () { type = NullMessage; } - - ~UIRequest () { + + ~UIRequest () { if (type == ErrorMessage && msg) { /* msg was strdup()'ed */ free (const_cast<char *>(msg)); diff --git a/libs/gtkmm2ext/gtkmm2ext/gtkapplication-private.h b/libs/gtkmm2ext/gtkmm2ext/gtkapplication-private.h index 6b3e7850be..87812c6d8d 100644 --- a/libs/gtkmm2ext/gtkmm2ext/gtkapplication-private.h +++ b/libs/gtkmm2ext/gtkmm2ext/gtkapplication-private.h @@ -1,4 +1,4 @@ -/* GTK+ Integration with platform-specific application-wide features +/* GTK+ Integration with platform-specific application-wide features * such as the OS X menubar and application delegate concepts. * * Copyright (C) 2007 Pioneer Research Center USA, Inc. diff --git a/libs/gtkmm2ext/gtkmm2ext/gtkapplication.h b/libs/gtkmm2ext/gtkmm2ext/gtkapplication.h index 4e977de8a9..c7c22349cb 100644 --- a/libs/gtkmm2ext/gtkmm2ext/gtkapplication.h +++ b/libs/gtkmm2ext/gtkmm2ext/gtkapplication.h @@ -1,4 +1,4 @@ -/* GTK+ Integration with platform-specific application-wide features +/* GTK+ Integration with platform-specific application-wide features * such as the OS X menubar and application delegate concepts. * * Copyright (C) 2007 Pioneer Research Center USA, Inc. diff --git a/libs/gtkmm2ext/gtkmm2ext/gtkutils.h b/libs/gtkmm2ext/gtkmm2ext/gtkutils.h index 48c166be29..2ff4ec6bfc 100644 --- a/libs/gtkmm2ext/gtkmm2ext/gtkutils.h +++ b/libs/gtkmm2ext/gtkmm2ext/gtkutils.h @@ -1,6 +1,6 @@ /* Copyright (C) 1998-99 Paul Barton-Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/libs/gtkmm2ext/gtkmm2ext/gui_thread.h b/libs/gtkmm2ext/gtkmm2ext/gui_thread.h index 6935a8d0af..0280654d53 100644 --- a/libs/gtkmm2ext/gtkmm2ext/gui_thread.h +++ b/libs/gtkmm2ext/gtkmm2ext/gui_thread.h @@ -31,7 +31,7 @@ namespace sigc { struct trackable; } -#define ENSURE_GUI_THREAD(obj,method, ...) if (!Gtkmm2ext::UI::instance()->caller_is_self()) { abort (); } +#define ENSURE_GUI_THREAD(obj,method, ...) if (!Gtkmm2ext::UI::instance()->caller_is_self()) { abort (); } #define gui_context() Gtkmm2ext::UI::instance() /* a UICallback-derived object that specifies the event loop for GUI signal handling */ #define ui_bind(f, ...) boost::protect (boost::bind (f, __VA_ARGS__)) diff --git a/libs/gtkmm2ext/gtkmm2ext/idle_adjustment.h b/libs/gtkmm2ext/gtkmm2ext/idle_adjustment.h index fdab671759..15a8cb13f7 100644 --- a/libs/gtkmm2ext/gtkmm2ext/idle_adjustment.h +++ b/libs/gtkmm2ext/gtkmm2ext/idle_adjustment.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h b/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h index 9e051b04b8..ee3ba167a5 100644 --- a/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h +++ b/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1998-99 Paul Barton-Davis + Copyright (C) 1998-99 Paul Barton-Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -47,7 +47,7 @@ class LIBGTKMM2EXT_API MotionFeedback : public Gtk::VBox Endless }; - MotionFeedback (Glib::RefPtr<Gdk::Pixbuf>, + MotionFeedback (Glib::RefPtr<Gdk::Pixbuf>, Type type, boost::shared_ptr<PBD::Controllable>, double default_value, @@ -65,7 +65,7 @@ class LIBGTKMM2EXT_API MotionFeedback : public Gtk::VBox virtual void set_controllable (boost::shared_ptr<PBD::Controllable> c); static void set_lamp_color (const std::string&); - + static Glib::RefPtr<Gdk::Pixbuf> render_pixbuf (int size); void set_print_func(void (*pf)(char buf[32], const boost::shared_ptr<PBD::Controllable>&, void *), diff --git a/libs/gtkmm2ext/gtkmm2ext/persistent_tooltip.h b/libs/gtkmm2ext/gtkmm2ext/persistent_tooltip.h index 9df2614095..0ad9439fa8 100644 --- a/libs/gtkmm2ext/gtkmm2ext/persistent_tooltip.h +++ b/libs/gtkmm2ext/gtkmm2ext/persistent_tooltip.h @@ -38,7 +38,7 @@ class LIBGTKMM2EXT_API PersistentTooltip : public sigc::trackable void set_tip (std::string); void set_font (Pango::FontDescription font); void set_center_alignment (bool align_to_center); - + virtual bool dragging () const; private: @@ -56,7 +56,7 @@ class LIBGTKMM2EXT_API PersistentTooltip : public sigc::trackable Gtk::Window* _window; /** Our label */ Gtk::Label* _label; - + /** allow to drag */ bool _draggable; diff --git a/libs/gtkmm2ext/gtkmm2ext/pixscroller.h b/libs/gtkmm2ext/gtkmm2ext/pixscroller.h index 06d0ed2458..50586a9028 100644 --- a/libs/gtkmm2ext/gtkmm2ext/pixscroller.h +++ b/libs/gtkmm2ext/gtkmm2ext/pixscroller.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ */ -#ifndef __gtkmm2ext_pixscroller_h__ +#ifndef __gtkmm2ext_pixscroller_h__ #define __gtkmm2ext_pixscroller_h__ #include <gtkmm/drawingarea.h> @@ -31,7 +31,7 @@ namespace Gtkmm2ext { class LIBGTKMM2EXT_API PixScroller : public Gtk::DrawingArea { public: - PixScroller(Gtk::Adjustment& adjustment, + PixScroller(Gtk::Adjustment& adjustment, Glib::RefPtr<Gdk::Pixbuf> slider, Glib::RefPtr<Gdk::Pixbuf> rail); diff --git a/libs/gtkmm2ext/gtkmm2ext/popup.h b/libs/gtkmm2ext/gtkmm2ext/popup.h index 75a62ae92c..043c563605 100644 --- a/libs/gtkmm2ext/gtkmm2ext/popup.h +++ b/libs/gtkmm2ext/gtkmm2ext/popup.h @@ -1,6 +1,6 @@ /* Copyright (C) 1998-99 Paul Barton-Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/libs/gtkmm2ext/gtkmm2ext/prolooks-helpers.h b/libs/gtkmm2ext/gtkmm2ext/prolooks-helpers.h index 1bdc0f8487..618b4bd6eb 100644 --- a/libs/gtkmm2ext/gtkmm2ext/prolooks-helpers.h +++ b/libs/gtkmm2ext/gtkmm2ext/prolooks-helpers.h @@ -1,8 +1,8 @@ /* Helpers.c generated by valac, the Vala compiler */ -/* +/* Copyright 2009 by Hans Baier - License: LGPLv2+ + License: LGPLv2+ */ #ifndef __prolooks_helpers_h__ @@ -246,7 +246,7 @@ LIBGTKMM2EXT_API void prolooks_shade_color (const GdkColor* orig, double shade_r LIBGTKMM2EXT_API GdkPixbuf* prolooks_cairo_image_surface_to_pixbuf (cairo_surface_t* surface); #ifdef __cplusplus -} // extern "C" +} // extern "C" #endif #endif /* __prolooks_helpers_h__ */ diff --git a/libs/gtkmm2ext/gtkmm2ext/prompter.h b/libs/gtkmm2ext/gtkmm2ext/prompter.h index 3499479073..59bad4b998 100644 --- a/libs/gtkmm2ext/gtkmm2ext/prompter.h +++ b/libs/gtkmm2ext/gtkmm2ext/prompter.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999 Paul Barton-Davis + Copyright (C) 1999 Paul Barton-Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libs/gtkmm2ext/gtkmm2ext/scroomer.h b/libs/gtkmm2ext/gtkmm2ext/scroomer.h index b5a84e9da6..5d9ca69801 100644 --- a/libs/gtkmm2ext/gtkmm2ext/scroomer.h +++ b/libs/gtkmm2ext/gtkmm2ext/scroomer.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Paul Davis + Copyright (C) 2008 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ */ -#ifndef __gtkmm2ext_scroomer_h__ +#ifndef __gtkmm2ext_scroomer_h__ #define __gtkmm2ext_scroomer_h__ #include <gtkmm/drawingarea.h> diff --git a/libs/gtkmm2ext/gtkmm2ext/selector.h b/libs/gtkmm2ext/gtkmm2ext/selector.h index d768ace8bb..9e511dd89c 100644 --- a/libs/gtkmm2ext/gtkmm2ext/selector.h +++ b/libs/gtkmm2ext/gtkmm2ext/selector.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999 Paul Barton-Davis + Copyright (C) 1999 Paul Barton-Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -49,7 +49,7 @@ class LIBGTKMM2EXT_API Selector : public Gtk::VBox friend class Gtkmm2ext::TreeView_Selector; public: - Selector (SelectorRefillFunction, void *arg, + Selector (SelectorRefillFunction, void *arg, std::vector<std::string> titles); virtual ~Selector (); diff --git a/libs/gtkmm2ext/gtkmm2ext/slider_controller.h b/libs/gtkmm2ext/gtkmm2ext/slider_controller.h index 965b7b7d75..460f4a88ae 100644 --- a/libs/gtkmm2ext/gtkmm2ext/slider_controller.h +++ b/libs/gtkmm2ext/gtkmm2ext/slider_controller.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1998-2006 Paul Davis + Copyright (C) 1998-2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/libs/gtkmm2ext/gtkmm2ext/stateful_button.h b/libs/gtkmm2ext/gtkmm2ext/stateful_button.h index eb3ae0d567..63d6890df4 100644 --- a/libs/gtkmm2ext/gtkmm2ext/stateful_button.h +++ b/libs/gtkmm2ext/gtkmm2ext/stateful_button.h @@ -28,7 +28,7 @@ namespace Gtkmm2ext { -class LIBGTKMM2EXT_API StateButton +class LIBGTKMM2EXT_API StateButton { public: StateButton(); @@ -80,12 +80,12 @@ class LIBGTKMM2EXT_API StatefulButton : public StateButton, public Gtk::Button explicit StatefulButton(const std::string &label); virtual ~StatefulButton() {} void set_widget_name (const std::string& name); - + protected: void on_realize (); void on_style_changed (const Glib::RefPtr<Gtk::Style>& style); void on_state_changed (Gtk::StateType old_state); - + Gtk::Widget* get_child_widget (); std::string get_widget_name() const { return get_name(); } }; diff --git a/libs/gtkmm2ext/gtkmm2ext/tearoff.h b/libs/gtkmm2ext/gtkmm2ext/tearoff.h index f6742ea5d6..be5c45d544 100644 --- a/libs/gtkmm2ext/gtkmm2ext/tearoff.h +++ b/libs/gtkmm2ext/gtkmm2ext/tearoff.h @@ -1,6 +1,6 @@ /* Copyright (C) 2003 Paul Barton-Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/libs/gtkmm2ext/gtkmm2ext/textviewer.h b/libs/gtkmm2ext/gtkmm2ext/textviewer.h index c2ab1fffd5..98d13a2a7d 100644 --- a/libs/gtkmm2ext/gtkmm2ext/textviewer.h +++ b/libs/gtkmm2ext/gtkmm2ext/textviewer.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999 Paul Barton-Davis + Copyright (C) 1999 Paul Barton-Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/libs/gtkmm2ext/gtkmm2ext/utils.h b/libs/gtkmm2ext/gtkmm2ext/utils.h index 03b52927ee..0182fec456 100644 --- a/libs/gtkmm2ext/gtkmm2ext/utils.h +++ b/libs/gtkmm2ext/gtkmm2ext/utils.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999 Paul Barton-Davis + Copyright (C) 1999 Paul Barton-Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -56,11 +56,11 @@ namespace Gtkmm2ext { LIBGTKMM2EXT_API int pixel_width (const std::string& str, Pango::FontDescription& font); LIBGTKMM2EXT_API void pixel_size (const std::string& str, Pango::FontDescription& font, int& width, int& height); - LIBGTKMM2EXT_API void get_ink_pixel_size (Glib::RefPtr<Pango::Layout>, + 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>, + 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, @@ -89,13 +89,13 @@ namespace Gtkmm2ext { gint vpadding); - LIBGTKMM2EXT_API Glib::RefPtr<Gdk::Pixbuf> pixbuf_from_string (const std::string& name, - const Pango::FontDescription& font, - int clip_width, - int clip_height, + LIBGTKMM2EXT_API Glib::RefPtr<Gdk::Pixbuf> pixbuf_from_string (const std::string& name, + const Pango::FontDescription& font, + int clip_width, + int clip_height, Gdk::Color fg); - LIBGTKMM2EXT_API void set_popdown_strings (Gtk::ComboBoxText&, + LIBGTKMM2EXT_API void set_popdown_strings (Gtk::ComboBoxText&, const std::vector<std::string>&); LIBGTKMM2EXT_API void get_popdown_strings (Gtk::ComboBoxText&, diff --git a/libs/gtkmm2ext/gtkmm2ext/visibility.h b/libs/gtkmm2ext/gtkmm2ext/visibility.h index 902e94d779..fa45de0942 100644 --- a/libs/gtkmm2ext/gtkmm2ext/visibility.h +++ b/libs/gtkmm2ext/gtkmm2ext/visibility.h @@ -38,7 +38,7 @@ #define LIBGTKMM2EXT_API LIBGTKMM2EXT_DLL_EXPORT #else #define LIBGTKMM2EXT_API LIBGTKMM2EXT_DLL_IMPORT - #endif + #endif #define LIBGTKMM2EXT_LOCAL LIBGTKMM2EXT_DLL_LOCAL #endif diff --git a/libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h b/libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h index 596600cc8a..43f5b247ed 100644 --- a/libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h +++ b/libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h @@ -34,7 +34,7 @@ class LIBGTKMM2EXT_API VisibilityTracker : public virtual sigc::trackable { public: VisibilityTracker (Gtk::Window&); virtual ~VisibilityTracker() {} - + void cycle_visibility (); bool fully_visible() const; @@ -51,4 +51,4 @@ class LIBGTKMM2EXT_API VisibilityTracker : public virtual sigc::trackable { } -#endif /* __libgtkmm2ext_visibility_tracker__ */ +#endif /* __libgtkmm2ext_visibility_tracker__ */ diff --git a/libs/gtkmm2ext/gtkmm2ext/widget_state.h b/libs/gtkmm2ext/gtkmm2ext/widget_state.h index 2e405c453f..3e873f303b 100644 --- a/libs/gtkmm2ext/gtkmm2ext/widget_state.h +++ b/libs/gtkmm2ext/gtkmm2ext/widget_state.h @@ -6,7 +6,7 @@ namespace Gtkmm2ext { /* widget states: unlike GTK, visual states like "Selected" or "Prelight" - are orthogonal to active states. + are orthogonal to active states. */ enum LIBGTKMM2EXT_API ActiveState { diff --git a/libs/gtkmm2ext/gtkmm2ext/window_title.h b/libs/gtkmm2ext/gtkmm2ext/window_title.h index daca35accb..6a3c73df6e 100644 --- a/libs/gtkmm2ext/gtkmm2ext/window_title.h +++ b/libs/gtkmm2ext/gtkmm2ext/window_title.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -38,8 +38,8 @@ class LIBGTKMM2EXT_API WindowTitle public: /** - * \param title The first string/element of the window title - * which will may be the application name or the document + * \param title The first string/element of the window title + * which will may be the application name or the document * name in a document based application. */ WindowTitle(const std::string& title); diff --git a/libs/gtkmm2ext/gtkutils.cc b/libs/gtkmm2ext/gtkutils.cc index 23bf4d6b2f..2e057d75c1 100644 --- a/libs/gtkmm2ext/gtkutils.cc +++ b/libs/gtkmm2ext/gtkutils.cc @@ -1,6 +1,6 @@ /* Copyright (C) 1998-99 Paul Barton-Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/libs/gtkmm2ext/idle_adjustment.cc b/libs/gtkmm2ext/idle_adjustment.cc index 030d717133..37bb28c1a2 100644 --- a/libs/gtkmm2ext/idle_adjustment.cc +++ b/libs/gtkmm2ext/idle_adjustment.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc index d1ef36ac2a..b0d952a11a 100644 --- a/libs/gtkmm2ext/keyboard.cc +++ b/libs/gtkmm2ext/keyboard.cc @@ -648,7 +648,7 @@ Keyboard::reset_bindings () 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 4f6977e4c3..458aeeff3b 100644 --- a/libs/gtkmm2ext/motionfeedback.cc +++ b/libs/gtkmm2ext/motionfeedback.cc @@ -55,10 +55,10 @@ MotionFeedback::MotionFeedback (Glib::RefPtr<Gdk::Pixbuf> pix, double default_val, double step_increment, double page_increment, - const char *widget_name, - bool with_numeric_display, - int subw, - int subh) + const char *widget_name, + bool with_numeric_display, + int subw, + int subh) : _controllable (c) , value (0) , default_value (default_val) @@ -149,8 +149,8 @@ MotionFeedback::~MotionFeedback() } bool -MotionFeedback::pixwin_button_press_event (GdkEventButton *ev) -{ +MotionFeedback::pixwin_button_press_event (GdkEventButton *ev) +{ if (binding_proxy.button_press_handler (ev)) { return true; } @@ -175,8 +175,8 @@ MotionFeedback::pixwin_button_press_event (GdkEventButton *ev) } bool -MotionFeedback::pixwin_button_release_event (GdkEventButton *ev) -{ +MotionFeedback::pixwin_button_release_event (GdkEventButton *ev) +{ if (!_controllable) { return false; } @@ -209,12 +209,12 @@ MotionFeedback::pixwin_button_release_event (GdkEventButton *ev) break; } - return VBox::on_button_release_event (ev); + return VBox::on_button_release_event (ev); } bool -MotionFeedback::pixwin_motion_notify_event (GdkEventMotion *ev) -{ +MotionFeedback::pixwin_motion_notify_event (GdkEventMotion *ev) +{ if (!_controllable) { return false; } @@ -224,7 +224,7 @@ MotionFeedback::pixwin_motion_notify_event (GdkEventMotion *ev) gfloat y_delta; if (!pixwin.has_grab()) { - return VBox::on_motion_notify_event (ev); + return VBox::on_motion_notify_event (ev); } multiplier = ((ev->state & Keyboard::TertiaryModifier) ? 100 : 1) * @@ -237,17 +237,17 @@ MotionFeedback::pixwin_motion_notify_event (GdkEventMotion *ev) y_delta = grabbed_y - ev->y_root; grabbed_y = ev->y_root; - + x_delta = ev->x_root - grabbed_x; - + if (y_delta == 0) return TRUE; - + y_delta *= 1 + (x_delta/100); y_delta *= multiplier; y_delta /= 10; - + _controllable->set_value (adjust ((grab_is_fine ? step_inc : page_inc) * y_delta)); - + } else if (ev->state & Gdk::BUTTON2_MASK) { /* rotary control */ @@ -255,11 +255,11 @@ MotionFeedback::pixwin_motion_notify_event (GdkEventMotion *ev) double x = ev->x - subwidth/2; double y = - ev->y + subwidth/2; double angle = std::atan2 (y, x) / M_PI; - + if (angle < -0.5) { angle += 2.0; } - + angle = -(2.0/3.0) * (angle - 1.25); angle *= multiplier; @@ -271,21 +271,21 @@ MotionFeedback::pixwin_motion_notify_event (GdkEventMotion *ev) } bool -MotionFeedback::pixwin_enter_notify_event (GdkEventCrossing*) +MotionFeedback::pixwin_enter_notify_event (GdkEventCrossing*) { pixwin.grab_focus(); return false; } bool -MotionFeedback::pixwin_leave_notify_event (GdkEventCrossing*) +MotionFeedback::pixwin_leave_notify_event (GdkEventCrossing*) { pixwin.unset_flags (HAS_FOCUS); return false; } bool -MotionFeedback::pixwin_key_press_event (GdkEventKey *ev) +MotionFeedback::pixwin_key_press_event (GdkEventKey *ev) { if (!_controllable) { return false; @@ -295,7 +295,7 @@ MotionFeedback::pixwin_key_press_event (GdkEventKey *ev) double multiplier; multiplier = ((ev->state & Keyboard::TertiaryModifier) ? 100.0 : 1.0) * - ((ev->state & Keyboard::SecondaryModifier) ? 10.0 : 1.0) * + ((ev->state & Keyboard::SecondaryModifier) ? 10.0 : 1.0) * ((ev->state & Keyboard::PrimaryModifier) ? 2.0 : 1.0); switch (ev->keyval) { @@ -373,11 +373,11 @@ MotionFeedback::pixwin_expose_event (GdkEventExpose*) phase = std::min (phase, (int32_t) 63); GtkWidget* widget = GTK_WIDGET(pixwin.gobj()); - gdk_draw_pixbuf (GDK_DRAWABLE(window), widget->style->fg_gc[0], - pixbuf->gobj(), - phase * subwidth, type * subheight, + gdk_draw_pixbuf (GDK_DRAWABLE(window), widget->style->fg_gc[0], + pixbuf->gobj(), + phase * subwidth, type * subheight, /* center image in allocated area */ - (get_width() - subwidth)/2, + (get_width() - subwidth)/2, 0, subwidth, subheight, GDK_RGB_DITHER_NORMAL, 0, 0); @@ -457,11 +457,11 @@ MotionFeedback::set_controllable (boost::shared_ptr<PBD::Controllable> c) } boost::shared_ptr<PBD::Controllable> -MotionFeedback::controllable () const +MotionFeedback::controllable () const { return _controllable; } - + void MotionFeedback::default_printer (char buf[32], const boost::shared_ptr<PBD::Controllable>& c, void *) { @@ -532,7 +532,7 @@ MotionFeedback::render_pixbuf (int size) g_free (path); return pixbuf; -} +} void MotionFeedback::core_draw (cairo_t* cr, int phase, double size, double progress_width, double xorigin, double yorigin, @@ -555,7 +555,7 @@ MotionFeedback::core_draw (cairo_t* cr, int phase, double size, double progress_ double progress_radius_outer; g_return_if_fail (cr != NULL); - + progress_radius = 40.0; progress_radius_inner = progress_radius - (progress_width / 2.0); progress_radius_outer = progress_radius + (progress_width / 2.0); diff --git a/libs/gtkmm2ext/pixfader.cc b/libs/gtkmm2ext/pixfader.cc index e27945128e..0c435889dc 100644 --- a/libs/gtkmm2ext/pixfader.cc +++ b/libs/gtkmm2ext/pixfader.cc @@ -709,7 +709,7 @@ PixFader::on_style_changed (const Glib::RefPtr<Gtk::Style>&) _text = ""; set_text (txt, _centered_text, false); } - /* patterns are cached and re-created as needed + /* patterns are cached and re-created as needed * during 'expose' in the GUI thread */ _pattern = 0; queue_draw (); diff --git a/libs/gtkmm2ext/pixscroller.cc b/libs/gtkmm2ext/pixscroller.cc index 22db1892d1..570d04c1c3 100644 --- a/libs/gtkmm2ext/pixscroller.cc +++ b/libs/gtkmm2ext/pixscroller.cc @@ -1,6 +1,6 @@ /* Copyright (C) 2005 Paul Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -30,7 +30,7 @@ using namespace std; using namespace Gtk; using namespace Gtkmm2ext; -PixScroller::PixScroller (Adjustment& a, +PixScroller::PixScroller (Adjustment& a, Glib::RefPtr<Gdk::Pixbuf> s, Glib::RefPtr<Gdk::Pixbuf> r) : adj (a), @@ -66,7 +66,7 @@ PixScroller::PixScroller (Adjustment& a, rail_surface = Cairo::ImageSurface::create (format, rail->get_width(), rail->get_height()); rail_context = Cairo::Context::create (rail_surface); Gdk::Cairo::set_source_pixbuf (rail_context, rail, 0.0, 0.0); - rail_context->paint(); + rail_context->paint(); if (slider->get_has_alpha()) { format = Cairo::FORMAT_ARGB32; @@ -76,7 +76,7 @@ PixScroller::PixScroller (Adjustment& a, slider_surface = Cairo::ImageSurface::create (format, slider->get_width(), slider->get_height()); slider_context = Cairo::Context::create (slider_surface); Gdk::Cairo::set_source_pixbuf (slider_context, slider, 0.0, 0.0); - slider_context->paint(); + slider_context->paint(); } void @@ -92,7 +92,7 @@ PixScroller::on_expose_event (GdkEventExpose* ev) GdkRectangle intersect; Glib::RefPtr<Gdk::Window> win (get_window()); Cairo::RefPtr<Cairo::Context> context = get_window()->create_cairo_context(); - + if (gdk_rectangle_intersect (railrect.gobj(), &ev->area, &intersect)) { context->save(); @@ -135,8 +135,8 @@ PixScroller::on_button_press_event (GdkEventButton* ev) break; default: break; - } - + } + return false; } diff --git a/libs/gtkmm2ext/popup.cc b/libs/gtkmm2ext/popup.cc index 85a9d537c3..028490f11e 100644 --- a/libs/gtkmm2ext/popup.cc +++ b/libs/gtkmm2ext/popup.cc @@ -1,6 +1,6 @@ /* Copyright (C) 1998-99 Paul Barton-Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -103,8 +103,8 @@ PopUp::touch () show_all (); if (popdown_time != 0) { - timeout = g_timeout_add (popdown_time, - remove_prompt_timeout, + timeout = g_timeout_add (popdown_time, + remove_prompt_timeout, this); } } diff --git a/libs/gtkmm2ext/prolooks_helpers.c b/libs/gtkmm2ext/prolooks_helpers.c index 9709db7c5a..ac596d0ae1 100644 --- a/libs/gtkmm2ext/prolooks_helpers.c +++ b/libs/gtkmm2ext/prolooks_helpers.c @@ -1,9 +1,9 @@ /* Helpers.c generated by valac, the Vala compiler * generated from Helpers.vala, do not modify */ -/* +/* Copyright 2009 by Hans Baier - License: LGPLv2+ + License: LGPLv2+ */ #ifdef COMPILER_MSVC diff --git a/libs/gtkmm2ext/prompter.cc b/libs/gtkmm2ext/prompter.cc index 4c3ff43a73..03cfb25be4 100644 --- a/libs/gtkmm2ext/prompter.cc +++ b/libs/gtkmm2ext/prompter.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 1999 Paul Barton-Davis + Copyright (C) 1999 Paul Barton-Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -55,7 +55,7 @@ Prompter::init () add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); - /* + /* Alas a generic 'affirmative' button seems a bit useless sometimes. You will have to add your own. After adding, use : @@ -122,10 +122,10 @@ Prompter::entry_activated () void Prompter::on_entry_changed () { - /* - This is set up so that entering text in the entry - field makes the RESPONSE_ACCEPT button active. - Of course if you haven't added a RESPONSE_ACCEPT + /* + This is set up so that entering text in the entry + field makes the RESPONSE_ACCEPT button active. + Of course if you haven't added a RESPONSE_ACCEPT button, nothing will happen at all. */ diff --git a/libs/gtkmm2ext/scroomer.cc b/libs/gtkmm2ext/scroomer.cc index 23fa71718b..9b56706d21 100644 --- a/libs/gtkmm2ext/scroomer.cc +++ b/libs/gtkmm2ext/scroomer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Paul Davis + Copyright (C) 2008 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libs/gtkmm2ext/selector.cc b/libs/gtkmm2ext/selector.cc index 97f468707b..55499967d1 100644 --- a/libs/gtkmm2ext/selector.cc +++ b/libs/gtkmm2ext/selector.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 1999 Paul Barton-Davis + Copyright (C) 1999 Paul Barton-Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/libs/gtkmm2ext/stateful_button.cc b/libs/gtkmm2ext/stateful_button.cc index 3880a1b35c..3c1ad2a830 100644 --- a/libs/gtkmm2ext/stateful_button.cc +++ b/libs/gtkmm2ext/stateful_button.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -30,7 +30,7 @@ using namespace Glib; using namespace Gtkmm2ext; using namespace std; -StateButton::StateButton () +StateButton::StateButton () : visual_state (0) , _self_managed (false) , _is_realized (false) @@ -87,9 +87,9 @@ StateButton::avoid_prelight_on_style_changed (const Glib::RefPtr<Gtk::Style>& /* if (style_changing) { return; } - + if (gtk_widget_get_state (widget) == GTK_STATE_PRELIGHT) { - + /* avoid PRELIGHT: make sure that the prelight colors in this new style match the colors of the new style in whatever state we were in before we switched to prelight. @@ -101,7 +101,7 @@ StateButton::avoid_prelight_on_style_changed (const Glib::RefPtr<Gtk::Style>& /* rcstyle->fg[GTK_STATE_PRELIGHT] = style->fg[state_before_prelight]; rcstyle->bg[GTK_STATE_PRELIGHT] = style->bg[state_before_prelight]; rcstyle->color_flags[GTK_STATE_PRELIGHT] = (GtkRcFlags) (GTK_RC_FG|GTK_RC_BG); - + style_changing = true; g_object_ref (rcstyle); gtk_widget_modify_style (widget, rcstyle); @@ -125,20 +125,20 @@ StateButton::avoid_prelight_on_state_changed (Gtk::StateType old_state, GtkWidge if (state == GTK_STATE_PRELIGHT) { state_before_prelight = old_state; - - - /* avoid PRELIGHT when currently ACTIVE: - if we just went into PRELIGHT, make sure that the colors - match those of whatever state we were in before. + + + /* avoid PRELIGHT when currently ACTIVE: + if we just went into PRELIGHT, make sure that the colors + match those of whatever state we were in before. */ - + GtkRcStyle* rcstyle = gtk_widget_get_modifier_style (widget); GtkStyle* style = gtk_widget_get_style (widget); - + rcstyle->fg[GTK_STATE_PRELIGHT] = style->fg[old_state]; rcstyle->bg[GTK_STATE_PRELIGHT] = style->bg[old_state]; rcstyle->color_flags[GTK_STATE_PRELIGHT] = (GtkRcFlags) (GTK_RC_FG|GTK_RC_BG); - + g_object_ref (rcstyle); gtk_widget_modify_style (widget, rcstyle); @@ -204,14 +204,14 @@ StatefulToggleButton::on_style_changed (const Glib::RefPtr<Gtk::Style>& style) { avoid_prelight_on_style_changed (style, GTK_WIDGET(gobj())); Button::on_style_changed (style); -} +} void StatefulToggleButton::on_state_changed (Gtk::StateType old_state) { avoid_prelight_on_state_changed (old_state, GTK_WIDGET(gobj())); Button::on_state_changed (old_state); -} +} Widget* StatefulToggleButton::get_child_widget () @@ -222,12 +222,12 @@ StatefulToggleButton::get_child_widget () void StatefulToggleButton::set_widget_name (const std::string& name) { - set_name (name); + set_name (name); Widget* w = get_child(); if (w) { - w->set_name (name); - } + w->set_name (name); + } } /*--------------------------------------------- */ @@ -246,14 +246,14 @@ StatefulButton::on_style_changed (const Glib::RefPtr<Gtk::Style>& style) { avoid_prelight_on_style_changed (style, GTK_WIDGET(gobj())); Button::on_style_changed (style); -} +} void StatefulButton::on_state_changed (Gtk::StateType old_state) { avoid_prelight_on_state_changed (old_state, GTK_WIDGET(gobj())); Button::on_state_changed (old_state); -} +} Widget* StatefulButton::get_child_widget () @@ -264,10 +264,10 @@ StatefulButton::get_child_widget () void StatefulButton::set_widget_name (const std::string& name) { - set_name (name); + set_name (name); Widget* w = get_child(); if (w) { - w->set_name (name); - } + w->set_name (name); + } } diff --git a/libs/gtkmm2ext/sync-menu.c b/libs/gtkmm2ext/sync-menu.c index a16babce54..c37fb6c3c4 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,11 +381,11 @@ carbon_menu_item_update_accelerator (CarbonMenuItem *carbon_item, } /* gdk/quartz maps Command to Meta */ - + if (key->accel_mods & GDK_META_MASK) { use_command = 1; } - } + } if (!use_command) modifiers |= kMenuNoCommandModifier; @@ -540,7 +540,7 @@ carbon_menu_item_connect (GtkWidget *menu_item, static int _in_carbon_menu_event_handler = 0; -int +int gdk_quartz_in_carbon_menu_event_handler () { return _in_carbon_menu_event_handler; diff --git a/libs/gtkmm2ext/tearoff.cc b/libs/gtkmm2ext/tearoff.cc index 384531cf67..9890f80ceb 100644 --- a/libs/gtkmm2ext/tearoff.cc +++ b/libs/gtkmm2ext/tearoff.cc @@ -1,6 +1,6 @@ /* Copyright (C) 2003 Paul Barton-Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -43,7 +43,7 @@ TearOff::TearOff (Widget& c, bool allow_resize) , _visible (true) , _torn (false) , _can_be_torn_off (true) - + { own_window_width = 0; own_window_height = 0; @@ -55,7 +55,7 @@ TearOff::TearOff (Widget& c, bool allow_resize) tearoff_event_box.signal_button_release_event().connect (mem_fun (*this, &TearOff::tearoff_click)); tearoff_event_box.set_tooltip_text (_("Click to tear this into its own window")); - + close_event_box.add (close_arrow); close_event_box.set_events (BUTTON_PRESS_MASK|BUTTON_RELEASE_MASK); close_event_box.signal_button_release_event().connect (mem_fun (*this, &TearOff::close_click)); @@ -145,7 +145,7 @@ TearOff::tear_it_off () if (!_can_be_torn_off) { return; } - + if (torn_off()) { return; } @@ -164,7 +164,7 @@ TearOff::tear_it_off () _torn = true; Detach (); -} +} gint TearOff::close_click (GdkEventButton* /*ev*/) @@ -280,7 +280,7 @@ TearOff::add_state (XMLNode& node) const snprintf (buf, sizeof (buf), "%d", own_window_ypos); node.add_property ("ypos", buf); } -} +} void TearOff::set_state (const XMLNode& node) @@ -316,7 +316,7 @@ TearOff::set_state (const XMLNode& node) own_window.move (own_window_xpos, own_window_ypos); } /* otherwise do it once the window is realized, see below */ -} +} void TearOff::own_window_realized () @@ -335,7 +335,7 @@ TearOff::own_window_configured (GdkEventConfigure*) Glib::RefPtr<const Gdk::Window> win; win = own_window.get_window (); - + if (win) { win->get_size (own_window_width, own_window_height); win->get_position (own_window_xpos, own_window_ypos); diff --git a/libs/gtkmm2ext/textviewer.cc b/libs/gtkmm2ext/textviewer.cc index 8c89b845b7..e62725acb4 100644 --- a/libs/gtkmm2ext/textviewer.cc +++ b/libs/gtkmm2ext/textviewer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 1999 Paul Barton-Davis + Copyright (C) 1999 Paul Barton-Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/libs/gtkmm2ext/treeutils.cc b/libs/gtkmm2ext/treeutils.cc index d509ff6796..9266104e48 100644 --- a/libs/gtkmm2ext/treeutils.cc +++ b/libs/gtkmm2ext/treeutils.cc @@ -69,7 +69,7 @@ Gtkmm2ext::treeview_select_previous (TreeView& view, RefPtr<TreeModel> model, Tr prev = model->get_path (iter); } else { - + prev.prev(); } @@ -107,14 +107,14 @@ Gtkmm2ext::treeview_select_previous (TreeView& view, RefPtr<TreeModel> model, Tr iter = model->get_iter (prev); } - + if (iter) { treeview_select_one (selection, model, view, iter, prev, col); } else { /* we could not forward, so wrap around to the first row */ - /* grr: no nice way to get an iter for the + /* grr: no nice way to get an iter for the last row, because there is no operator-- for TreeIter */ @@ -216,7 +216,7 @@ Gtkmm2ext::treeview_select_next (TreeView& view, RefPtr<TreeModel> model, TreeVi iter = model->get_iter (next); } - + if (iter) { treeview_select_one (selection, model, view, iter, next, col); } else { diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc index 6bf83d3316..24940c718c 100644 --- a/libs/gtkmm2ext/utils.cc +++ b/libs/gtkmm2ext/utils.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 1999 Paul Barton-Davis + Copyright (C) 1999 Paul Barton-Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -123,7 +123,7 @@ Gtkmm2ext::set_size_request_to_display_given_text (Gtk::Widget &w, std::string c } void -Gtkmm2ext::set_size_request_to_display_given_text (Gtk::Widget &w, +Gtkmm2ext::set_size_request_to_display_given_text (Gtk::Widget &w, const std::vector<std::string>& strings, gint hpadding, gint vpadding) { @@ -232,10 +232,10 @@ Gtkmm2ext::convert_bgra_to_rgba (guint8 const* src, src_pixel[3]); // R [0] <= [ 2 ] dst_pixel[1] = demultiply_alpha (src_pixel[1], src_pixel[3]); // G [1] <= [ 1 ] - dst_pixel[2] = demultiply_alpha (src_pixel[0], + dst_pixel[2] = demultiply_alpha (src_pixel[0], src_pixel[3]); // B [2] <= [ 0 ] dst_pixel[3] = src_pixel[3]; // alpha - + #elif G_BYTE_ORDER == G_BIG_ENDIAN /* Cairo [ B G R A ] is actually [ A R G B ] in memory SOURCE 0 1 2 3 @@ -248,11 +248,11 @@ Gtkmm2ext::convert_bgra_to_rgba (guint8 const* src, dst_pixel[2] = demultiply_alpha (src_pixel[3], src_pixel[0]); // B [2] <= [ 3 ] dst_pixel[3] = src_pixel[0]; // alpha - + #else #error ardour does not currently support PDP-endianess #endif - + dst_pixel += 4; src_pixel += 4; } @@ -506,7 +506,7 @@ int Gtkmm2ext::physical_screen_width (Glib::RefPtr<Gdk::Window> win) { GdkScreen* scr = gdk_screen_get_default(); - + if (win) { GdkRectangle r; gint monitor = gdk_screen_get_monitor_at_window (scr, win->gobj()); @@ -764,7 +764,7 @@ Gtkmm2ext::fit_to_pixels (const string& str, int pixel_width, Pango::FontDescrip line = layout->get_line (0); /* XXX: might need special care to get the ellipsis character, not sure - how that works + how that works */ string s = string (layout->get_text ().substr(line->get_start_index(), line->get_length())); @@ -864,7 +864,7 @@ Gtkmm2ext::event_inside_widget_window (Gtk::Widget& widget, GdkEvent* ev) if (!gdk_event_get_root_coords (ev, &evx, &evy)) { return false; } - + gint wx; gint wy; gint width, height, depth; @@ -874,11 +874,11 @@ Gtkmm2ext::event_inside_widget_window (Gtk::Widget& widget, GdkEvent* ev) widget_window->get_geometry (x, y, width, height, depth); widget_window->get_root_origin (wx, wy); - - if ((evx >= wx && evx < wx + width) && + + if ((evx >= wx && evx < wx + width) && (evy >= wy && evy < wy + height)) { return true; - } + } return false; } diff --git a/libs/gtkmm2ext/waves_fastmeter.cc b/libs/gtkmm2ext/waves_fastmeter.cc index d97a92aac2..113597ecb5 100644 --- a/libs/gtkmm2ext/waves_fastmeter.cc +++ b/libs/gtkmm2ext/waves_fastmeter.cc @@ -604,7 +604,7 @@ FastMeter::vertical_expose (cairo_t* cr, cairo_rectangle_t* area) // MEMO: Normaly MATURE OS clips so called invalidated rects itself making APP free of // heavy operations which OS does with graphic HW - // NOTE FROM PAUL: GTK does clip already. The invalidated rect isn't the only area + // NOTE FROM PAUL: GTK does clip already. The invalidated rect isn't the only area // we want to clip to however, which is why this object/class is called FastMeter. // I have left stuff commented out as I found it when I merged from Ardour in August 2014, // but this commenting and the previous MEMO comment represent a misunderstanding diff --git a/libs/gtkmm2ext/window_title.cc b/libs/gtkmm2ext/window_title.cc index 68913aeef6..11342ab1d7 100644 --- a/libs/gtkmm2ext/window_title.cc +++ b/libs/gtkmm2ext/window_title.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by |