s/columns/rows/ in docs. (#70199)

	* gtk/gtktreeview.c (gtk_tree_view_set_reorderable):
	s/columns/rows/ in docs.  (#70199)

	* gtk/gtktreestore.c (gtk_tree_store_insert): s/before/after/ in
	docs. (#71852, #68405)

	* gtk/gtkcalendar.c (gtk_calendar_select_day): Correct a comment.

	* gtk/tmpl/gtksignal.sgml, gtk/tmpl/gtkimage.sgml: s/%d/%%d/ in
	examples.  (#71479)

	* gtk/tmpl/gtkmenu.sgml: Document gtk_menu_set_active as
	quasi-private.  (#69788)

	* gtk/tmpl/gtkcalendar.sgml: Document month as zero-based and
	selected_day as one-based.  (#57169)

diff --git a/ChangeLog b/ChangeLog
index 2f0f3c0935aa3a3e7611b1a7a66c6b226fa922e6..0cfd5a1289aedfcd064456e2eb7da9b1931085fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-02-22  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_reorderable):
+       s/columns/rows/ in docs.  (#70199)
+
+       * gtk/gtktreestore.c (gtk_tree_store_insert): s/before/after/ in 
+       docs. (#71852, #68405)
+
+       * gtk/gtkcalendar.c (gtk_calendar_select_day): Correct a comment.
+
 Thu Feb 21 23:02:29 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.[ch]: add keynav handling for unselect all,

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 2f0f3c0935aa3a3e7611b1a7a66c6b226fa922e6..0cfd5a1289aedfcd064456e2eb7da9b1931085fe 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,13 @@
+2002-02-22  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_reorderable):
+       s/columns/rows/ in docs.  (#70199)
+
+       * gtk/gtktreestore.c (gtk_tree_store_insert): s/before/after/ in 
+       docs. (#71852, #68405)
+
+       * gtk/gtkcalendar.c (gtk_calendar_select_day): Correct a comment.
+
 Thu Feb 21 23:02:29 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.[ch]: add keynav handling for unselect all,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2f0f3c0935aa3a3e7611b1a7a66c6b226fa922e6..0cfd5a1289aedfcd064456e2eb7da9b1931085fe 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2002-02-22  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_reorderable):
+       s/columns/rows/ in docs.  (#70199)
+
+       * gtk/gtktreestore.c (gtk_tree_store_insert): s/before/after/ in 
+       docs. (#71852, #68405)
+
+       * gtk/gtkcalendar.c (gtk_calendar_select_day): Correct a comment.
+
 Thu Feb 21 23:02:29 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.[ch]: add keynav handling for unselect all,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2f0f3c0935aa3a3e7611b1a7a66c6b226fa922e6..0cfd5a1289aedfcd064456e2eb7da9b1931085fe 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+2002-02-22  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_reorderable):
+       s/columns/rows/ in docs.  (#70199)
+
+       * gtk/gtktreestore.c (gtk_tree_store_insert): s/before/after/ in 
+       docs. (#71852, #68405)
+
+       * gtk/gtkcalendar.c (gtk_calendar_select_day): Correct a comment.
+
 Thu Feb 21 23:02:29 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.[ch]: add keynav handling for unselect all,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2f0f3c0935aa3a3e7611b1a7a66c6b226fa922e6..0cfd5a1289aedfcd064456e2eb7da9b1931085fe 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+2002-02-22  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_reorderable):
+       s/columns/rows/ in docs.  (#70199)
+
+       * gtk/gtktreestore.c (gtk_tree_store_insert): s/before/after/ in 
+       docs. (#71852, #68405)
+
+       * gtk/gtkcalendar.c (gtk_calendar_select_day): Correct a comment.
+
 Thu Feb 21 23:02:29 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.[ch]: add keynav handling for unselect all,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2f0f3c0935aa3a3e7611b1a7a66c6b226fa922e6..0cfd5a1289aedfcd064456e2eb7da9b1931085fe 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+2002-02-22  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_reorderable):
+       s/columns/rows/ in docs.  (#70199)
+
+       * gtk/gtktreestore.c (gtk_tree_store_insert): s/before/after/ in 
+       docs. (#71852, #68405)
+
+       * gtk/gtkcalendar.c (gtk_calendar_select_day): Correct a comment.
+
 Thu Feb 21 23:02:29 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.[ch]: add keynav handling for unselect all,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2f0f3c0935aa3a3e7611b1a7a66c6b226fa922e6..0cfd5a1289aedfcd064456e2eb7da9b1931085fe 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+2002-02-22  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_reorderable):
+       s/columns/rows/ in docs.  (#70199)
+
+       * gtk/gtktreestore.c (gtk_tree_store_insert): s/before/after/ in 
+       docs. (#71852, #68405)
+
+       * gtk/gtkcalendar.c (gtk_calendar_select_day): Correct a comment.
+
 Thu Feb 21 23:02:29 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.[ch]: add keynav handling for unselect all,

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 165481dbcbc7151cd0fd7ddc940e4b337b9f88a1..b53f247ed7247f75cbc5f7de1f4dd5d7af7b9028 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,14 @@
+2002-02-22  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/tmpl/gtksignal.sgml, gtk/tmpl/gtkimage.sgml: s/%d/%%d/ in
+       examples.  (#71479)
+
+       * gtk/tmpl/gtkmenu.sgml: Document gtk_menu_set_active as 
+       quasi-private.  (#69788)
+
+       * gtk/tmpl/gtkcalendar.sgml: Document month as zero-based and 
+       selected_day as one-based.  (#57169)
+
 Thu Feb 21 12:11:42 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/Makefile.am (IGNORE_HFILES): Add gtkkeyhash.h

diff --git a/docs/reference/gtk/tmpl/gtkcalendar.sgml b/docs/reference/gtk/tmpl/gtkcalendar.sgml
index f744dd755f0f965ccdae20afad19b78b67f861f0..333cf03aecd6926249f47f61fd3e223bbd64a032 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkcalendar.sgml
+++ b/docs/reference/gtk/tmpl/gtkcalendar.sgml
@@ -56,6 +56,13 @@ year, and selected day respectively.
 All of these fields should be considered read only, and everything in this
 struct should only be modified using the functions provided below.
 </para>
+<note>
+<para>
+Note that <structfield>month</structfield> is zero-based (i.e it allowed values
+are 0-11) while <structfield>selected_day</structfield> is one-based
+(i.e. allowed values are 1-31). 
+</para>
+</note>
 
 
 <!-- ##### ENUM GtkCalendarDisplayOptions ##### -->
@@ -109,7 +116,7 @@ Shifts the calendar to a different month.
 </para>
 
 @calendar: a #GtkCalendar.
-@month: a month number.
+@month: a month number between 0 and 11.
 @year: the year the month is in.
 @Returns: %TRUE.
 
@@ -120,7 +127,8 @@ Selects a day from the current month.
 </para>
 
 @calendar: a #GtkCalendar.
-@day: the day number to select.
+@day: the day number between 1 and 31, or 0 to unselect 
+   the currently selected day.
 
 
 <!-- ##### FUNCTION gtk_calendar_mark_day ##### -->
@@ -129,7 +137,7 @@ Places a visual marker on a particular day.
 </para>
 
 @calendar: a #GtkCalendar.
-@day: the day number to mark.
+@day: the day number to mark between 1 and 31.
 @Returns: %TRUE.
 
 
@@ -139,7 +147,7 @@ Removes the visual marker from a particular day.
 </para>
 
 @calendar: a #GtkCalendar.
-@day: the day number to unmark.
+@day: the day number to unmark between 1 and 31.
 @Returns: %TRUE.
 
 

diff --git a/docs/reference/gtk/tmpl/gtkimage.sgml b/docs/reference/gtk/tmpl/gtkimage.sgml
index f3ef863475f6cee12c4eef17a70c771363aec312..2010765af467ad9f6118d993c397fdc9cab3fe44 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkimage.sgml
+++ b/docs/reference/gtk/tmpl/gtkimage.sgml
@@ -45,7 +45,7 @@ on the image, such as button clicks, place the image inside a
                          GdkEventButton *event,
                          gpointer        data)
   {
-    g_print ("Event box clicked at coordinates %d,%d\n", 
+    g_print ("Event box clicked at coordinates %%d,%%d\n", 
              event->x, event->y);
 
     /* Returning TRUE means we handled the event, so the signal 

diff --git a/docs/reference/gtk/tmpl/gtkmenu.sgml b/docs/reference/gtk/tmpl/gtkmenu.sgml
index c060e31b9236b8010becde9b8f67316c0904267f..fd266c3f822d9ed70090b954464ad67fb76e88eb 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkmenu.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenu.sgml
@@ -246,7 +246,7 @@ selection has not yet been made, the first menu item is selected.
 <!-- ##### FUNCTION gtk_menu_set_active ##### -->
 <para>
 Selects the specified menu item within the menu.  This is used by the
-#GtkOptionMenu.
+#GtkOptionMenu and should not be used by anyone else.
 </para>
 
 @menu: a #GtkMenu.

diff --git a/docs/reference/gtk/tmpl/gtksignal.sgml b/docs/reference/gtk/tmpl/gtksignal.sgml
index 06c1edad2a50c6056e0ab565848b0d48cb0b04af..b5787dbe131a7820c486f529079321823c5d1319 100644 (file)
--- a/docs/reference/gtk/tmpl/gtksignal.sgml
+++ b/docs/reference/gtk/tmpl/gtksignal.sgml
@@ -450,7 +450,7 @@ as parameter to your function:
 <programlisting>
 static void button_clicked_int (GtkButton* button, gpointer func_data)
 {
-       g_print ("button pressed: %d\n", GPOINTER_TO_INT (func_data));
+       g_print ("button pressed: %%d\n", GPOINTER_TO_INT (func_data));
 }
 
 /* By calling this function, you will make the g_print above

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 3d2046e4c819db4df51c790696007643f08b1e79..d52e44a2570a9d7a4a7fba248d5e2353911f76ef 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -2130,7 +2130,7 @@ gtk_calendar_select_day (GtkCalendar *calendar,
   
   calendar->selected_day = day;
   
-  /* Deselect the new day */
+  /* Select the new day */
   if (day != 0)
     {
       if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))

diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index c4497be735fe33b53543006963633796651f3dd1..65b37479cb0ebf102235fd78445107aa1d9e0529 100644 (file)
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -1090,7 +1090,7 @@ gtk_tree_store_remove (GtkTreeStore *tree_store,
  * made a child of @parent.  Otherwise, the row will be created at the toplevel.
  * If @position is larger than the number of rows at that level, then the new
  * row will be inserted to the end of the list.  @iter will be changed to point
- * to this new row.  The row will be empty before this function is called.  To
+ * to this new row.  The row will be empty after this function is called.  To
  * fill in values, you need to call gtk_tree_store_set() or
  * gtk_tree_store_set_value().
  *

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 18fddf8b7bba765380bea5951b6bd805c26a5adb..2db1766e60eab8bb75e53214d2e6340651d2b962 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -166,8 +166,6 @@ static gboolean gtk_tree_view_button_release       (GtkWidget        *widget,
                                                    GdkEventButton   *event);
 static void     gtk_tree_view_set_focus_child      (GtkContainer     *container,
                                                    GtkWidget        *child);
-static gint     gtk_tree_view_focus_in             (GtkWidget        *widget,
-                                                   GdkEventFocus    *event);
 static gint     gtk_tree_view_focus_out            (GtkWidget        *widget,
                                                    GdkEventFocus    *event);
 static gint     gtk_tree_view_focus                (GtkWidget        *widget,
@@ -474,7 +472,6 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
   widget_class->key_press_event = gtk_tree_view_key_press;
   widget_class->enter_notify_event = gtk_tree_view_enter_notify;
   widget_class->leave_notify_event = gtk_tree_view_leave_notify;
-  widget_class->focus_in_event = gtk_tree_view_focus_in;
   widget_class->focus_out_event = gtk_tree_view_focus_out;
   widget_class->drag_begin = gtk_tree_view_drag_begin;
   widget_class->drag_end = gtk_tree_view_drag_end;
@@ -3524,36 +3521,12 @@ return TRUE;
 }
 
 
-static gint
-gtk_tree_view_focus_in (GtkWidget     *widget,
-                       GdkEventFocus *event)
-{
-  GtkTreeView *tree_view;
-
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
-  tree_view = GTK_TREE_VIEW (widget);
-
-  GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
-
-  gtk_widget_queue_draw (widget);
-
-  return FALSE;
-}
-
-
 static gint
 gtk_tree_view_focus_out (GtkWidget     *widget,
                         GdkEventFocus *event)
 {
   GtkWidget   *search_dialog;
 
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
-
   gtk_widget_queue_draw (widget);
 
   /* destroy interactive search dialog */
@@ -8742,7 +8715,7 @@ gtk_tree_view_get_reorderable (GtkTreeView *tree_view)
  * This function is a convenience function to allow you to reorder models that
  * support the #GtkDragSourceIface and the #GtkDragDestIface.  Both
  * #GtkTreeStore and #GtkListStore support these.  If @reorderable is %TRUE, then
- * the user can reorder the model by dragging and dropping columns.  The
+ * the user can reorder the model by dragging and dropping rows.  The
  * developer can listen to these changes by connecting to the model's
  * signals.
  *