widget hierarchy update from Tim Janik

Wed Mar  4 16:02:44 GMT 1998 Tony Gale  <gale@gimp.org>

        * docs/gtkfaq.sgml: widget hierarchy update from Tim Janik

diff --git a/ChangeLog b/ChangeLog
index c21ce9e6bf7271487327c0f7d5f3c6937bd0295c..13af2b208655aeb3da13f5e949cc453a9dfd8ae4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Mar  4 16:02:44 GMT 1998 Tony Gale  <gale@gimp.org>
+
+       * docs/gtkfaq.sgml: widget hierarchy update from Tim Janik
+
 Mon Mar  2 19:57:27 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
        * gdk/gdkproperty.c (gdk_atom_name): Initialize gdk_error_code to

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c21ce9e6bf7271487327c0f7d5f3c6937bd0295c..13af2b208655aeb3da13f5e949cc453a9dfd8ae4 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+Wed Mar  4 16:02:44 GMT 1998 Tony Gale  <gale@gimp.org>
+
+       * docs/gtkfaq.sgml: widget hierarchy update from Tim Janik
+
 Mon Mar  2 19:57:27 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
        * gdk/gdkproperty.c (gdk_atom_name): Initialize gdk_error_code to

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c21ce9e6bf7271487327c0f7d5f3c6937bd0295c..13af2b208655aeb3da13f5e949cc453a9dfd8ae4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Wed Mar  4 16:02:44 GMT 1998 Tony Gale  <gale@gimp.org>
+
+       * docs/gtkfaq.sgml: widget hierarchy update from Tim Janik
+
 Mon Mar  2 19:57:27 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
        * gdk/gdkproperty.c (gdk_atom_name): Initialize gdk_error_code to

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c21ce9e6bf7271487327c0f7d5f3c6937bd0295c..13af2b208655aeb3da13f5e949cc453a9dfd8ae4 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Wed Mar  4 16:02:44 GMT 1998 Tony Gale  <gale@gimp.org>
+
+       * docs/gtkfaq.sgml: widget hierarchy update from Tim Janik
+
 Mon Mar  2 19:57:27 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
        * gdk/gdkproperty.c (gdk_atom_name): Initialize gdk_error_code to

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c21ce9e6bf7271487327c0f7d5f3c6937bd0295c..13af2b208655aeb3da13f5e949cc453a9dfd8ae4 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Wed Mar  4 16:02:44 GMT 1998 Tony Gale  <gale@gimp.org>
+
+       * docs/gtkfaq.sgml: widget hierarchy update from Tim Janik
+
 Mon Mar  2 19:57:27 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
        * gdk/gdkproperty.c (gdk_atom_name): Initialize gdk_error_code to

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c21ce9e6bf7271487327c0f7d5f3c6937bd0295c..13af2b208655aeb3da13f5e949cc453a9dfd8ae4 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Wed Mar  4 16:02:44 GMT 1998 Tony Gale  <gale@gimp.org>
+
+       * docs/gtkfaq.sgml: widget hierarchy update from Tim Janik
+
 Mon Mar  2 19:57:27 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
        * gdk/gdkproperty.c (gdk_atom_name): Initialize gdk_error_code to

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c21ce9e6bf7271487327c0f7d5f3c6937bd0295c..13af2b208655aeb3da13f5e949cc453a9dfd8ae4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Wed Mar  4 16:02:44 GMT 1998 Tony Gale  <gale@gimp.org>
+
+       * docs/gtkfaq.sgml: widget hierarchy update from Tim Janik
+
 Mon Mar  2 19:57:27 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
        * gdk/gdkproperty.c (gdk_atom_name): Initialize gdk_error_code to

