moved GtkAnchorType and GtkSideType from gtkpacker.h to gtkenum.h.

Sun Apr 29 03:02:02 2001  Tim Janik  <timj@gtk.org>

        * gtk/gtkpacker.h:
        * gtk/gtkenums.h: moved GtkAnchorType and GtkSideType from gtkpacker.h
         to gtkenum.h.

        * gtk/gtkmain.c (gtk_main_do_event): silence compiler (GDK_SETTING not
        handled in switch).

        * gtk/Makefile.am:
        (gtk.defs): generate enum portions with  glib-mkenums.
        (gtktypebuiltins_evals.c): generate this with glib-mkenums.
        got rid of makeenums.pl and makeenums.awk in distributed tarballs.

        * gtk/gtkaccelgroup.c (gtk_accel_group_add): refined havocs warning
        addition.

        * docs/Changes-2.0.txt: keep a note on signal handlers now
        not getting emitted during the emission they were connected within.

15 files changed, 218 insertions, 60 deletions

diff --git a/ChangeLog b/ChangeLog
index 13c2c148d..fd26e2cf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+Sun Apr 29 03:02:02 2001  Tim Janik  <timj@gtk.org>
+
+        * gtk/gtkpacker.h:
+        * gtk/gtkenums.h: moved GtkAnchorType and GtkSideType from gtkpacker.h
+	 to gtkenum.h.
+
+	* gtk/gtkmain.c (gtk_main_do_event): silence compiler (GDK_SETTING not
+	handled in switch).
+
+	* gtk/Makefile.am:
+	(gtk.defs): generate enum portions with  glib-mkenums.
+	(gtktypebuiltins_evals.c): generate this with glib-mkenums.
+	got rid of makeenums.pl and makeenums.awk in distributed tarballs.
+	
+	* gtk/gtkaccelgroup.c (gtk_accel_group_add): refined havocs warning
+	addition.
+
+	* docs/Changes-2.0.txt: keep a note on signal handlers now
+	not getting emitted during the emission they were connected within.
+
 2001-04-28  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtkcolorsel.c (palette_new): fix bug in tooltip
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 13c2c148d..fd26e2cf5 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,23 @@
+Sun Apr 29 03:02:02 2001  Tim Janik  <timj@gtk.org>
+
+        * gtk/gtkpacker.h:
+        * gtk/gtkenums.h: moved GtkAnchorType and GtkSideType from gtkpacker.h
+	 to gtkenum.h.
+
+	* gtk/gtkmain.c (gtk_main_do_event): silence compiler (GDK_SETTING not
+	handled in switch).
+
+	* gtk/Makefile.am:
+	(gtk.defs): generate enum portions with  glib-mkenums.
+	(gtktypebuiltins_evals.c): generate this with glib-mkenums.
+	got rid of makeenums.pl and makeenums.awk in distributed tarballs.
+	
+	* gtk/gtkaccelgroup.c (gtk_accel_group_add): refined havocs warning
+	addition.
+
+	* docs/Changes-2.0.txt: keep a note on signal handlers now
+	not getting emitted during the emission they were connected within.
+
 2001-04-28  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtkcolorsel.c (palette_new): fix bug in tooltip
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 13c2c148d..fd26e2cf5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,23 @@
+Sun Apr 29 03:02:02 2001  Tim Janik  <timj@gtk.org>
+
+        * gtk/gtkpacker.h:
+        * gtk/gtkenums.h: moved GtkAnchorType and GtkSideType from gtkpacker.h
+	 to gtkenum.h.
+
+	* gtk/gtkmain.c (gtk_main_do_event): silence compiler (GDK_SETTING not
+	handled in switch).
+
+	* gtk/Makefile.am:
+	(gtk.defs): generate enum portions with  glib-mkenums.
+	(gtktypebuiltins_evals.c): generate this with glib-mkenums.
+	got rid of makeenums.pl and makeenums.awk in distributed tarballs.
+	
+	* gtk/gtkaccelgroup.c (gtk_accel_group_add): refined havocs warning
+	addition.
+
+	* docs/Changes-2.0.txt: keep a note on signal handlers now
+	not getting emitted during the emission they were connected within.
+
 2001-04-28  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtkcolorsel.c (palette_new): fix bug in tooltip
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 13c2c148d..fd26e2cf5 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,23 @@
+Sun Apr 29 03:02:02 2001  Tim Janik  <timj@gtk.org>
+
+        * gtk/gtkpacker.h:
+        * gtk/gtkenums.h: moved GtkAnchorType and GtkSideType from gtkpacker.h
+	 to gtkenum.h.
+
+	* gtk/gtkmain.c (gtk_main_do_event): silence compiler (GDK_SETTING not
+	handled in switch).
+
+	* gtk/Makefile.am:
+	(gtk.defs): generate enum portions with  glib-mkenums.
+	(gtktypebuiltins_evals.c): generate this with glib-mkenums.
+	got rid of makeenums.pl and makeenums.awk in distributed tarballs.
+	
+	* gtk/gtkaccelgroup.c (gtk_accel_group_add): refined havocs warning
+	addition.
+
+	* docs/Changes-2.0.txt: keep a note on signal handlers now
+	not getting emitted during the emission they were connected within.
+
 2001-04-28  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtkcolorsel.c (palette_new): fix bug in tooltip
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 13c2c148d..fd26e2cf5 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,23 @@
+Sun Apr 29 03:02:02 2001  Tim Janik  <timj@gtk.org>
+
+        * gtk/gtkpacker.h:
+        * gtk/gtkenums.h: moved GtkAnchorType and GtkSideType from gtkpacker.h
+	 to gtkenum.h.
+
+	* gtk/gtkmain.c (gtk_main_do_event): silence compiler (GDK_SETTING not
+	handled in switch).
+
+	* gtk/Makefile.am:
+	(gtk.defs): generate enum portions with  glib-mkenums.
+	(gtktypebuiltins_evals.c): generate this with glib-mkenums.
+	got rid of makeenums.pl and makeenums.awk in distributed tarballs.
+	
+	* gtk/gtkaccelgroup.c (gtk_accel_group_add): refined havocs warning
+	addition.
+
+	* docs/Changes-2.0.txt: keep a note on signal handlers now
+	not getting emitted during the emission they were connected within.
+
 2001-04-28  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtkcolorsel.c (palette_new): fix bug in tooltip
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 13c2c148d..fd26e2cf5 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,23 @@
+Sun Apr 29 03:02:02 2001  Tim Janik  <timj@gtk.org>
+
+        * gtk/gtkpacker.h:
+        * gtk/gtkenums.h: moved GtkAnchorType and GtkSideType from gtkpacker.h
+	 to gtkenum.h.
+
+	* gtk/gtkmain.c (gtk_main_do_event): silence compiler (GDK_SETTING not
+	handled in switch).
+
+	* gtk/Makefile.am:
+	(gtk.defs): generate enum portions with  glib-mkenums.
+	(gtktypebuiltins_evals.c): generate this with glib-mkenums.
+	got rid of makeenums.pl and makeenums.awk in distributed tarballs.
+	
+	* gtk/gtkaccelgroup.c (gtk_accel_group_add): refined havocs warning
+	addition.
+
+	* docs/Changes-2.0.txt: keep a note on signal handlers now
+	not getting emitted during the emission they were connected within.
+
 2001-04-28  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtkcolorsel.c (palette_new): fix bug in tooltip
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 13c2c148d..fd26e2cf5 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,23 @@
+Sun Apr 29 03:02:02 2001  Tim Janik  <timj@gtk.org>
+
+        * gtk/gtkpacker.h:
+        * gtk/gtkenums.h: moved GtkAnchorType and GtkSideType from gtkpacker.h
+	 to gtkenum.h.
+
+	* gtk/gtkmain.c (gtk_main_do_event): silence compiler (GDK_SETTING not
+	handled in switch).
+
+	* gtk/Makefile.am:
+	(gtk.defs): generate enum portions with  glib-mkenums.
+	(gtktypebuiltins_evals.c): generate this with glib-mkenums.
+	got rid of makeenums.pl and makeenums.awk in distributed tarballs.
+	
+	* gtk/gtkaccelgroup.c (gtk_accel_group_add): refined havocs warning
+	addition.
+
+	* docs/Changes-2.0.txt: keep a note on signal handlers now
+	not getting emitted during the emission they were connected within.
+
 2001-04-28  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtkcolorsel.c (palette_new): fix bug in tooltip
