Do without GtkSelectionWindow

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

diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index e37de1ee380d6d42c3a72aa07f8b90bc61af3ec3..3bcd2b1cc3fdd3e01db319e052b2f0b4e6f38b14 100644 (file)
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.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,16 +22,15 @@
  * 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_CONTAINER_H__
 #define __GTK_CONTAINER_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkwidget.h>
-#include <gtk/gtkadjustment.h>
 
 
 G_BEGIN_DECLS
@@ -46,16 +43,16 @@ G_BEGIN_DECLS
 #define GTK_CONTAINER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CONTAINER, GtkContainerClass))
 
 
-typedef struct _GtkContainer      GtkContainer;
-typedef struct _GtkContainerPriv   GtkContainerPriv;
-typedef struct _GtkContainerClass  GtkContainerClass;
+typedef struct _GtkContainer              GtkContainer;
+typedef struct _GtkContainerPrivate       GtkContainerPrivate;
+typedef struct _GtkContainerClass         GtkContainerClass;
 
 struct _GtkContainer
 {
   GtkWidget widget;
 
   /*< private >*/
-  GtkContainerPriv *priv;
+  GtkContainerPrivate *priv;
 };
 
 struct _GtkContainerClass
@@ -72,7 +69,7 @@ struct _GtkContainerClass
                                 GtkCallback      callback,
                                 gpointer         callback_data);
   void    (*set_focus_child)   (GtkContainer    *container,
-                                GtkWidget       *widget);
+                                GtkWidget       *child);
   GType   (*child_type)                (GtkContainer    *container);
   gchar*  (*composite_name)    (GtkContainer    *container,
                                 GtkWidget       *child);
@@ -86,12 +83,23 @@ struct _GtkContainerClass
                                 guint            property_id,
                                 GValue          *value,
                                 GParamSpec      *pspec);
+  GtkWidgetPath * (*get_path_for_child) (GtkContainer *container,
+                                         GtkWidget    *child);
+
+
+  /*< private >*/
+
+  unsigned int _handle_border_width : 1;
 
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
+  void (*_gtk_reserved5) (void);
+  void (*_gtk_reserved6) (void);
+  void (*_gtk_reserved7) (void);
+  void (*_gtk_reserved8) (void);
 };
 
 
@@ -117,9 +125,9 @@ void     gtk_container_foreach      (GtkContainer       *container,
                                     gpointer            callback_data);
 GList*   gtk_container_get_children     (GtkContainer       *container);
 
-void     gtk_container_propagate_expose (GtkContainer   *container,
+void     gtk_container_propagate_draw   (GtkContainer   *container,
                                         GtkWidget      *child,
-                                        GdkEventExpose *event);
+                                        cairo_t        *cr);
 
 void     gtk_container_set_focus_chain  (GtkContainer   *container,
                                          GList          *focusable_widgets);
@@ -184,8 +192,23 @@ void            gtk_container_child_set_property           (GtkContainer      *container,
 void        gtk_container_child_get_property           (GtkContainer      *container,
                                                         GtkWidget         *child,
                                                         const gchar       *property_name,
-                                                        GValue            *value);
-
+                                                        GValue            *value);
+
+GDK_AVAILABLE_IN_3_2
+void gtk_container_child_notify (GtkContainer *container,
+                                 GtkWidget    *child,
+                                 const gchar  *child_property);
+
+/**
+ * GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID:
+ * @object: the #GObject on which set_child_property() or get_child_property()
+ *  was called
+ * @property_id: the numeric id of the property
+ * @pspec: the #GParamSpec of the property
+ *
+ * This macro should be used to emit a standard warning about unexpected
+ * properties in set_child_property() and get_child_property() implementations.
+ */
 #define GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID(object, property_id, pspec) \
     G_OBJECT_WARN_INVALID_PSPEC ((object), "child property id", (property_id), (pspec))
 
@@ -194,20 +217,10 @@ void    gtk_container_forall                   (GtkContainer *container,
                                              GtkCallback   callback,
                                              gpointer      callback_data);
 
-/* Non-public methods */
-void   _gtk_container_queue_resize          (GtkContainer *container);
-void    _gtk_container_clear_resize_widgets   (GtkContainer *container);
-gchar* _gtk_container_child_composite_name   (GtkContainer *container,
-                                             GtkWidget    *child);
-void   _gtk_container_dequeue_resize_handler (GtkContainer *container);
-GList *_gtk_container_focus_sort             (GtkContainer     *container,
-                                             GList            *children,
-                                             GtkDirectionType  direction,
-                                             GtkWidget        *old_focus);
-gboolean _gtk_container_get_need_resize      (GtkContainer     *container);
-void     _gtk_container_set_need_resize      (GtkContainer     *container,
-                                              gboolean          need_resize);
-gboolean _gtk_container_get_reallocate_redraws (GtkContainer   *container);
+void    gtk_container_class_handle_border_width (GtkContainerClass *klass);
+
+GtkWidgetPath * gtk_container_get_path_for_child (GtkContainer      *container,
+                                                  GtkWidget         *child);
 
 G_END_DECLS