diff options
Diffstat (limited to 'libs')
-rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/utils.h | 10 | ||||
-rw-r--r-- | libs/gtkmm2ext/gtkutils.cc | 8 | ||||
-rw-r--r-- | libs/gtkmm2ext/popup.cc | 2 | ||||
-rw-r--r-- | libs/gtkmm2ext/utils.cc | 6 |
4 files changed, 13 insertions, 13 deletions
diff --git a/libs/gtkmm2ext/gtkmm2ext/utils.h b/libs/gtkmm2ext/gtkmm2ext/utils.h index 867f9ed904..7dd6b2ad9d 100644 --- a/libs/gtkmm2ext/gtkmm2ext/utils.h +++ b/libs/gtkmm2ext/gtkmm2ext/utils.h @@ -26,11 +26,11 @@ namespace Gtkmm2ext { void init (); - void set_usize_to_display_given_text (Gtk::Widget &w, - const gchar *text, - gint hpadding, - gint vpadding); - + void set_size_request_to_display_given_text (Gtk::Widget &w, + const gchar *text, + gint hpadding, + gint vpadding); + template<class T> void deferred_delete (void *ptr) { delete static_cast<T *> (ptr); } diff --git a/libs/gtkmm2ext/gtkutils.cc b/libs/gtkmm2ext/gtkutils.cc index a4e86b0a22..48d688cd5c 100644 --- a/libs/gtkmm2ext/gtkutils.cc +++ b/libs/gtkmm2ext/gtkutils.cc @@ -24,10 +24,10 @@ #include <gtkmm2ext/gtkutils.h> void -set_usize_to_display_given_text (Gtk::Widget &w, - const std::string& text, - gint hpadding, - gint vpadding) +set_size_request_to_display_given_text (Gtk::Widget &w, + const std::string& text, + gint hpadding, + gint vpadding) { int height = 0; int width = 0; diff --git a/libs/gtkmm2ext/popup.cc b/libs/gtkmm2ext/popup.cc index 540edba5c3..a29be1932f 100644 --- a/libs/gtkmm2ext/popup.cc +++ b/libs/gtkmm2ext/popup.cc @@ -85,7 +85,7 @@ PopUp::touch () if (is_visible ()) { remove (); } else { - set_usize_to_display_given_text (label, my_text.c_str(), 25, 10); + set_size_request_to_display_given_text (label, my_text.c_str(), 25, 10); label.set_text (my_text); show_all (); diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc index 0366c02f12..54b6c7d987 100644 --- a/libs/gtkmm2ext/utils.cc +++ b/libs/gtkmm2ext/utils.cc @@ -24,12 +24,12 @@ #include "i18n.h" void -Gtkmm2ext::set_usize_to_display_given_text (Gtk::Widget &w, const gchar *text, - gint hpadding, gint vpadding) +Gtkmm2ext::set_size_request_to_display_given_text (Gtk::Widget &w, const gchar *text, + gint hpadding, gint vpadding) { w.ensure_style (); - set_usize_to_display_given_text(w, text, hpadding, vpadding); + set_size_request_to_display_given_text(w, text, hpadding, vpadding); } gint |