diff --git a/docs/Changes-2.0.txt b/docs/Changes-2.0.txt
index 304c968e0..460b0cbc2 100644
--- a/docs/Changes-2.0.txt
+++ b/docs/Changes-2.0.txt
@@ -135,6 +135,10 @@ Incompatible Changes from GTK+-1.2 to GTK+-2.0:
   not supported anymore.
   For many of the removed functions, similar variants are available
   in the g_signal_* namespace.
+  The GSignal system perfomrs emissions in a slightly different manner than
+  the old GtkSignal code. Signal handlers that are connected to signal "foo"
+  on object "bar" while "foo" is being emitted, will not be called anymore
+  during the emission they were connected within.
 
 * Inserting and deleting text in GtkEntry though functions such
   as gtk_entry_insert_text() now leave the cursor at its original
diff --git a/docs/reference/gtk/tmpl/gtksignal.sgml b/docs/reference/gtk/tmpl/gtksignal.sgml
index 52c116c26..1a5a4f3e2 100644
--- a/docs/reference/gtk/tmpl/gtksignal.sgml
+++ b/docs/reference/gtk/tmpl/gtksignal.sgml
@@ -289,7 +289,7 @@ you don't want a return value.
 the callbacks.
 
 
-<!-- ##### MACRO gtk_signal_lookup ##### -->
+<!-- ##### FUNCTION gtk_signal_lookup ##### -->
 <para>
 Given the name of the signal and the type of object it connects
 to, get the signal's identifying integer.  Emitting the signal