diff --git a/docs/faq/gtkfaq.sgml b/docs/faq/gtkfaq.sgml
index 8daeaf7d783beb95896c7cd3cf4b846343d44d52..6a4f54055e662aeb236fbd9047230fd9e3e92ae5 100644 (file)
--- a/docs/faq/gtkfaq.sgml
+++ b/docs/faq/gtkfaq.sgml
@@ -389,78 +389,86 @@ give you a good grounding on what the widgets can do.
 <p>
 The GTK+ Tutorial lists the following widgets:
 <verb>
-         GtkObject
-         +-- GtkData
-         |   \-- GtkAdjustment
-         |
-         \-- GtkWidget
-             +-- GtkContainer
-             |   +-- GtkBin
-             |   |   +-- GtkAlignment
-             |   |   +-- GtkFrame
-             |   |   |   *-- GtkAspectFrame
-             |   |   |
-             |   |   +-- GtkItem
-             |   |   |   +-- GtkListItem
-             |   |   |   +-- GtkMenuItem
-             |   |   |   |   +-- GtkCheckMenuItem
-             |   |   |   |       *-- GtkRadioMenuItem
-             |   |   |   |
-             |   |   |   *-- GtkTreeItem
-             |   |   |
-             |   |   +-- GtkViewport
-             |   |   \-- GtkWindow
-             |   |       +-- GtkDialog
-             |   |       \-- GtkFileSelection
-             |   |
-             |   +-- GtkBox
-             |   |   +-- GtkHBox
-             |   |   \-- GtkVBox
-             |   |       +-- GtkColorSelection
-             |   |       \-- GtkCurve
-             |   |
-             |   +-- GtkButton
-             |   |   +-- GtkOptionMenu
-             |   |   \-- GtkToggleButton
-             |   |       \-- GtkCheckButton
-             |   |           \-- GtkRadioButton
-             |   |
-             |   +-- GtkList
-             |   +-- GtkMenuShell
-             |   |   +-- GtkMenu
-             |   |   \-- GtkMenuBar
-             |   |
-             |   +-- GtkNotebook
-             |   +-- GtkScrolledWindow
-             |   +-- GtkTable
-             |   \-- GtkTree
-             |
-             +-- GtkDrawingArea
-             +-- GtkEntry
-             +-- GtkMisc
-             |   +-- GtkArrow
-             |   +-- GtkImage
-             |   +-- GtkLabel
-             |   \-- GtkPixmap
-             |
-             +-- GtkPreview
-             +-- GtkProgressBar
-             +-- GtkRange
-             |   +-- GtkScale
-             |   |   +-- GtkHScale
-             |   |   \-- GtkVScale
-             |   |
-             |   \-- GtkScrollbar
-             |       +-- GtkHScrollbar
-             |       \-- GtkVScrollbar
-             |
-             +-- GtkRuler
-             |   +-- GtkHRuler
-             |   \-- GtkVRuler
-             |
-             \-- GtkSeparator
-                 +-- GtkHSeparator
-                 \-- GtkVSeparator
+  GtkObject
+   +GtkData
+   | +GtkAdjustment
+   | `GtkTooltips
+   `GtkWidget
+     +GtkContainer
+     | +GtkBin
+     | | +GtkAlignment
+     | | +GtkEventBox
+     | | +GtkFrame
+     | | | `GtkAspectFrame
+     | | +GtkHandleBox
+     | | +GtkItem
+     | | | +GtkListItem
+     | | | +GtkMenuItem
+     | | | | `GtkCheckMenuItem
+     | | | |   `GtkRadioMenuItem
+     | | | `GtkTreeItem
+     | | +GtkViewport
+     | | `GtkWindow
+     | |   +GtkColorSelectionDialog
+     | |   +GtkDialog
+     | |   | `GtkInputDialog
+     | |   `GtkFileSelection
+     | +GtkBox
+     | | +GtkButtonBox
+     | | | +GtkHButtonBox
+     | | | `GtkVButtonBox
+     | | +GtkHBox
+     | | | +GtkCombo
+     | | | `GtkStatusbar
+     | | `GtkVBox
+     | |   +GtkColorSelection
+     | |   `GtkGammaCurve
+     | +GtkButton
+     | | +GtkOptionMenu
+     | | `GtkToggleButton
+     | |   `GtkCheckButton
+     | |     `GtkRadioButton
+     | +GtkCList
+     | +GtkFixed
+     | +GtkList
+     | +GtkMenuShell
+     | | +GtkMenuBar
+     | | `GtkMenu
+     | +GtkNotebook
+     | +GtkPaned
+     | | +GtkHPaned
+     | | `GtkVPaned
+     | +GtkScrolledWindow
+     | +GtkTable
+     | +GtkToolbar
+     | `GtkTree
+     +GtkDrawingArea
+     | `GtkCurve
+     +GtkEditable
+     | +GtkEntry
+     | | `GtkSpinButton
+     | `GtkText
+     +GtkMisc
+     | +GtkArrow
+     | +GtkImage
+     | +GtkLabel
+     | | `GtkTipsQuery
+     | `GtkPixmap
+     +GtkPreview
+     +GtkProgressBar
+     +GtkRange
+     | +GtkScale
+     | | +GtkHScale
+     | | `GtkVScale
+     | `GtkScrollbar
+     |   +GtkHScrollbar
+     |   `GtkVScrollbar
+     +GtkRuler
+     | +GtkHRuler
+     | `GtkVRuler
+     `GtkSeparator
+       +GtkHSeparator
+       `GtkVSeparator
 </verb>
 
 <!-- ----------------------------------------------------------------- -->
