label: Set wrap on the layout unconditionally

[~andy/gtk] / gtk / gtkviewport.h

diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h
index 0ceb98724b614fdeb9e31324dacd163ca67f82ed..686531045556ea8de5a9c9ad20fcf2ad9b411853 100644 (file)
--- a/gtk/gtkviewport.h
+++ b/gtk/gtkviewport.h
@@ -55,7 +55,7 @@ struct _GtkViewport
 {
   GtkBin bin;
 
-  /* <private> */
+  /*< private >*/
   GtkViewportPrivate *priv;
 };
 
@@ -63,10 +63,6 @@ struct _GtkViewportClass
 {
   GtkBinClass parent_class;
 
-  void (*set_scroll_adjustments)       (GtkViewport    *viewport,
-                                        GtkAdjustment  *hadjustment,
-                                        GtkAdjustment  *vadjustment);
-
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
@@ -78,12 +74,18 @@ struct _GtkViewportClass
 GType          gtk_viewport_get_type        (void) G_GNUC_CONST;
 GtkWidget*     gtk_viewport_new             (GtkAdjustment *hadjustment,
                                             GtkAdjustment *vadjustment);
+
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
+
 GtkAdjustment* gtk_viewport_get_hadjustment (GtkViewport   *viewport);
 GtkAdjustment* gtk_viewport_get_vadjustment (GtkViewport   *viewport);
 void           gtk_viewport_set_hadjustment (GtkViewport   *viewport,
                                             GtkAdjustment *adjustment);
 void           gtk_viewport_set_vadjustment (GtkViewport   *viewport,
                                             GtkAdjustment *adjustment);
+
+#endif
+
 void           gtk_viewport_set_shadow_type (GtkViewport   *viewport,
                                             GtkShadowType  type);
 GtkShadowType  gtk_viewport_get_shadow_type (GtkViewport   *viewport);