@@ -304,7 +304,7 @@ It also tries the ancestors of the given type.
 @Returns: the signal's identifying number, or 0 if no signal was found.
 
 
-<!-- ##### MACRO gtk_signal_name ##### -->
+<!-- ##### FUNCTION gtk_signal_name ##### -->
 <para>
 Given the signal's identifier, find its name.
 </para>
@@ -381,7 +381,7 @@ an array of GtkArgs instead of using C's varargs mechanism.
 followed by one which is a pointer to the return type.
 
 
-<!-- ##### MACRO gtk_signal_emit_stop ##### -->
+<!-- ##### FUNCTION gtk_signal_emit_stop ##### -->
 <para>
 This function aborts a signal's current emission.
 </para>
@@ -415,7 +415,7 @@ except it will lookup the signal id for you.
 @name: the name of the signal you wish to stop.
 
 
-<!-- ##### MACRO gtk_signal_connect ##### -->
+<!-- ##### FUNCTION gtk_signal_connect ##### -->
 <para>
 Attach a function pointer and user data to a signal for
 a particular object.
@@ -467,7 +467,7 @@ is getting pressed, this is that button.
 @d: 
 
 
-<!-- ##### MACRO gtk_signal_connect_after ##### -->
+<!-- ##### FUNCTION gtk_signal_connect_after ##### -->
 <para>
 Attach a function pointer and user data to a signal
 so that this handler will be called after the other handlers.
@@ -485,7 +485,7 @@ so that this handler will be called after the other handlers.
 @d: 
 
 
-<!-- ##### MACRO gtk_signal_connect_object ##### -->
+<!-- ##### FUNCTION gtk_signal_connect_object ##### -->
 <para>
 This function is for registering a callback that will
 call another object's callback.  That is,
@@ -520,7 +520,7 @@ really pass any gpointer as the #slot_object .)
 @d: 
 
 
-<!-- ##### MACRO gtk_signal_connect_object_after ##### -->
+<!-- ##### FUNCTION gtk_signal_connect_object_after ##### -->
 <para>
 Attach a signal hook to a signal, passing in an alternate
 object as the first parameter, and guaranteeing 
@@ -626,7 +626,7 @@ should signal the removal of this signal.
 @name: name of the signal.
 
 
-<!-- ##### MACRO gtk_signal_disconnect ##### -->
+<!-- ##### FUNCTION gtk_signal_disconnect ##### -->
 <para>
 Destroy a user-defined handler connection.
 </para>
@@ -635,7 +635,7 @@ Destroy a user-defined handler connection.
 @handler_id: the connection id.
 
 