@@ -715,7 +723,7 @@ this:
   gc = gdk_gc_new(widget->window);
 
   /* find proper dimensions for rectangle */
-  gdk_window_get_size(widget->window, &width, &height);
+  gdk_window_get_size(widget->window, &amp;width, &amp;height);
 
   /* the color we want to use */
   color = (GdkColor *)malloc(sizeof(GdkColor));

diff --git a/docs/gtkfaq.sgml b/docs/gtkfaq.sgml
index 8daeaf7d783beb95896c7cd3cf4b846343d44d52..6a4f54055e662aeb236fbd9047230fd9e3e92ae5 100644 (file)
--- a/docs/gtkfaq.sgml
+++ b/docs/gtkfaq.sgml
@@ -389,78 +389,86 @@ give you a good grounding on what the widgets can do.
 <p>
 The GTK+ Tutorial lists the following widgets:
 <verb>
-         GtkObject
-         +-- GtkData
-         |   \-- GtkAdjustment
-         |
-         \-- GtkWidget
-             +-- GtkContainer
-             |   +-- GtkBin
-             |   |   +-- GtkAlignment
-             |   |   +-- GtkFrame
-             |   |   |   *-- GtkAspectFrame
-             |   |   |
-             |   |   +-- GtkItem
-             |   |   |   +-- GtkListItem
-             |   |   |   +-- GtkMenuItem
-             |   |   |   |   +-- GtkCheckMenuItem
-             |   |   |   |       *-- GtkRadioMenuItem
-             |   |   |   |
-             |   |   |   *-- GtkTreeItem
-             |   |   |
-             |   |   +-- GtkViewport
-             |   |   \-- GtkWindow
-             |   |       +-- GtkDialog
-             |   |       \-- GtkFileSelection
-             |   |
-             |   +-- GtkBox
-             |   |   +-- GtkHBox
-             |   |   \-- GtkVBox
-             |   |       +-- GtkColorSelection
-             |   |       \-- GtkCurve
-             |   |
-             |   +-- GtkButton
-             |   |   +-- GtkOptionMenu
-             |   |   \-- GtkToggleButton
-             |   |       \-- GtkCheckButton
-             |   |           \-- GtkRadioButton
-             |   |
-             |   +-- GtkList
-             |   +-- GtkMenuShell
-             |   |   +-- GtkMenu
-             |   |   \-- GtkMenuBar
-             |   |
-             |   +-- GtkNotebook
-             |   +-- GtkScrolledWindow
-             |   +-- GtkTable
-             |   \-- GtkTree
-             |
-             +-- GtkDrawingArea
-             +-- GtkEntry
-             +-- GtkMisc
-             |   +-- GtkArrow
-             |   +-- GtkImage
-             |   +-- GtkLabel
-             |   \-- GtkPixmap
-             |
-             +-- GtkPreview
-             +-- GtkProgressBar
-             +-- GtkRange
-             |   +-- GtkScale
-             |   |   +-- GtkHScale
-             |   |   \-- GtkVScale
-             |   |
-             |   \-- GtkScrollbar
-             |       +-- GtkHScrollbar
-             |       \-- GtkVScrollbar
-             |
-             +-- GtkRuler
-             |   +-- GtkHRuler
-             |   \-- GtkVRuler
-             |
-             \-- GtkSeparator
-                 +-- GtkHSeparator
-                 \-- GtkVSeparator
+  GtkObject
+   +GtkData
+   | +GtkAdjustment
+   | `GtkTooltips
+   `GtkWidget
+     +GtkContainer
+     | +GtkBin
+     | | +GtkAlignment
+     | | +GtkEventBox
+     | | +GtkFrame
+     | | | `GtkAspectFrame
+     | | +GtkHandleBox
+     | | +GtkItem
+     | | | +GtkListItem
+     | | | +GtkMenuItem
+     | | | | `GtkCheckMenuItem
+     | | | |   `GtkRadioMenuItem
+     | | | `GtkTreeItem
+     | | +GtkViewport
+     | | `GtkWindow
+     | |   +GtkColorSelectionDialog
+     | |   +GtkDialog
+     | |   | `GtkInputDialog
+     | |   `GtkFileSelection
+     | +GtkBox
+     | | +GtkButtonBox
+     | | | +GtkHButtonBox
+     | | | `GtkVButtonBox
+     | | +GtkHBox
+     | | | +GtkCombo
+     | | | `GtkStatusbar
+     | | `GtkVBox
+     | |   +GtkColorSelection
+     | |   `GtkGammaCurve
+     | +GtkButton
+     | | +GtkOptionMenu
+     | | `GtkToggleButton
+     | |   `GtkCheckButton
+     | |     `GtkRadioButton
+     | +GtkCList
+     | +GtkFixed
+     | +GtkList
+     | +GtkMenuShell
+     | | +GtkMenuBar
+     | | `GtkMenu
+     | +GtkNotebook
+     | +GtkPaned
+     | | +GtkHPaned
+     | | `GtkVPaned
+     | +GtkScrolledWindow
+     | +GtkTable
+     | +GtkToolbar
+     | `GtkTree
+     +GtkDrawingArea
+     | `GtkCurve
+     +GtkEditable
+     | +GtkEntry
+     | | `GtkSpinButton
+     | `GtkText
+     +GtkMisc
+     | +GtkArrow
+     | +GtkImage
+     | +GtkLabel
+     | | `GtkTipsQuery
+     | `GtkPixmap
+     +GtkPreview
+     +GtkProgressBar
+     +GtkRange
+     | +GtkScale
+     | | +GtkHScale
+     | | `GtkVScale
+     | `GtkScrollbar
+     |   +GtkHScrollbar
+     |   `GtkVScrollbar
+     +GtkRuler
+     | +GtkHRuler
+     | `GtkVRuler
+     `GtkSeparator
+       +GtkHSeparator
+       `GtkVSeparator
 </verb>
 
 <!-- ----------------------------------------------------------------- -->
@@ -715,7 +723,7 @@ this:
   gc = gdk_gc_new(widget->window);
 
   /* find proper dimensions for rectangle */
-  gdk_window_get_size(widget->window, &width, &height);
+  gdk_window_get_size(widget->window, &amp;width, &amp;height);
 
   /* the color we want to use */
   color = (GdkColor *)malloc(sizeof(GdkColor));