From 979d809bbbe2d3ed1fc5a296c8f99f5d8c395f4b Mon Sep 17 00:00:00 2001 From: John Smith Date: Tue, 18 Sep 2012 08:44:30 +0900 Subject: Fix for 165865 : Fix marker color on duplicate (bzr r11671) --- src/widgets/stroke-marker-selector.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/widgets/stroke-marker-selector.cpp') diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp index 0016dcf1f..206f166f9 100644 --- a/src/widgets/stroke-marker-selector.cpp +++ b/src/widgets/stroke-marker-selector.cpp @@ -45,9 +45,10 @@ static Inkscape::UI::Cache::SvgPreview svg_preview_cache; -MarkerComboBox::MarkerComboBox(gchar const *id) : +MarkerComboBox::MarkerComboBox(gchar const *id, int l) : Gtk::ComboBox(), combo_id(id), + loc(l), updating(false), markerCount(0) { @@ -256,11 +257,6 @@ const gchar * MarkerComboBox::get_active_marker_uri() return marker; } -bool MarkerComboBox::isSelectedStock() -{ - return get_active()->get_value(marker_columns.stock); -} - void MarkerComboBox::set_active_history() { const gchar *markid = get_active()->get_value(marker_columns.marker); -- cgit v1.2.3