-<!-- ##### MACRO gtk_signal_disconnect_by_func ##### -->
+<!-- ##### FUNCTION gtk_signal_disconnect_by_func ##### -->
 <para>
 Destroy all connections for a particular object, with
 the given function-pointer and user-data.
@@ -650,7 +650,7 @@ the given function-pointer and user-data.
 @d: 
 
 
-<!-- ##### MACRO gtk_signal_disconnect_by_data ##### -->
+<!-- ##### FUNCTION gtk_signal_disconnect_by_data ##### -->
 <para>
 Destroy all connections for a particular object, with
 the given user-data.
@@ -663,7 +663,7 @@ the given user-data.
 @d: 
 
 
-<!-- ##### MACRO gtk_signal_handler_block ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_block ##### -->
 <para>
 Prevent an user-defined handler from being invoked.  All other
 signal processing will go on as normal, but this particular
@@ -674,7 +674,7 @@ handler will ignore it.
 @handler_id: the connection id.
 
 
-<!-- ##### MACRO gtk_signal_handler_block_by_func ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_block_by_func ##### -->
 <para>
 Prevent a user-defined handler from being invoked, by reference to
 the user-defined handler's function pointer and user data.  (It may result in
@@ -690,7 +690,7 @@ multiple hooks being blocked, if you've called connect multiple times.)
 @d: 
 
 
-<!-- ##### MACRO gtk_signal_handler_block_by_data ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_block_by_data ##### -->
 <para>
 Prevent all user-defined handlers with a certain user data from being invoked.
 </para>
@@ -702,7 +702,7 @@ Prevent all user-defined handlers with a certain user data from being invoked.
 @d: 
 
 
-<!-- ##### MACRO gtk_signal_handler_unblock ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_unblock ##### -->
 <para>
 Undo a block, by connection id.  Note that undoing a block doesn't
 necessarily make the hook callable, because if you block a
@@ -714,7 +714,7 @@ hook twice, you must unblock it twice.
 gtk_signal_connect(), etc.
 
 
-<!-- ##### MACRO gtk_signal_handler_unblock_by_func ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_unblock_by_func ##### -->
 <para>
 Undo a block, by function pointer and data.
 Note that undoing a block doesn't
@@ -731,7 +731,7 @@ hook twice, you must unblock it twice.
 @d: 
 
 
-<!-- ##### MACRO gtk_signal_handler_unblock_by_data ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_unblock_by_data ##### -->
 <para>
 Undo block(s), to all signals for a particular object
 with a particular user-data pointer
@@ -744,7 +744,7 @@ with a particular user-data pointer
 @d: 
 
 
-<!-- ##### MACRO gtk_signal_handler_pending ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_pending ##### -->
 <para>
 Returns a connection id corresponding to a given signal id and object.
 </para>
@@ -766,7 +766,7 @@ handler.
 @b: 
 
 
-<!-- ##### MACRO gtk_signal_handler_pending_by_func ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_pending_by_func ##### -->
 <para>
 Returns a connection id corresponding to a given signal id, object, function
 pointer and user data.
diff --git a/docs/reference/gtk/tmpl/gtktypeutils.sgml b/docs/reference/gtk/tmpl/gtktypeutils.sgml
index e6a3ad7ab..6295e2dfa 100644
--- a/docs/reference/gtk/tmpl/gtktypeutils.sgml
+++ b/docs/reference/gtk/tmpl/gtktypeutils.sgml
@@ -560,7 +560,7 @@ Create a new, unique type.
 @type_info: must not be null, and @type_info->type_name must also not be null.
 
 
-<!-- ##### MACRO gtk_type_name ##### -->
+<!-- ##### FUNCTION gtk_type_name ##### -->
 <para>
 </para>
 
@@ -568,7 +568,7 @@ Create a new, unique type.
 @Returns: a pointer to the name of a type, or NULL if it has none.
 
 
-<!-- ##### MACRO gtk_type_from_name ##### -->
+<!-- ##### FUNCTION gtk_type_from_name ##### -->
 <para>
 Get the internal representation of a type given its name.
 </para>
@@ -577,7 +577,7 @@ Get the internal representation of a type given its name.
 @Returns: a GtkType
 
 
