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

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

diff --git a/libs/gtkmm2/gtk/gtkmm/fileselection.h b/libs/gtkmm2/gtk/gtkmm/fileselection.h
index 5923b16da0db6754d7ebaf3c57b068b40d6b40a3..109b2b7e2a1c303a350aeb9c16f5edd4862b0ba1 100644 (file)
--- a/libs/gtkmm2/gtk/gtkmm/fileselection.h
+++ b/libs/gtkmm2/gtk/gtkmm/fileselection.h
@@ -3,6 +3,8 @@
 #ifndef _GTKMM_FILESELECTION_H
 #define _GTKMM_FILESELECTION_H
 
+#include <gtkmmconfig.h>
+
 #ifndef GTKMM_DISABLE_DEPRECATED
 
 
@@ -30,6 +32,10 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+// This is for including the config header before any code (such as
+// the #ifndef GTKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
+
+
 #include <gtkmm/dialog.h>
 #include <gtkmm/button.h>
 #include <gtkmm/entry.h>
@@ -279,10 +285,13 @@ public:
 
 namespace Glib
 {
-  /** @relates Gtk::FileSelection
-   * @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::FileSelection
    */
   Gtk::FileSelection* wrap(GtkFileSelection* object, bool take_copy = false);
 } //namespace Glib