projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 aa297a6daa6926fa864549c617fed7e0c85128ed..7033003bdeda521c706d0bf357648d535914d43b 100644 (file)
--- a/libs/gtkmm2/gtk/gtkmm/scrolledwindow.cc
+++ b/libs/gtkmm2/gtk/gtkmm/scrolledwindow.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/private/scrolledwindow_p.h>
 
@@ -100,8 +101,19 @@ void ScrolledWindow_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* ScrolledWindow_Class::wrap_new(GObject* o)
 {
@@ -144,36 +156,38 @@ 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)))
 {
   }
 
 void ScrolledWindow::set_hadjustment(Gtk::Adjustment* hadjustment)
 {
-  gtk_scrolled_window_set_hadjustment(gobj(), (GtkAdjustment*)Glib::unwrap(hadjustment));
+gtk_scrolled_window_set_hadjustment(gobj(), (GtkAdjustment*)Glib::unwrap(hadjustment)); 
 }
 
 void ScrolledWindow::set_vadjustment(Gtk::Adjustment* vadjustment)
 {
-  gtk_scrolled_window_set_vadjustment(gobj(), (GtkAdjustment*)Glib::unwrap(vadjustment));
+gtk_scrolled_window_set_vadjustment(gobj(), (GtkAdjustment*)Glib::unwrap(vadjustment)); 
 }
 
 void ScrolledWindow::set_hadjustment(Gtk::Adjustment& hadjustment)
 {
-  gtk_scrolled_window_set_hadjustment(gobj(), (hadjustment).gobj());
+gtk_scrolled_window_set_hadjustment(gobj(), (hadjustment).gobj()); 
 }
 
 void ScrolledWindow::set_vadjustment(Gtk::Adjustment& vadjustment)
 {
-  gtk_scrolled_window_set_vadjustment(gobj(), (vadjustment).gobj());
+gtk_scrolled_window_set_vadjustment(gobj(), (vadjustment).gobj()); 
 }
 
 Gtk::Adjustment* ScrolledWindow::get_hadjustment()
@@ -183,7 +197,7 @@ Gtk::Adjustment* ScrolledWindow::get_hadjustment()
 
 const Gtk::Adjustment* ScrolledWindow::get_hadjustment() const
 {
-  return Glib::wrap(gtk_scrolled_window_get_hadjustment(const_cast<GtkScrolledWindow*>(gobj())));
+  return const_cast<ScrolledWindow*>(this)->get_hadjustment();
 }
 
 Gtk::Adjustment* ScrolledWindow::get_vadjustment()
@@ -193,22 +207,27 @@ Gtk::Adjustment* ScrolledWindow::get_vadjustment()
 
 const Gtk::Adjustment* ScrolledWindow::get_vadjustment() const
 {
-  return Glib::wrap(gtk_scrolled_window_get_vadjustment(const_cast<GtkScrolledWindow*>(gobj())));
+  return const_cast<ScrolledWindow*>(this)->get_vadjustment();
 }
 
 void ScrolledWindow::set_policy(PolicyType hscrollbar_policy, PolicyType vscrollbar_policy)
 {
-  gtk_scrolled_window_set_policy(gobj(), ((GtkPolicyType)(hscrollbar_policy)), ((GtkPolicyType)(vscrollbar_policy)));
+gtk_scrolled_window_set_policy(gobj(), ((GtkPolicyType)(hscrollbar_policy)), ((GtkPolicyType)(vscrollbar_policy))); 
 }
 
 void ScrolledWindow::get_policy(PolicyType& hscrollbar_policy, PolicyType& vscrollbar_policy) const
 {
-  gtk_scrolled_window_get_policy(const_cast<GtkScrolledWindow*>(gobj()), ((GtkPolicyType*) &(hscrollbar_policy)), ((GtkPolicyType*) &(vscrollbar_policy)));
+gtk_scrolled_window_get_policy(const_cast<GtkScrolledWindow*>(gobj()), ((GtkPolicyType*) &(hscrollbar_policy)), ((GtkPolicyType*) &(vscrollbar_policy))); 
 }
 
 void ScrolledWindow::set_placement(CornerType window_placement)
 {
-  gtk_scrolled_window_set_placement(gobj(), ((GtkCornerType)(window_placement)));
+gtk_scrolled_window_set_placement(gobj(), ((GtkCornerType)(window_placement))); 
+}
+
+void ScrolledWindow::unset_placement()
+{
+gtk_scrolled_window_unset_placement(gobj()); 
 }
 
 CornerType ScrolledWindow::get_placement() const
