Merged revisions 6293,6296-6306,6308 via svnmerge from

[ardour.git] / libs / gtkmm2 / gtk / gtkmm / scrolledwindow.cc

diff --git a/libs/gtkmm2/gtk/gtkmm/scrolledwindow.cc b/libs/gtkmm2/gtk/gtkmm/scrolledwindow.cc
index 8319f9d821adac6a59ecf6f5a7a2f32f9ec78ee7..7033003bdeda521c706d0bf357648d535914d43b 100644 (file)
--- a/libs/gtkmm2/gtk/gtkmm/scrolledwindow.cc
+++ b/libs/gtkmm2/gtk/gtkmm/scrolledwindow.cc
@@ -156,15 +156,17 @@ GType ScrolledWindow::get_base_type()
 
 ScrolledWindow::ScrolledWindow()
 :
-  Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations.
+  // Mark this class as non-derived to allow C++ vfuncs to be skipped.
+  Glib::ObjectBase(0),
   Gtk::Bin(Glib::ConstructParams(scrolledwindow_class_.init()))
 {
   }
 
 ScrolledWindow::ScrolledWindow(Adjustment& hadjustment, Adjustment& vadjustment)
 :
-  Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations.
-  Gtk::Bin(Glib::ConstructParams(scrolledwindow_class_.init(), "hadjustment", (hadjustment).gobj(), "vadjustment", (vadjustment).gobj(), (char*) 0))
+  // Mark this class as non-derived to allow C++ vfuncs to be skipped.
+  Glib::ObjectBase(0),
+  Gtk::Bin(Glib::ConstructParams(scrolledwindow_class_.init(), "hadjustment", (hadjustment).gobj(), "vadjustment", (vadjustment).gobj(), static_cast<char*>(0)))
 {
   }