diff options
Diffstat (limited to 'src/widgets/gradient-vector.h')
| -rw-r--r-- | src/widgets/gradient-vector.h | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/src/widgets/gradient-vector.h b/src/widgets/gradient-vector.h index 9858ce784..b63120a6e 100644 --- a/src/widgets/gradient-vector.h +++ b/src/widgets/gradient-vector.h @@ -15,12 +15,21 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <glib.h> +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H +#include <glibmm/threads.h> +#endif + +#include <gtkmm/liststore.h> #include <stddef.h> #include <sigc++/connection.h> #include <gtk/gtk.h> +#include "gradient-selector.h" #define SP_TYPE_GRADIENT_VECTOR_SELECTOR (sp_gradient_vector_selector_get_type ()) #define SP_GRADIENT_VECTOR_SELECTOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_GRADIENT_VECTOR_SELECTOR, SPGradientVectorSelector)) @@ -43,16 +52,14 @@ struct SPGradientVectorSelector { SPDocument *doc; SPGradient *gr; - /* ComboBox of gradient vectors */ - GtkWidget *combo_box; - GtkListStore *store; + /* Gradient vectors store */ + Glib::RefPtr<Gtk::ListStore> store; + SPGradientSelector::ModelColumns *columns; sigc::connection gradient_release_connection; sigc::connection defs_release_connection; sigc::connection defs_modified_connection; - - gulong combo_connection; - + sigc::connection tree_select_connection; void setSwatched(); }; @@ -77,8 +84,8 @@ GtkWidget *sp_gradient_vector_editor_new (SPGradient *gradient, SPStop *stop = N guint32 sp_average_color(guint32 c1, guint32 c2, gdouble p = 0.5); -gchar *gr_prepare_label (SPObject *obj); - +Glib::ustring gr_prepare_label (SPObject *obj); +Glib::ustring gr_ellipsize_text(Glib::ustring const &src, size_t maxlen); #endif // SEEN_GRADIENT_VECTOR_H |