diff options
Diffstat (limited to 'libs/gtkmm2ext/gtkmm2ext')
23 files changed, 90 insertions, 90 deletions
diff --git a/libs/gtkmm2ext/gtkmm2ext/actions.h b/libs/gtkmm2ext/gtkmm2ext/actions.h index 0336fde242..b03e351cbf 100644 --- a/libs/gtkmm2ext/gtkmm2ext/actions.h +++ b/libs/gtkmm2ext/gtkmm2ext/actions.h @@ -38,7 +38,7 @@ namespace ActionManager { LIBGTKMM2EXT_API extern std::string unbound_string; /* the key string returned if an action is not bound */ LIBGTKMM2EXT_API extern Glib::RefPtr<Gtk::UIManager> ui_manager; - + LIBGTKMM2EXT_API extern void set_sensitive (std::vector<Glib::RefPtr<Gtk::Action> >& actions, bool); LIBGTKMM2EXT_API extern std::string get_key_representation (const std::string& accel_path, Gtk::AccelKey& key); diff --git a/libs/gtkmm2ext/gtkmm2ext/auto_spin.h b/libs/gtkmm2ext/gtkmm2ext/auto_spin.h index 70aedbe50e..da19a1a1f7 100644 --- a/libs/gtkmm2ext/gtkmm2ext/auto_spin.h +++ b/libs/gtkmm2ext/gtkmm2ext/auto_spin.h @@ -74,5 +74,5 @@ class LIBGTKMM2EXT_API AutoSpin }; } /* namespace */ - + #endif /* __gtkmm2ext_auto_spin_h__ */ diff --git a/libs/gtkmm2ext/gtkmm2ext/barcontroller.h b/libs/gtkmm2ext/gtkmm2ext/barcontroller.h index ce10411a2c..f529c5c557 100644 --- a/libs/gtkmm2ext/gtkmm2ext/barcontroller.h +++ b/libs/gtkmm2ext/gtkmm2ext/barcontroller.h @@ -80,4 +80,4 @@ class LIBGTKMM2EXT_API BarController : public Gtk::Alignment }; /* namespace */ -#endif // __gtkmm2ext_bar_controller_h__ +#endif // __gtkmm2ext_bar_controller_h__ diff --git a/libs/gtkmm2ext/gtkmm2ext/bindable_button.h b/libs/gtkmm2ext/gtkmm2ext/bindable_button.h index cf74d3aca0..d96f8145a4 100644 --- a/libs/gtkmm2ext/gtkmm2ext/bindable_button.h +++ b/libs/gtkmm2ext/gtkmm2ext/bindable_button.h @@ -40,7 +40,7 @@ class LIBGTKMM2EXT_API BindableToggleButton : public Gtkmm2ext::StatefulToggleBu BindableToggleButton () {} virtual ~BindableToggleButton() {} - + bool on_button_press_event (GdkEventButton *ev) { if (!binding_proxy.button_press_handler (ev)) { StatefulToggleButton::on_button_press_event (ev); @@ -49,7 +49,7 @@ class LIBGTKMM2EXT_API BindableToggleButton : public Gtkmm2ext::StatefulToggleBu return true; } } - + boost::shared_ptr<PBD::Controllable> get_controllable() { return binding_proxy.get_controllable(); } void set_controllable (boost::shared_ptr<PBD::Controllable> c); void watch (); @@ -67,7 +67,7 @@ class LIBGTKMM2EXT_API BindableButton : public Gtkmm2ext::StatefulButton public: BindableButton (boost::shared_ptr<PBD::Controllable> c) : binding_proxy (c) {} ~BindableButton() {} - + bool on_button_press_event (GdkEventButton *ev) { if (!binding_proxy.button_press_handler (ev)) { StatefulButton::on_button_press_event (ev); diff --git a/libs/gtkmm2ext/gtkmm2ext/binding_proxy.h b/libs/gtkmm2ext/gtkmm2ext/binding_proxy.h index 022a0cbcd9..7108c46eb2 100644 --- a/libs/gtkmm2ext/gtkmm2ext/binding_proxy.h +++ b/libs/gtkmm2ext/gtkmm2ext/binding_proxy.h @@ -39,7 +39,7 @@ class LIBGTKMM2EXT_API BindingProxy : public sigc::trackable BindingProxy (boost::shared_ptr<PBD::Controllable>); BindingProxy (); virtual ~BindingProxy(); - + void set_bind_button_state (guint button, guint statemask); static bool is_bind_action (GdkEventButton *); @@ -51,10 +51,10 @@ class LIBGTKMM2EXT_API BindingProxy : public sigc::trackable protected: Gtkmm2ext::PopUp* prompter; boost::shared_ptr<PBD::Controllable> controllable; - + static guint bind_button; static guint bind_statemask; - + PBD::ScopedConnection learning_connection; void learning_finished (); bool prompter_hiding (GdkEventAny *); diff --git a/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h b/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h index 436dc0382d..b6b4ccd83e 100644 --- a/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h +++ b/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h @@ -39,11 +39,11 @@ public: Gtkmm2ext::ActiveState active_state() const { return _active_state; } Gtkmm2ext::VisualState visual_state() const { return _visual_state; } - + /* derived widgets can override these two to catch changes in active & visual state */ - + virtual void set_active_state (Gtkmm2ext::ActiveState); virtual void set_visual_state (Gtkmm2ext::VisualState); @@ -80,7 +80,7 @@ public: /* set_focus_handler() will cause all button-press events on any CairoWidget to invoke this slot/functor/function/method/callback. - + We do this because in general, CairoWidgets do not grab keyboard focus, but a button press on them should clear focus from any active text entry. @@ -103,7 +103,7 @@ protected: void on_style_changed (const Glib::RefPtr<Gtk::Style>&); bool on_button_press_event (GdkEventButton*); Gdk::Color get_parent_bg (); - + /* this is an additional virtual "on_..." method. Glibmm does not provide a direct signal for name changes, so this acts as a proxy. */ @@ -125,7 +125,7 @@ protected: Glib::SignalProxyProperty _name_proxy; sigc::connection _parent_style_change; Widget * _current_parent; - + }; #endif diff --git a/libs/gtkmm2ext/gtkmm2ext/cairocell.h b/libs/gtkmm2ext/gtkmm2ext/cairocell.h index a061672fb8..8fe166624f 100644 --- a/libs/gtkmm2ext/gtkmm2ext/cairocell.h +++ b/libs/gtkmm2ext/gtkmm2ext/cairocell.h @@ -36,7 +36,7 @@ class LIBGTKMM2EXT_API CairoCell public: CairoCell(int32_t id); virtual ~CairoCell() {} - + int32_t id() const { return _id; } virtual void render (Cairo::RefPtr<Cairo::Context>&) = 0; @@ -165,7 +165,7 @@ public: void set_width_chars (CairoTextCell* cell, uint32_t); void set_draw_background (bool yn) { _draw_bg = yn; } - + void set_colors (double cr, double cg, double cb, double ca) { r = cr; g = cg; @@ -194,7 +194,7 @@ public: void set_xpad (double x) { _xpad = x; queue_resize(); } double ypad() const { return _ypad; } void set_ypad (double y) { _ypad = y; queue_resize(); } - + double corner_radius() const { return _corner_radius; } void set_corner_radius (double r) { _corner_radius = r; queue_draw (); } diff --git a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h index e84a635fa0..c921976dd3 100644 --- a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h +++ b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h @@ -53,7 +53,7 @@ class LIBGTKMM2EXT_API CellRendererPixbufMulti : public Gtk::CellRenderer Glib::PropertyProxy<uint32_t> property_state(); void set_pixbuf(uint32_t state, Glib::RefPtr<Gdk::Pixbuf> pixbuf); - + typedef sigc::signal<void, const Glib::ustring&> SignalChanged; SignalChanged& signal_changed(); diff --git a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h index 30171dd692..3fd2d65aa9 100644 --- a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h +++ b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h @@ -62,7 +62,7 @@ class LIBGTKMM2EXT_API CellRendererPixbufToggle : public Gtk::CellRenderer private: Glib::Property< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_; Glib::Property<bool> property_active_; - + Glib::RefPtr<Gdk::Pixbuf> active_pixbuf; Glib::RefPtr<Gdk::Pixbuf> inactive_pixbuf; diff --git a/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h b/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h index dd58f77a4c..083fee6378 100644 --- a/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h +++ b/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h @@ -52,7 +52,7 @@ class LIBGTKMM2EXT_API DnDTreeViewBase : public Gtk::TreeView Gtk::TreeView::on_drag_begin (context); start_object_drag (); } - + void on_drag_leave(const Glib::RefPtr<Gdk::DragContext>& context, guint time) { suggested_action = context->get_suggested_action(); TreeView::on_drag_leave (context, time); @@ -73,12 +73,12 @@ class LIBGTKMM2EXT_API DnDTreeViewBase : public Gtk::TreeView struct DragData { DragData () : source (0) {} - + Gtk::TreeView* source; int data_column; std::string object_type; }; - + static DragData drag_data; void start_object_drag () { @@ -112,7 +112,7 @@ class /*LIBGTKMM2EXT_API*/ DnDTreeView : public DnDTreeViewBase selection_data.set (8, (guchar*)&c, 1); } } - + void on_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const Gtk::SelectionData& selection_data, guint info, guint time) { if (suggested_action) { /* this is a drag motion callback. just update the status to @@ -122,14 +122,14 @@ class /*LIBGTKMM2EXT_API*/ DnDTreeView : public DnDTreeViewBase TreeView::on_drag_data_received (context, x, y, selection_data, info, time); return; } - + if (selection_data.get_target() == "GTK_TREE_MODEL_ROW") { - + TreeView::on_drag_data_received (context, x, y, selection_data, info, time); - + } else if (selection_data.get_target() == object_type) { - + end_object_drag (const_cast<Glib::RefPtr<Gdk::DragContext>& > (context), x, y); } else { @@ -147,16 +147,16 @@ class /*LIBGTKMM2EXT_API*/ DnDTreeView : public DnDTreeViewBase if (drag_data.source == 0) { return; } - + Glib::RefPtr<Gtk::TreeModel> model = drag_data.source->get_model(); DataType v; Gtk::TreeSelection::ListHandle_Path selection = drag_data.source->get_selection()->get_selected_rows (); - + for (Gtk::TreeSelection::ListHandle_Path::iterator x = selection.begin(); x != selection.end(); ++x) { model->get_iter (*x)->get_value (drag_data.data_column, v); l.push_back (v); } - + *source = drag_data.source; } diff --git a/libs/gtkmm2ext/gtkmm2ext/dndvbox.h b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h index 940a72859e..84289aff34 100644 --- a/libs/gtkmm2ext/gtkmm2ext/dndvbox.h +++ b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h @@ -24,15 +24,15 @@ namespace Gtkmm2ext { -/** Parent class for children of a DnDVBox */ +/** Parent class for children of a DnDVBox */ class /*LIBGTKMM2EXT_API*/ DnDVBoxChild { public: virtual ~DnDVBoxChild () {} - + /** @return The widget that is to be put into the DnDVBox */ virtual Gtk::Widget& widget () = 0; - + /** @return An EventBox containing the widget that should be used for selection, dragging etc. */ virtual Gtk::EventBox& action_widget () = 0; @@ -68,15 +68,15 @@ public: signal_drag_leave().connect (mem_fun (*this, &DnDVBox::drag_leave)); _internal_vbox.show (); - + drag_dest_set (_targets); signal_drag_data_received().connect (mem_fun (*this, &DnDVBox::drag_data_received)); } - + virtual ~DnDVBox () { clear (); - + delete _drag_icon; } @@ -89,9 +89,9 @@ public: child->action_widget().signal_drag_end().connect (sigc::bind (mem_fun (*this, &DnDVBox::drag_end), child)); child->action_widget().signal_button_press_event().connect (sigc::bind (mem_fun (*this, &DnDVBox::button_press), child)); child->action_widget().signal_button_release_event().connect (sigc::bind (mem_fun (*this, &DnDVBox::button_release), child)); - + _internal_vbox.pack_start (child->widget(), false, false); - + _children.push_back (child); child->widget().show (); } @@ -180,7 +180,7 @@ public: T* after; std::pair<T*, double> r; - + r.second = get_children_around_position (y, &before, &r.first, &after); return r; @@ -206,7 +206,7 @@ public: { return create_or_update_placeholder (get_child_at_position (y).second); } - + /** Children have been reordered by a drag */ sigc::signal<void> Reordered; @@ -241,7 +241,7 @@ private: return bottom; } - + /** Look at a y coordinate and find the children below y, and the ones either side. * @param y y position. * @param before Filled in with the child before, or 0. @@ -270,7 +270,7 @@ private: while (y >= bottom && j != _children.end()) { top = bottom; - + *before = *j; ++i; ++j; @@ -297,13 +297,13 @@ private: void drag_begin (Glib::RefPtr<Gdk::DragContext> const & context, T* child) { _drag_child = child; - + /* make up an icon for the drag */ _drag_icon = new Gtk::Window (Gtk::WINDOW_POPUP); - + Gtk::Allocation a = child->action_widget().get_allocation (); _drag_icon->set_size_request (a.get_width(), a.get_height()); - + _drag_icon->signal_expose_event().connect (sigc::mem_fun (*this, &DnDVBox::icon_expose)); _drag_icon->set_name (get_name ()); @@ -317,7 +317,7 @@ private: int w, h; _drag_icon->get_size (w, h); _drag_icon->drag_set_as_icon (context, w / 2, h / 2); - + _drag_source = this; } @@ -336,22 +336,22 @@ private: cairo_rectangle (cr, 0, 0, w, h); cairo_fill (cr); cairo_destroy (cr); - + return false; } - + void drag_data_get (Glib::RefPtr<Gdk::DragContext> const &, Gtk::SelectionData & selection_data, guint, guint, T* child) { selection_data.set (selection_data.get_target(), 8, (const guchar *) &child, sizeof (&child)); } - + void drag_data_received ( Glib::RefPtr<Gdk::DragContext> const & context, int /*x*/, int y, Gtk::SelectionData const & selection_data, guint /*info*/, guint time ) { /* work out where it was dropped */ std::pair<T*, double> const drop = get_child_at_position (y); - + if (_drag_source == this) { /* dropped from ourselves onto ourselves */ @@ -364,7 +364,7 @@ private: /* where in the list this child should be dropped */ int target = drop.second + 0.5; - + /* find out whether the child was `picked up' from before the drop position */ int n = 0; typename std::list<T*>::const_iterator i = _children.begin (); @@ -372,31 +372,31 @@ private: ++i; ++n; } - + /* if so, adjust the drop position to account for this */ if (n < target) { --target; } - + _internal_vbox.reorder_child (child->widget(), target); } - + } else { - + /* drag started in another DnDVBox; raise a signal to say what happened */ - + std::list<T*> dropped = _drag_source->selection (); DropFromAnotherBox (_drag_source, drop.first, context); } - + context->drag_finish (false, false, time); } - + void drag_end (Glib::RefPtr<Gdk::DragContext> const &, T *) { delete _drag_icon; _drag_icon = 0; - + _drag_child = 0; remove_placeholder (); @@ -474,7 +474,7 @@ private: if (child) { _expecting_unwanted_button_event = true; } - + if (ev->button == 1 || ev->button == 3) { if (!selected (child)) { @@ -492,7 +492,7 @@ private: if (selecting && !was_selected) { add_to_selection (*i); } - + if (!selecting && !done) { if (selected (*i)) { selecting = true; @@ -509,19 +509,19 @@ private: } } else { - + if ((ev->state & Gdk::CONTROL_MASK) == 0) { clear_selection (); } - + if (child) { add_to_selection (child); } } - + SelectionChanged (); /* EMIT SIGNAL */ - + } else { /* XXX THIS NEEDS GENERALIZING FOR OS X */ if (ev->button == 1 && (ev->state & Gdk::CONTROL_MASK)) { @@ -535,7 +535,7 @@ private: return ButtonPress (ev, child); /* EMIT SIGNAL */ } - + bool button_release (GdkEventButton* ev, T* child) { if (_expecting_unwanted_button_event == true && child == 0) { @@ -565,7 +565,7 @@ private: setup_child_state (*i); } } - + void add_to_selection (T* child) { if ( !child->is_selectable() ) @@ -583,21 +583,21 @@ private: setup_child_state (c); } } - + T* child_from_widget (Gtk::Widget const * w) const { typename std::list<T*>::const_iterator i = _children.begin(); while (i != _children.end() && &(*i)->widget() != w) { ++i; } - + if (i == _children.end()) { return 0; } return *i; } - + Gtk::VBox _internal_vbox; std::list<Gtk::TargetEntry> _targets; std::list<T*> _children; @@ -611,12 +611,12 @@ private: Gtk::Label* _placeholder; /** Our child being dragged, or 0 */ T* _drag_child; - + static DnDVBox* _drag_source; - + }; template <class T> DnDVBox<T>* DnDVBox<T>::_drag_source = 0; - + } diff --git a/libs/gtkmm2ext/gtkmm2ext/focus_entry.h b/libs/gtkmm2ext/gtkmm2ext/focus_entry.h index cc0c2ef73a..2dce03cb2b 100644 --- a/libs/gtkmm2ext/gtkmm2ext/focus_entry.h +++ b/libs/gtkmm2ext/gtkmm2ext/focus_entry.h @@ -30,7 +30,7 @@ class LIBGTKMM2EXT_API FocusEntry : public Gtk::Entry { public: FocusEntry (); - + protected: bool on_button_press_event (GdkEventButton*); bool on_button_release_event (GdkEventButton*); diff --git a/libs/gtkmm2ext/gtkmm2ext/grouped_buttons.h b/libs/gtkmm2ext/gtkmm2ext/grouped_buttons.h index 06e7fffe83..15b01bff4f 100644 --- a/libs/gtkmm2ext/gtkmm2ext/grouped_buttons.h +++ b/libs/gtkmm2ext/gtkmm2ext/grouped_buttons.h @@ -36,7 +36,7 @@ class LIBGTKMM2EXT_API GroupedButtons : public sigc::trackable public: GroupedButtons (uint32_t nbuttons, uint32_t first_active); GroupedButtons (std::vector<Gtk::ToggleButton *>&); - + Gtk::ToggleButton& button (uint32_t which) { return *buttons[which]; } diff --git a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h index cc0d67b2ec..868f71fd8d 100644 --- a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h +++ b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h @@ -167,7 +167,7 @@ class LIBGTKMM2EXT_API UI : public AbstractUI<UIRequest> sigc::signal<void> theme_changed; static bool just_hide_it (GdkEventAny *, Gtk::Window *); - + protected: virtual void handle_fatal (const char *); virtual void display_message (const char *prefix, gint prefix_len, diff --git a/libs/gtkmm2ext/gtkmm2ext/keyboard.h b/libs/gtkmm2ext/gtkmm2ext/keyboard.h index 73c9ad7d42..fca5d9f817 100644 --- a/libs/gtkmm2ext/gtkmm2ext/keyboard.h +++ b/libs/gtkmm2ext/gtkmm2ext/keyboard.h @@ -145,7 +145,7 @@ class LIBGTKMM2EXT_API Keyboard : public sigc::trackable, PBD::Stateful static void set_insert_note_button (guint); static guint insert_note_modifier() { return insert_note_mod; } static void set_insert_note_modifier(guint); - + static bool is_edit_event (GdkEventButton*); static bool is_delete_event (GdkEventButton*); static bool is_insert_note_event (GdkEventButton*); diff --git a/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h b/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h index ee3ba167a5..91e7a67a7e 100644 --- a/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h +++ b/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h @@ -103,7 +103,7 @@ class LIBGTKMM2EXT_API MotionFeedback : public Gtk::VBox to a display value (0.0 .. 1.0) */ virtual double to_display_value (double) = 0; - + virtual double adjust (double nominal_delta) = 0; private: @@ -130,5 +130,5 @@ class LIBGTKMM2EXT_API MotionFeedback : public Gtk::VBox }; } /* namespace */ - + #endif // __gtkmm2ext_motion_feedback_h__ diff --git a/libs/gtkmm2ext/gtkmm2ext/persistent_tooltip.h b/libs/gtkmm2ext/gtkmm2ext/persistent_tooltip.h index 0ad9439fa8..9883fd2020 100644 --- a/libs/gtkmm2ext/gtkmm2ext/persistent_tooltip.h +++ b/libs/gtkmm2ext/gtkmm2ext/persistent_tooltip.h @@ -34,7 +34,7 @@ class LIBGTKMM2EXT_API PersistentTooltip : public sigc::trackable public: PersistentTooltip (Gtk::Widget *, bool draggable = false, int margin_y = 0); virtual ~PersistentTooltip (); - + void set_tip (std::string); void set_font (Pango::FontDescription font); void set_center_alignment (bool align_to_center); diff --git a/libs/gtkmm2ext/gtkmm2ext/pixscroller.h b/libs/gtkmm2ext/gtkmm2ext/pixscroller.h index 50586a9028..0a0d2593c7 100644 --- a/libs/gtkmm2ext/gtkmm2ext/pixscroller.h +++ b/libs/gtkmm2ext/gtkmm2ext/pixscroller.h @@ -60,7 +60,7 @@ class LIBGTKMM2EXT_API PixScroller : public Gtk::DrawingArea double grab_start; int overall_height; bool dragging; - + float default_value; void adjustment_changed (); diff --git a/libs/gtkmm2ext/gtkmm2ext/scroomer.h b/libs/gtkmm2ext/gtkmm2ext/scroomer.h index 5d9ca69801..4d957b4868 100644 --- a/libs/gtkmm2ext/gtkmm2ext/scroomer.h +++ b/libs/gtkmm2ext/gtkmm2ext/scroomer.h @@ -56,7 +56,7 @@ public: void set_min_page_size(double page_size); int get_handle_size() { return handle_size; } - + inline int position_of(Component comp) { return position[comp]; } sigc::signal0<void> DragStarting; diff --git a/libs/gtkmm2ext/gtkmm2ext/slider_controller.h b/libs/gtkmm2ext/gtkmm2ext/slider_controller.h index 460f4a88ae..e756180eaf 100644 --- a/libs/gtkmm2ext/gtkmm2ext/slider_controller.h +++ b/libs/gtkmm2ext/gtkmm2ext/slider_controller.h @@ -81,4 +81,4 @@ class LIBGTKMM2EXT_API HSliderController : public SliderController }; /* namespace */ -#endif // __gtkmm2ext_slider_controller_h__ +#endif // __gtkmm2ext_slider_controller_h__ diff --git a/libs/gtkmm2ext/gtkmm2ext/textviewer.h b/libs/gtkmm2ext/gtkmm2ext/textviewer.h index 98d13a2a7d..51af88c005 100644 --- a/libs/gtkmm2ext/gtkmm2ext/textviewer.h +++ b/libs/gtkmm2ext/gtkmm2ext/textviewer.h @@ -48,7 +48,7 @@ class LIBGTKMM2EXT_API TextViewer : public Gtk::Window, public Transmitter void insert_file (const std::string &); void scroll_to_bottom (); - + void deliver (); }; diff --git a/libs/gtkmm2ext/gtkmm2ext/utils.h b/libs/gtkmm2ext/gtkmm2ext/utils.h index 0182fec456..62ffba3b9c 100644 --- a/libs/gtkmm2ext/gtkmm2ext/utils.h +++ b/libs/gtkmm2ext/gtkmm2ext/utils.h @@ -58,16 +58,16 @@ namespace Gtkmm2ext { LIBGTKMM2EXT_API void get_ink_pixel_size (Glib::RefPtr<Pango::Layout>, int& width, int& height); - + LIBGTKMM2EXT_API void get_pixel_size (Glib::RefPtr<Pango::Layout>, int& width, int& height); - + LIBGTKMM2EXT_API void set_size_request_to_display_given_text (Gtk::Widget &w, const gchar *text, gint hpadding, gint vpadding); - + LIBGTKMM2EXT_API void set_size_request_to_display_given_text_width (Gtk::Widget& w, const gchar* htext, gint hpadding, @@ -108,7 +108,7 @@ namespace Gtkmm2ext { LIBGTKMM2EXT_API bool set_active_text_if_present (Gtk::ComboBoxText&, const std::string); - + template<class T> /*LIBGTKMM2EXT_API*/ void deferred_delete (void *ptr) { delete static_cast<T *> (ptr); } @@ -131,7 +131,7 @@ namespace Gtkmm2ext { LIBGTKMM2EXT_API void container_clear (Gtk::Container&); /* C++ API for rounded rectangles */ - + LIBGTKMM2EXT_API void rounded_rectangle (Cairo::RefPtr<Cairo::Context> context, double x, double y, double w, double h, double r=10); LIBGTKMM2EXT_API void rounded_top_rectangle (Cairo::RefPtr<Cairo::Context> context, double x, double y, double w, double h, double r=10); LIBGTKMM2EXT_API void rounded_top_left_rectangle (Cairo::RefPtr<Cairo::Context> context, double x, double y, double w, double h, double r=10); diff --git a/libs/gtkmm2ext/gtkmm2ext/widget_state.h b/libs/gtkmm2ext/gtkmm2ext/widget_state.h index 3e873f303b..bb8bd375f0 100644 --- a/libs/gtkmm2ext/gtkmm2ext/widget_state.h +++ b/libs/gtkmm2ext/gtkmm2ext/widget_state.h @@ -14,7 +14,7 @@ namespace Gtkmm2ext { ExplicitActive, ImplicitActive, }; - + enum LIBGTKMM2EXT_API VisualState { /* these can be OR-ed together */ NoVisualState = 0x0, |