Change marker layout in stroke-widget so they are all on one line.

(bzr r12363)

1 files changed, 0 insertions, 10 deletions

diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp
index 62fa47603..5ac6d5f34 100644
--- a/src/widgets/stroke-marker-selector.cpp
+++ b/src/widgets/stroke-marker-selector.cpp
@@ -56,10 +56,6 @@ MarkerComboBox::MarkerComboBox(gchar const *id, int l) :
     marker_store = Gtk::ListStore::create(marker_columns);
     set_model(marker_store);
     pack_start(image_renderer, false);
-    pack_end(label_renderer, true);
-    label_renderer.set_padding(2, 0);
-    image_renderer.set_padding(2, 0);
-    set_cell_data_func(label_renderer, sigc::mem_fun(*this, &MarkerComboBox::prepareLabelRenderer));
     set_cell_data_func(image_renderer, sigc::mem_fun(*this, &MarkerComboBox::prepareImageRenderer));
     gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(gobj()), MarkerComboBox::separator_cb, NULL, NULL);
 
@@ -559,12 +555,6 @@ MarkerComboBox::create_marker_image(unsigned psize, gchar const *mname,
     return pb;
 }
 
-void MarkerComboBox::prepareLabelRenderer( Gtk::TreeModel::const_iterator const &row ) {
-    Glib::ustring name=(*row)[marker_columns.label];
-    label_renderer.property_markup() = name.c_str();
-    label_renderer.property_scale() = 0.8;
-}
-
 void MarkerComboBox::prepareImageRenderer( Gtk::TreeModel::const_iterator const &row ) {
 
     Gtk::Image *image = (*row)[marker_columns.image];