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

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

diff --git a/libs/gtkmm2/gtk/gtkmm/private/style_p.h b/libs/gtkmm2/gtk/gtkmm/private/style_p.h
index 8c10fca392eeb0d28a9f1ca7ec5556eb376b05b5..ffa0a4980676180390b9dbb24a88a51f3bfcb7b2 100644 (file)
--- a/libs/gtkmm2/gtk/gtkmm/private/style_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/style_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_STYLE_P_H
 #define _GTKMM_STYLE_P_H
+
+
 #include <glibmm/private/object_p.h>
 #include <gtk/gtkrc.h>
 
@@ -31,13 +33,16 @@ 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 realize_callback(GtkStyle* self);
   static void unrealize_callback(GtkStyle* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static void realize_vfunc_callback(GtkStyle* self);
   static void unrealize_vfunc_callback(GtkStyle* self);
   static void copy_vfunc_callback(GtkStyle* self, GtkStyle* src);
@@ -66,10 +71,12 @@ protected:
   static void draw_expander_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, GtkExpanderStyle expander_style);
   static void draw_layout_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, gboolean use_text, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, PangoLayout* layout);
   static void draw_resize_grip_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, GdkWindowEdge edge, gint x, gint y, gint width, gint height);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_STYLE_P_H */