Minor doc cleanup

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

diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h
index 44f48186088cc813dc4fda51f3c22c293df70ae5..52c291c0da509c7d9f746e35d637fe7cc8856dc2 100644 (file)
--- a/gtk/gtkscrolledwindow.h
+++ b/gtk/gtkscrolledwindow.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -24,18 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_SCROLLED_WINDOW_H__
 #define __GTK_SCROLLED_WINDOW_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
 
-#include <gtk/gtkhscrollbar.h>
-#include <gtk/gtkvscrollbar.h>
-#include <gtk/gtkviewport.h>
-
+#include <gtk/gtkbin.h>
 
 G_BEGIN_DECLS
 
@@ -112,6 +106,7 @@ GtkCornerType  gtk_scrolled_window_get_placement     (GtkScrolledWindow *scrolle
 void           gtk_scrolled_window_set_shadow_type   (GtkScrolledWindow *scrolled_window,
                                                      GtkShadowType      type);
 GtkShadowType  gtk_scrolled_window_get_shadow_type   (GtkScrolledWindow *scrolled_window);
+GDK_DEPRECATED_IN_3_8_FOR(gtk_container_add)
 void          gtk_scrolled_window_add_with_viewport (GtkScrolledWindow *scrolled_window,
                                                      GtkWidget         *child);
 
@@ -121,12 +116,17 @@ void           gtk_scrolled_window_set_min_content_width  (GtkScrolledWindow *sc
 gint           gtk_scrolled_window_get_min_content_height (GtkScrolledWindow *scrolled_window);
 void           gtk_scrolled_window_set_min_content_height (GtkScrolledWindow *scrolled_window,
                                                            gint               height);
-GtkScrollablePolicy gtk_scrolled_window_get_hscroll_policy (GtkScrolledWindow   *scrolled_window);
-void                gtk_scrolled_window_set_hscroll_policy (GtkScrolledWindow   *scrolled_window,
-                                                            GtkScrollablePolicy  policy);
-GtkScrollablePolicy gtk_scrolled_window_get_vscroll_policy (GtkScrolledWindow   *scrolled_window);
-void                gtk_scrolled_window_set_vscroll_policy (GtkScrolledWindow   *scrolled_window,
-                                                            GtkScrollablePolicy  policy);
+GDK_AVAILABLE_IN_3_4
+void           gtk_scrolled_window_set_kinetic_scrolling  (GtkScrolledWindow        *scrolled_window,
+                                                           gboolean                  kinetic_scrolling);
+GDK_AVAILABLE_IN_3_4
+gboolean       gtk_scrolled_window_get_kinetic_scrolling  (GtkScrolledWindow        *scrolled_window);
+
+GDK_AVAILABLE_IN_3_4
+void           gtk_scrolled_window_set_capture_button_press (GtkScrolledWindow      *scrolled_window,
+                                                             gboolean                capture_button_press);
+GDK_AVAILABLE_IN_3_4
+gboolean       gtk_scrolled_window_get_capture_button_press (GtkScrolledWindow      *scrolled_window);
 
 gint _gtk_scrolled_window_get_scrollbar_spacing (GtkScrolledWindow *scrolled_window);