diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2005-10-09 12:51:04 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2005-10-09 12:51:04 +0000 |
| commit | 8e591b058786c842c46790c96b806ad1eca6cbec (patch) | |
| tree | 44cb2eadc11cd3436559aa28635e0c5f5f8212ad /gtk2_ardour/utils.h | |
| parent | c38fdbc64c73c686f9f55729b352f8d0f4c09070 (diff) | |
fixes for utils.cc in gtk2_ardour and gtkmm2ext, including switch to Pango::FontDescription rather than string
git-svn-id: svn://localhost/trunk/ardour2@53 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/utils.h')
| -rw-r--r-- | gtk2_ardour/utils.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h index b844e0eb30..1b33db7a4a 100644 --- a/gtk2_ardour/utils.h +++ b/gtk2_ardour/utils.h @@ -51,7 +51,7 @@ slider_position_to_gain (double pos) } std::string short_version (std::string, std::string::size_type target_length); -std::string fit_to_pixels (std::string, int32_t pixel_width, Gdk::Font&); +std::string fit_to_pixels (std::string, int pixel_width, std::string font); int atoi (const std::string&); double atof (const std::string&); @@ -66,9 +66,14 @@ unsigned char* xpm2rgba (const char** xpm, uint32_t& w, uint32_t& h); GnomeCanvasPoints* get_canvas_points (std::string who, uint32_t npoints); int channel_combo_get_channel_count (Gtk::ComboBoxText& combo); -std::string get_font_for_style (std::string widgetname); +Pango::FontDescription get_font_for_style (std::string widgetname); gint pane_handler (GdkEventButton*, Gtk::Paned*); uint32_t rgba_from_style (std::string style, uint32_t, uint32_t, uint32_t, uint32_t); +Glib::RefPtr<Gtk::Action> register_action (Glib::RefPtr<Gtk::ActionGroup> group, string name, string label, sigc::slot<void> sl, guint key, Gdk::ModifierType mods); +Glib::RefPtr<Gtk::Action> register_action (Glib::RefPtr<Gtk::ActionGroup> group, string name, string label, sigc::slot<void> sl); +Glib::RefPtr<Gtk::Action> register_action (Glib::RefPtr<Gtk::ActionGroup> group, string name, string label); + + #endif /* __ardour_gtk_utils_h__ */ |