treeview: Don't emit cursor-changed in destruction

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

diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index 85a2f4a4cb11f6b17bea67fe958ebbda90a5dfcf..d51ccf08b6f54701f5853c397348d809d6a09332 100644 (file)
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.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,14 +22,14 @@
  * 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_BOX_H__
 #define __GTK_BOX_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkcontainer.h>
 
 
@@ -46,27 +44,32 @@ G_BEGIN_DECLS
 #define GTK_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_BOX, GtkBoxClass))
 
 
-typedef struct _GtkBox       GtkBox;
-typedef struct _GtkBoxPriv    GtkBoxPriv;
-typedef struct _GtkBoxClass   GtkBoxClass;
+typedef struct _GtkBox              GtkBox;
+typedef struct _GtkBoxPrivate       GtkBoxPrivate;
+typedef struct _GtkBoxClass         GtkBoxClass;
 
 struct _GtkBox
 {
   GtkContainer container;
 
   /*< private >*/
-  GtkBoxPriv *priv;
+  GtkBoxPrivate *priv;
 };
 
 struct _GtkBoxClass
 {
   GtkContainerClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 
 GType       gtk_box_get_type            (void) G_GNUC_CONST;
 GtkWidget*  gtk_box_new                 (GtkOrientation  orientation,
-                                         gboolean        homogeneous,
                                          gint            spacing);
 
 void        gtk_box_pack_start          (GtkBox         *box,
@@ -104,13 +107,6 @@ void        gtk_box_set_child_packing   (GtkBox         *box,
                                          guint           padding,
                                          GtkPackType     pack_type);
 
-/* internal API */
-void        _gtk_box_set_old_defaults   (GtkBox         *box);
-gboolean    _gtk_box_get_spacing_set    (GtkBox         *box);
-void        _gtk_box_set_spacing_set    (GtkBox         *box,
-                                         gboolean        spacing_set);
-GList      *_gtk_box_get_children       (GtkBox         *box);
-
 G_END_DECLS
 
 #endif /* __GTK_BOX_H__ */