diff options
| author | John Smith <john.smith7545@yahoo.com> | 2012-09-17 23:44:30 +0000 |
|---|---|---|
| committer | John Smith <john.smith7545@yahoo.com> | 2012-09-17 23:44:30 +0000 |
| commit | 979d809bbbe2d3ed1fc5a296c8f99f5d8c395f4b (patch) | |
| tree | 23aacc7cf2cfbbca969ecc36207a9c73cbea6d58 /src/widgets/stroke-marker-selector.cpp | |
| parent | fix typo in marker bbox calculation (Bug 1051131) (diff) | |
| download | inkscape-979d809bbbe2d3ed1fc5a296c8f99f5d8c395f4b.tar.gz inkscape-979d809bbbe2d3ed1fc5a296c8f99f5d8c395f4b.zip | |
Fix for 165865 : Fix marker color on duplicate
(bzr r11671)
Diffstat (limited to 'src/widgets/stroke-marker-selector.cpp')
| -rw-r--r-- | src/widgets/stroke-marker-selector.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
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); |