diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2009-04-15 18:04:23 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-04-15 18:04:23 +0000 |
commit | 54d9f2f2d83af1f0f44579fe2ebf090e68259938 (patch) | |
tree | 44a61c36048be6edabeb5fc5461d47c95623f79f /libs/gtkmm2ext/gtkmm2ext/utils.h | |
parent | ece2bacb2c7d7f72b6a25a75760837efce0d5e30 (diff) |
first half of the mega-by-hand-commit-by-commit merge from 2.X
git-svn-id: svn://localhost/ardour2/branches/3.0@4980 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/gtkmm2ext/gtkmm2ext/utils.h')
-rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/utils.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/libs/gtkmm2ext/gtkmm2ext/utils.h b/libs/gtkmm2ext/gtkmm2ext/utils.h index e664f2420d..7f986e738c 100644 --- a/libs/gtkmm2ext/gtkmm2ext/utils.h +++ b/libs/gtkmm2ext/gtkmm2ext/utils.h @@ -45,12 +45,21 @@ namespace Gtkmm2ext { gint vpadding); void set_size_request_to_display_given_text (Gtk::Widget &w, - const std::vector<std::string>&, + const std::vector<std::string>&, gint hpadding, gint vpadding); void set_popdown_strings (Gtk::ComboBoxText&, - const std::vector<std::string>&); + const std::vector<std::string>&, + bool set_size = false, + gint hpadding = 0, gint vpadding = 0); + + // Combo's are stupid - they steal space from the entry for the button +#ifdef GTKOSX + static const guint32 COMBO_FUDGE = 38; +#else + static const guint32 COMBO_FUDGE = 24; +#endif template<class T> void deferred_delete (void *ptr) { delete static_cast<T *> (ptr); |