@@ -218,7 +237,7 @@ CornerType ScrolledWindow::get_placement() const
 
 void ScrolledWindow::set_shadow_type(ShadowType type)
 {
-  gtk_scrolled_window_set_shadow_type(gobj(), ((GtkShadowType)(type)));
+gtk_scrolled_window_set_shadow_type(gobj(), ((GtkShadowType)(type))); 
 }
 
 ShadowType ScrolledWindow::get_shadow_type() const
@@ -226,96 +245,127 @@ ShadowType ScrolledWindow::get_shadow_type() const
   return ((ShadowType)(gtk_scrolled_window_get_shadow_type(const_cast<GtkScrolledWindow*>(gobj()))));
 }
 
-bool ScrolledWindow::get_vscrollbar_visible() const
+VScrollbar* ScrolledWindow::get_vscrollbar()
 {
-  return gobj()->hscrollbar_visible;
+  return Glib::wrap((GtkVScrollbar*)gtk_scrolled_window_get_vscrollbar(gobj()));
 }
 
-bool ScrolledWindow::get_hscrollbar_visible() const
+const VScrollbar* ScrolledWindow::get_vscrollbar() const
 {
-  return gobj()->vscrollbar_visible;
+  return Glib::wrap((GtkVScrollbar*)gtk_scrolled_window_get_vscrollbar(const_cast<GtkScrolledWindow*>(gobj())));
 }
 
-Gtk::HScrollbar* ScrolledWindow::get_hscrollbar()
+HScrollbar* ScrolledWindow::get_hscrollbar()
 {
-  return Glib::wrap((GtkHScrollbar*)(gobj()->hscrollbar));
+  return Glib::wrap((GtkHScrollbar*)gtk_scrolled_window_get_hscrollbar(gobj()));
 }
 
-const Gtk::HScrollbar* ScrolledWindow::get_hscrollbar() const
+const HScrollbar* ScrolledWindow::get_hscrollbar() const
 {
-  return Glib::wrap((GtkHScrollbar*)(gobj()->hscrollbar));
+  return Glib::wrap((GtkHScrollbar*)gtk_scrolled_window_get_hscrollbar(const_cast<GtkScrolledWindow*>(gobj())));
 }
 
-Gtk::VScrollbar* ScrolledWindow::get_vscrollbar()
+ bool ScrolledWindow::get_vscrollbar_visible() const
 {
-  return Glib::wrap((GtkVScrollbar*)(gobj()->vscrollbar));
+  return gobj()->vscrollbar_visible;
 }
-
-const Gtk::VScrollbar* ScrolledWindow::get_vscrollbar() const
+ 
+ bool ScrolledWindow::get_hscrollbar_visible() const
 {
-  return Glib::wrap((GtkVScrollbar*)(gobj()->vscrollbar));
+  return gobj()->hscrollbar_visible;
 }
+ 
 
-
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Gtk::Adjustment*> ScrolledWindow::property_hadjustment() 
 {
   return Glib::PropertyProxy<Gtk::Adjustment*>(this, "hadjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Gtk::Adjustment*> ScrolledWindow::property_hadjustment() const
 {
   return Glib::PropertyProxy_ReadOnly<Gtk::Adjustment*>(this, "hadjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Gtk::Adjustment*> ScrolledWindow::property_vadjustment() 
 {
   return Glib::PropertyProxy<Gtk::Adjustment*>(this, "vadjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Gtk::Adjustment*> ScrolledWindow::property_vadjustment() const
 {
   return Glib::PropertyProxy_ReadOnly<Gtk::Adjustment*>(this, "vadjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<PolicyType> ScrolledWindow::property_hscrollbar_policy() 
 {
   return Glib::PropertyProxy<PolicyType>(this, "hscrollbar-policy");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<PolicyType> ScrolledWindow::property_hscrollbar_policy() const
 {
   return Glib::PropertyProxy_ReadOnly<PolicyType>(this, "hscrollbar-policy");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<PolicyType> ScrolledWindow::property_vscrollbar_policy() 
 {
   return Glib::PropertyProxy<PolicyType>(this, "vscrollbar-policy");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<PolicyType> ScrolledWindow::property_vscrollbar_policy() const
 {
   return Glib::PropertyProxy_ReadOnly<PolicyType>(this, "vscrollbar-policy");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<CornerType> ScrolledWindow::property_window_placement() 
 {
   return Glib::PropertyProxy<CornerType>(this, "window-placement");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<CornerType> ScrolledWindow::property_window_placement() const
 {
   return Glib::PropertyProxy_ReadOnly<CornerType>(this, "window-placement");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<ShadowType> ScrolledWindow::property_shadow_type() 
 {
   return Glib::PropertyProxy<ShadowType>(this, "shadow-type");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<ShadowType> ScrolledWindow::property_shadow_type() const
 {
   return Glib::PropertyProxy_ReadOnly<ShadowType>(this, "shadow-type");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
Unnamed repository; edit this file 'description' to name the repository.