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

[ardour.git] / libs / gtkmm2 / gtk / gtkmm / plug.h

diff --git a/libs/gtkmm2/gtk/gtkmm/plug.h b/libs/gtkmm2/gtk/gtkmm/plug.h
index 030bdc63c5d57e155b6a2289aa139c5aa6ea5674..1cb54462a7c7a40e47e57a9620ce44d95beaff82 100644 (file)
--- a/libs/gtkmm2/gtk/gtkmm/plug.h
+++ b/libs/gtkmm2/gtk/gtkmm/plug.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_PLUG_H
 #define _GTKMM_PLUG_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -82,12 +83,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_embedded();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -111,6 +118,11 @@ public:
   GdkNativeWindow get_id() const;
 
   
+  /**
+   * @par Prototype:
+   * <tt>void on_my_%embedded()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_embedded();
 
 
@@ -121,12 +133,17 @@ public:
 
 namespace Glib
 {
-  /** @relates Gtk::Plug
-   * @param object The C instance
+  /** A Glib::wrap() method for this object.
+   * 
+   * @param object The C instance.
    * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref.
    * @result A C++ instance that wraps this C instance.
+   *
+   * @relates Gtk::Plug
    */
   Gtk::Plug* wrap(GtkPlug* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_PLUG_H */