-<!-- ##### MACRO gtk_type_parent ##### -->
+<!-- ##### FUNCTION gtk_type_parent ##### -->
 <para>
 
 </para>
@@ -608,7 +608,7 @@ has all the proper initializers called.
 @Returns: gpointer to a GtkTypeObject
 
 
-<!-- ##### MACRO gtk_type_is_a ##### -->
+<!-- ##### FUNCTION gtk_type_is_a ##### -->
 <para>
 Look in the type hierarchy to see if @type has @is_a_type among its
 ancestors.  Do so with a simple lookup, not a loop.
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 18ba9b231..182245884 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -394,8 +394,6 @@ gtk_built_sources = @STRIP_BEGIN@ \
 # their own .lo rules and don't get publically installed
 gtk_extra_sources = @STRIP_BEGIN@ \
 	gtkcompat.h.in		\
-	makeenums.pl		\
-	makeenums.awk		\
 	maketypes.awk		\
 	makeenums.h		\
 	gtkargcollector.c	\
@@ -432,9 +430,14 @@ gtk.defs gtkmarshal.h gtktypebuiltins.h:          # never add deps here
 # versions in the build dir. thus a development setup requires
 # srcdir to be writable, passing --disable-rebuilds to
 # ../configure will supress all autogeneration rules.
-$(srcdir)/stamp-gtk.defs: @REBUILD@ makeenums.pl gtk.defs gtk-boxed.defs $(gtk_public_h_sources)
+$(srcdir)/stamp-gtk.defs: @REBUILD@ gtk.defs gtk-boxed.defs $(gtk_public_h_sources)
 	cd $(srcdir) \
-	&& $(PERL) makeenums.pl defs $(gtk_public_h_sources) > xgen-gdef \
+	&& glib-mkenums --comments ";; @comment@" \
+			--fprod "; enumerations from \"@filename@\"\n " \
+	                --vhead "(define-@type@ @EnumName@" \
+	                --vprod "   (@valuenick@ @VALUENAME@)" \
+	                --vtail ")" \
+	                $(gtk_public_h_sources) > xgen-gdef \
 	&& cat gtk-boxed.defs >> xgen-gdef \
 	&& (cmp -s xgen-gdef gtk.defs || cp xgen-gdef gtk.defs) \
 	&& rm -f xgen-gdef \
@@ -466,9 +469,14 @@ $(srcdir)/gtktypebuiltins_ids.c: @REBUILD@ maketypes.awk stamp-gtk.defs
 	&& LC_ALL=C $(AWK) -f maketypes.awk gtk.defs entries > xgen-gtbic \
 	&& cp xgen-gtbic $(@F) \
 	&& rm -f xgen-gtbic
-$(srcdir)/gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl $(gtk_public_h_sources)
+$(srcdir)/gtktypebuiltins_evals.c: @REBUILD@ $(gtk_public_h_sources)
 	cd $(srcdir) \
-	&& $(PERL) makeenums.pl arrays $(gtk_public_h_sources) > xgen-gtbec \
+	&& glib-mkenums \
+			--fprod "\n/* enumerations from \"@filename@\" */" \
+			--vhead "static const GtkEnumValue _@enum_name@_values[] = {" \
+			--vprod "  { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+			--vtail "  { 0, NULL, NULL }\n};" \
+			$(gtk_public_h_sources) > xgen-gtbec \
 	&& cp xgen-gtbec $(@F) \
 	&& rm -f xgen-gtbec
 
diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index 1f078ff00..f7996bd29 100644
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -381,10 +381,10 @@ gtk_accel_group_add (GtkAccelGroup	*accel_group,
   if (!query.signal_id || query.n_params > 0)
     {
       g_warning ("gtk_accel_group_add(): signal \"%s\" in the `%s' class ancestry"
-		 "cannot be used as accelerator signal (perhaps it has parameters)",
+		 "cannot be used as accelerator signal %s",
 		 accel_signal,
-		 gtk_type_name (GTK_OBJECT_TYPE (object)));
-
+		 gtk_type_name (GTK_OBJECT_TYPE (object)),
+		 query.n_params > 0 ? "(extraneous parameters are not supported)" : "");
       return;
     }
 
diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index 1758048ff..9f70e393c 100644
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -33,6 +33,29 @@
 extern "C" {
 #endif /* __cplusplus */
 
+
+/* Anchor types */
+typedef enum
+{
+  GTK_ANCHOR_CENTER,
+  GTK_ANCHOR_NORTH,
+  GTK_ANCHOR_NORTH_WEST,
+  GTK_ANCHOR_NORTH_EAST,
+  GTK_ANCHOR_SOUTH,
+  GTK_ANCHOR_SOUTH_WEST,
+  GTK_ANCHOR_SOUTH_EAST,
+  GTK_ANCHOR_WEST,
+  GTK_ANCHOR_EAST,
+  GTK_ANCHOR_N		= GTK_ANCHOR_NORTH,
+  GTK_ANCHOR_NW		= GTK_ANCHOR_NORTH_WEST,
+  GTK_ANCHOR_NE		= GTK_ANCHOR_NORTH_EAST,
+  GTK_ANCHOR_S		= GTK_ANCHOR_SOUTH,
+  GTK_ANCHOR_SW		= GTK_ANCHOR_SOUTH_WEST,
+  GTK_ANCHOR_SE		= GTK_ANCHOR_SOUTH_EAST,
+  GTK_ANCHOR_W		= GTK_ANCHOR_WEST,
+  GTK_ANCHOR_E		= GTK_ANCHOR_EAST
+} GtkAnchorType;
+
 /* Arrow types */
 typedef enum
 {
@@ -103,6 +126,15 @@ typedef enum
   GTK_ICON_SIZE_DIALOG
 } GtkIconSize;
 
+/* side types */
+typedef enum
+{
+  GTK_SIDE_TOP,
+  GTK_SIDE_BOTTOM,
+  GTK_SIDE_LEFT,
+  GTK_SIDE_RIGHT
+} GtkSideType;
+
 /* Reading directions for text */
 typedef enum
 {
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 5fd4d9c77..35a1dc592 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -944,6 +944,9 @@ gtk_main_do_event (GdkEvent *event)
     case GDK_DROP_START:
       gtk_drag_dest_handle_event (event_widget, event);
       break;
+    default:
+      g_assert_not_reached ();
+      break;
     }
   
   tmp_list = current_events;
diff --git a/gtk/gtkpacker.h b/gtk/gtkpacker.h
index 130e35418..bceefef69 100644
--- a/gtk/gtkpacker.h
+++ b/gtk/gtkpacker.h
@@ -58,35 +58,6 @@ typedef enum
     GTK_FILL_Y        = 1 << 2
 } GtkPackerOptions;
 
-typedef enum
-{
-    GTK_SIDE_TOP,
-    GTK_SIDE_BOTTOM,
-    GTK_SIDE_LEFT,
-    GTK_SIDE_RIGHT
-} GtkSideType;
-
-typedef enum
-{
-  GTK_ANCHOR_CENTER,
-  GTK_ANCHOR_NORTH,
-  GTK_ANCHOR_NORTH_WEST,
-  GTK_ANCHOR_NORTH_EAST,
-  GTK_ANCHOR_SOUTH,
-  GTK_ANCHOR_SOUTH_WEST,
-  GTK_ANCHOR_SOUTH_EAST,
-  GTK_ANCHOR_WEST,
-  GTK_ANCHOR_EAST,
-  GTK_ANCHOR_N	=	GTK_ANCHOR_NORTH,
-  GTK_ANCHOR_NW	=	GTK_ANCHOR_NORTH_WEST,
-  GTK_ANCHOR_NE	=	GTK_ANCHOR_NORTH_EAST,
-  GTK_ANCHOR_S	=	GTK_ANCHOR_SOUTH,
-  GTK_ANCHOR_SW	=	GTK_ANCHOR_SOUTH_WEST,
-  GTK_ANCHOR_SE	=	GTK_ANCHOR_SOUTH_EAST,
-  GTK_ANCHOR_W	=	GTK_ANCHOR_WEST,
-  GTK_ANCHOR_E	=	GTK_ANCHOR_EAST
-} GtkAnchorType;
-
 struct _GtkPackerChild
 {
   GtkWidget *widget;