From 9c6943dfd60bfe3a0eb6cfaacac353ce1674a4f3 Mon Sep 17 00:00:00 2001 From: John Smith Date: Sun, 22 Apr 2012 11:53:31 +0900 Subject: Fix for 979577 : Build fails on Ubuntu Lucid - Replace deprecated gtk_option_menu with gtk_combo_box (bzr r11276) --- src/widgets/paint-selector.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/widgets/paint-selector.h') diff --git a/src/widgets/paint-selector.h b/src/widgets/paint-selector.h index 7400987ee..966921e7a 100644 --- a/src/widgets/paint-selector.h +++ b/src/widgets/paint-selector.h @@ -77,6 +77,7 @@ struct SPPaintSelector { SPColor color; float alpha; + static Mode getModeForStyle(SPStyle const & style, FillOrStroke kind); void setMode( Mode mode ); @@ -97,10 +98,15 @@ struct SPPaintSelector { SPPattern * getPattern(); void updatePatternList( SPPattern *pat ); + static gboolean isSeparator (GtkTreeModel *model, GtkTreeIter *iter, gpointer data); + // TODO move this elsewhere: void setFlatColor( SPDesktop *desktop, const gchar *color_property, const gchar *opacity_property ); }; +enum {COMBO_COL_LABEL=0, COMBO_COL_PATTERN=1, COMBO_COL_STOCK=2, COMBO_COL_SEP=3}; + + /// The SPPaintSelector vtable struct SPPaintSelectorClass { GtkVBoxClass parent_class; -- cgit v1.2.3