Updated Bulgarian translation by Alexander Shopov <ash@contact.bg>

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

diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index 0fa1b7392a0d4f66e890bbc2b5dfd410817f617e..612fe8bcbe1ec932822199fb304debd2ad0b91d1 100644 (file)
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -34,17 +34,14 @@
 #include <gtk/gtkadjustment.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_CONTAINER              (gtk_container_get_type ())
-#define GTK_CONTAINER(obj)              (GTK_CHECK_CAST ((obj), GTK_TYPE_CONTAINER, GtkContainer))
-#define GTK_CONTAINER_CLASS(klass)      (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CONTAINER, GtkContainerClass))
-#define GTK_IS_CONTAINER(obj)           (GTK_CHECK_TYPE ((obj), GTK_TYPE_CONTAINER))
-#define GTK_IS_CONTAINER_CLASS(klass)   (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CONTAINER))
-#define GTK_CONTAINER_GET_CLASS(obj)    (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CONTAINER, GtkContainerClass))
+#define GTK_CONTAINER(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CONTAINER, GtkContainer))
+#define GTK_CONTAINER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CONTAINER, GtkContainerClass))
+#define GTK_IS_CONTAINER(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CONTAINER))
+#define GTK_IS_CONTAINER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CONTAINER))
+#define GTK_CONTAINER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CONTAINER, GtkContainerClass))
 
 #define GTK_IS_RESIZE_CONTAINER(widget) (GTK_IS_CONTAINER (widget) && ((GtkContainer*) (widget))->resize_mode != GTK_RESIZE_PARENT)
 
@@ -59,6 +56,8 @@ struct _GtkContainer
   GtkWidget *focus_child;
   
   guint border_width : 16;
+
+  /*< private >*/
   guint need_resize : 1;
   guint resize_mode : 2;
   guint reallocate_redraws : 1;
@@ -80,7 +79,7 @@ struct _GtkContainerClass
                                 gpointer         callback_data);
   void    (*set_focus_child)   (GtkContainer    *container,
                                 GtkWidget       *widget);
-  GtkType (*child_type)                (GtkContainer    *container);
+  GType   (*child_type)                (GtkContainer    *container);
   gchar*  (*composite_name)    (GtkContainer    *container,
                                 GtkWidget       *child);
   void    (*set_child_property) (GtkContainer    *container,
@@ -103,7 +102,7 @@ struct _GtkContainerClass
 
 /* Application-level methods */
 
-GtkType gtk_container_get_type          (void) G_GNUC_CONST;
+GType   gtk_container_get_type          (void) G_GNUC_CONST;
 void    gtk_container_set_border_width  (GtkContainer     *container,
                                          guint             border_width);
 guint   gtk_container_get_border_width   (GtkContainer     *container);
@@ -159,7 +158,7 @@ GtkAdjustment *gtk_container_get_focus_hadjustment (GtkContainer *container);
 
 void    gtk_container_resize_children      (GtkContainer     *container);
 
-GtkType gtk_container_child_type          (GtkContainer     *container);
+GType   gtk_container_child_type          (GtkContainer     *container);
 
 
 void         gtk_container_class_install_child_property (GtkContainerClass *cclass,
@@ -172,15 +171,15 @@ GParamSpec** gtk_container_class_list_child_properties    (GObjectClass      *cclass,
 void         gtk_container_add_with_properties         (GtkContainer      *container,
                                                         GtkWidget         *widget,
                                                         const gchar       *first_prop_name,
-                                                        ...);
+                                                        ...) G_GNUC_NULL_TERMINATED;
 void         gtk_container_child_set                   (GtkContainer      *container,
                                                         GtkWidget         *child,
                                                         const gchar       *first_prop_name,
-                                                        ...);     
+                                                        ...) G_GNUC_NULL_TERMINATED;
 void         gtk_container_child_get                   (GtkContainer      *container,
                                                         GtkWidget         *child,
                                                         const gchar       *first_prop_name,
-                                                        ...);     
+                                                        ...) G_GNUC_NULL_TERMINATED;
 void         gtk_container_child_set_valist            (GtkContainer      *container,
                                                         GtkWidget         *child,
                                                         const gchar       *first_property_name,
@@ -212,14 +211,15 @@ 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);
 
 #ifndef GTK_DISABLE_DEPRECATED
 #define        gtk_container_border_width              gtk_container_set_border_width
 #endif /* GTK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_CONTAINER_H__ */