Merged trunk

(bzr r14954.1.30)

1 files changed, 0 insertions, 33 deletions

diff --git a/src/ui/widget/highlight-picker.cpp b/src/ui/widget/highlight-picker.cpp
index c1068c9b2..561c1332a 100644
--- a/src/ui/widget/highlight-picker.cpp
+++ b/src/ui/widget/highlight-picker.cpp
@@ -32,8 +32,6 @@ HighlightPicker::~HighlightPicker()
 {
 }
 
-
-#if WITH_GTKMM_3_0
 void HighlightPicker::get_preferred_height_vfunc(Gtk::Widget& widget,
                                               int& min_h,
                                               int& nat_h) const
@@ -63,39 +61,12 @@ void HighlightPicker::get_preferred_width_vfunc(Gtk::Widget& widget,
         nat_w += (nat_w) >> 1;
     }
 }
-#else
-void HighlightPicker::get_size_vfunc(Gtk::Widget& widget,
-                                  const Gdk::Rectangle* cell_area,
-                                  int* x_offset,
-                                  int* y_offset,
-                                  int* width,
-                                  int* height ) const
-{
-    Gtk::CellRendererPixbuf::get_size_vfunc( widget, cell_area, x_offset, y_offset, width, height );
-
-    if ( width ) {
-        *width = 10;//+= (*width) >> 1;
-    }
-    if ( height ) {
-        *height = 20; //cell_area ? cell_area->get_height() / 2 : 50; //+= (*height) >> 1;
-    }
-}
-#endif
 
-#if WITH_GTKMM_3_0
 void HighlightPicker::render_vfunc( const Cairo::RefPtr<Cairo::Context>& cr,
                                  Gtk::Widget& widget,
                                  const Gdk::Rectangle& background_area,
                                  const Gdk::Rectangle& cell_area,
                                  Gtk::CellRendererState flags )
-#else
-void HighlightPicker::render_vfunc( const Glib::RefPtr<Gdk::Drawable>& window,
-                                 Gtk::Widget& widget,
-                                 const Gdk::Rectangle& background_area,
-                                 const Gdk::Rectangle& cell_area,
-                                 const Gdk::Rectangle& expose_area,
-                                 Gtk::CellRendererState flags )
-#endif
 {
     GdkRectangle carea;
 
@@ -137,11 +108,7 @@ void HighlightPicker::render_vfunc( const Glib::RefPtr<Gdk::Drawable>& window,
     convert_pixbuf_argb32_to_normal(pixbuf);
     
     property_pixbuf() = Glib::wrap(pixbuf);
-#if WITH_GTKMM_3_0
     Gtk::CellRendererPixbuf::render_vfunc( cr, widget, background_area, cell_area, flags );
-#else
-    Gtk::CellRendererPixbuf::render_vfunc( window, widget, background_area, cell_area, expose_area, flags );
-#endif
 }
 
 bool HighlightPicker::activate_vfunc(GdkEvent* /*event*/,