diff options
Diffstat (limited to 'libs/gtkmm2ext/gtkmm2ext')
44 files changed, 98 insertions, 98 deletions
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); |