summaryrefslogtreecommitdiffstats
path: root/src/widgets/paint-selector.h
diff options
context:
space:
mode:
authorJohn Smith <john.smith7545@yahoo.com>2012-04-22 02:53:31 +0000
committerJohn Smith <removethis.john.q.public@bigmail.com>2012-04-22 02:53:31 +0000
commit9c6943dfd60bfe3a0eb6cfaacac353ce1674a4f3 (patch)
treebf008dea5b102fc3d7ee2f352f396eef56550ff7 /src/widgets/paint-selector.h
parentReplace deprecated toolbar orientation API. Unfortunately there is no replace... (diff)
downloadinkscape-9c6943dfd60bfe3a0eb6cfaacac353ce1674a4f3.tar.gz
inkscape-9c6943dfd60bfe3a0eb6cfaacac353ce1674a4f3.zip
Fix for 979577 : Build fails on Ubuntu Lucid - Replace deprecated gtk_option_menu with gtk_combo_box
(bzr r11276)
Diffstat (limited to '')
-rw-r--r--src/widgets/paint-selector.h6
1 files changed, 6 insertions, 0 deletions
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;