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

[ardour.git] / libs / gtkmm2 / gtk / gtkmm / private / socket_p.h

diff --git a/libs/gtkmm2/gtk/gtkmm/private/socket_p.h b/libs/gtkmm2/gtk/gtkmm/private/socket_p.h
index 5689897e400f9d6913b055fb6da550937720df58..7ca7f82aab77c06c7f62c907e09b27aa441dd005 100644 (file)
--- a/libs/gtkmm2/gtk/gtkmm/private/socket_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/socket_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_SOCKET_P_H
 #define _GTKMM_SOCKET_P_H
+
+
 #include <gtkmm/private/container_p.h>
 
 #include <glibmm/class.h>
@@ -30,17 +32,22 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void plug_added_callback(GtkSocket* self);
   static gboolean plug_removed_callback(GtkSocket* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_SOCKET_P_H */