filechooserbutton: New test for opening the Other item in the combo box and then...

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

diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index 94a8502c8f6d0e6b81021d06fd281ac70dde9f8c..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
@@ -62,8 +59,6 @@ struct _GtkContainerClass
 {
   GtkWidgetClass parent_class;
 
-  unsigned int handle_border_width : 1;
-
   void    (*add)                       (GtkContainer    *container,
                                 GtkWidget       *widget);
   void    (*remove)                    (GtkContainer    *container,
@@ -74,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);
@@ -91,6 +86,11 @@ struct _GtkContainerClass
   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);
@@ -192,7 +192,12 @@ 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:
@@ -214,22 +219,6 @@ void    gtk_container_forall                    (GtkContainer *container,
 
 void    gtk_container_class_handle_border_width (GtkContainerClass *klass);
 
-/* Non-public methods */
-void   _gtk_container_queue_resize          (GtkContainer *container);
-void   _gtk_container_resize_invalidate     (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);
-
 GtkWidgetPath * gtk_container_get_path_for_child (GtkContainer      *container,
                                                   GtkWidget         *child);