If we don't HAVE_XCONVERTCASE we must #include gdkkeysyms.h to get the

[~andy/gtk] / examples / scrolledwin / scrolledwin.c

diff --git a/examples/scrolledwin/scrolledwin.c b/examples/scrolledwin/scrolledwin.c
index af3666a1aafa1d5ea0038e6d2bbd9b0f084d4dcf..977dcf20fd16d53923a2390023499ea5e49669d4 100644 (file)
--- a/examples/scrolledwin/scrolledwin.c
+++ b/examples/scrolledwin/scrolledwin.c
@@ -1,15 +1,15 @@
-/* This file extracted from the GTK tutorial. */
-
-/* scrolledwin.c */
+/* example-start scrolledwin scrolledwin.c */
 
 #include <gtk/gtk.h>
 
-void destroy(GtkWidget *widget, gpointer data)
+void destroy( GtkWidget *widget,
+              gpointer   data )
 {
     gtk_main_quit();
 }
 
-int main (int argc, char *argv[])
+int main( int   argc,
+          char *argv[] )
 {
     static GtkWidget *window;
     GtkWidget *scrolled_window;
@@ -21,24 +21,22 @@ int main (int argc, char *argv[])
     gtk_init (&argc, &argv);
     
     /* Create a new dialog window for the scrolled window to be
-     * packed into.  A dialog is just like a normal window except it has a 
-     * vbox and a horizontal seperator packed into it.  It's just a shortcut
-     * for creating dialogs */
+     * packed into.  */
     window = gtk_dialog_new ();
     gtk_signal_connect (GTK_OBJECT (window), "destroy",
                        (GtkSignalFunc) destroy, NULL);
-    gtk_window_set_title (GTK_WINDOW (window), "dialog");
-    gtk_container_border_width (GTK_CONTAINER (window), 0);
+    gtk_window_set_title (GTK_WINDOW (window), "GtkScrolledWindow example");
+    gtk_container_set_border_width (GTK_CONTAINER (window), 0);
     gtk_widget_set_usize(window, 300, 300);
     
     /* create a new scrolled window. */
     scrolled_window = gtk_scrolled_window_new (NULL, NULL);
     
-    gtk_container_border_width (GTK_CONTAINER (scrolled_window), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 10);
     
     /* the policy is one of GTK_POLICY AUTOMATIC, or GTK_POLICY_ALWAYS.
      * GTK_POLICY_AUTOMATIC will automatically decide whether you need
-     * scrollbars, wheras GTK_POLICY_ALWAYS will always leave the scrollbars
+     * scrollbars, whereas GTK_POLICY_ALWAYS will always leave the scrollbars
      * there.  The first one is the horizontal scrollbar, the second, 
      * the vertical. */
     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
@@ -56,19 +54,20 @@ int main (int argc, char *argv[])
     gtk_table_set_col_spacings (GTK_TABLE (table), 10);
     
     /* pack the table into the scrolled window */
-    gtk_container_add (GTK_CONTAINER (scrolled_window), table);
+    gtk_scrolled_window_add_with_viewport (
+                   GTK_SCROLLED_WINDOW (scrolled_window), table);
     gtk_widget_show (table);
     
     /* this simply creates a grid of toggle buttons on the table
      * to demonstrate the scrolled window. */
     for (i = 0; i < 10; i++)
-           for (j = 0; j < 10; j++) {
-               sprintf (buffer, "button (%d,%d)\n", i, j);
-               button = gtk_toggle_button_new_with_label (buffer);
-               gtk_table_attach_defaults (GTK_TABLE (table), button,
-                                          i, i+1, j, j+1);
-               gtk_widget_show (button);
-           }
+       for (j = 0; j < 10; j++) {
+          sprintf (buffer, "button (%d,%d)\n", i, j);
+         button = gtk_toggle_button_new_with_label (buffer);
+         gtk_table_attach_defaults (GTK_TABLE (table), button,
+                                    i, i+1, j, j+1);
+          gtk_widget_show (button);
+       }
     
     /* Add a "close" button to the bottom of the dialog */
     button = gtk_button_new_with_label ("close");
@@ -92,3 +91,4 @@ int main (int argc, char *argv[])
     
     return(0);
 }
+/* example-end */