ue Jan 29 19:51:05 2002 Owen Taylor <otaylor@redhat.com>

        * gtk/gtkenums.h: Deprecate GtkPreviewType,
        GtkSignalRunType, GtkSideType, GtkSubmenuPlacement, GtkSubmenuDirection
        (#68183, Matthias Clasen)

        * gtk/gtkmenuitem.h: Remove _gtk_menu_item_set_placement() from
        the public header to avoid having to use GtkSubmenuPlacement.

        * gtk/{gtkmenuitem.c,gtkmenubar.c,gtkmenushell.c}: #define
        GTK_MENU_INTERNALS to preserve access to GtkSubmenu*.

        * gdk/gdki18n.h: Deprecate contents. (Darin Adler.)

12 files changed, 116 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index fa2baa284..fbf6159a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Tue Jan 29 19:51:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkenums.h: Deprecate GtkPreviewType,
+	GtkSignalRunType, GtkSideType, GtkSubmenuPlacement, GtkSubmenuDirection
+	(#68183, Matthias Clasen)
+
+	* gtk/gtkmenuitem.h: Remove _gtk_menu_item_set_placement() from
+	the public header to avoid having to use GtkSubmenuPlacement.
+
+	* gtk/{gtkmenuitem.c,gtkmenubar.c,gtkmenushell.c}: #define
+	GTK_MENU_INTERNALS to preserve access to GtkSubmenu*.
+
+	* gdk/gdki18n.h: Deprecate contents. (Darin Adler.)
+
 Tue Jan 29 19:32:47 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktextview.c (gtk_text_view_get/set_property): 
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index fa2baa284..fbf6159a9 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,17 @@
+Tue Jan 29 19:51:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkenums.h: Deprecate GtkPreviewType,
+	GtkSignalRunType, GtkSideType, GtkSubmenuPlacement, GtkSubmenuDirection
+	(#68183, Matthias Clasen)
+
+	* gtk/gtkmenuitem.h: Remove _gtk_menu_item_set_placement() from
+	the public header to avoid having to use GtkSubmenuPlacement.
+
+	* gtk/{gtkmenuitem.c,gtkmenubar.c,gtkmenushell.c}: #define
+	GTK_MENU_INTERNALS to preserve access to GtkSubmenu*.
+
+	* gdk/gdki18n.h: Deprecate contents. (Darin Adler.)
+
 Tue Jan 29 19:32:47 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktextview.c (gtk_text_view_get/set_property): 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fa2baa284..fbf6159a9 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,17 @@
+Tue Jan 29 19:51:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkenums.h: Deprecate GtkPreviewType,
+	GtkSignalRunType, GtkSideType, GtkSubmenuPlacement, GtkSubmenuDirection
+	(#68183, Matthias Clasen)
+
+	* gtk/gtkmenuitem.h: Remove _gtk_menu_item_set_placement() from
+	the public header to avoid having to use GtkSubmenuPlacement.
+
+	* gtk/{gtkmenuitem.c,gtkmenubar.c,gtkmenushell.c}: #define
+	GTK_MENU_INTERNALS to preserve access to GtkSubmenu*.
+
+	* gdk/gdki18n.h: Deprecate contents. (Darin Adler.)
+
 Tue Jan 29 19:32:47 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktextview.c (gtk_text_view_get/set_property): 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index fa2baa284..fbf6159a9 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,17 @@
+Tue Jan 29 19:51:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkenums.h: Deprecate GtkPreviewType,
+	GtkSignalRunType, GtkSideType, GtkSubmenuPlacement, GtkSubmenuDirection
+	(#68183, Matthias Clasen)
+
+	* gtk/gtkmenuitem.h: Remove _gtk_menu_item_set_placement() from
+	the public header to avoid having to use GtkSubmenuPlacement.
+
+	* gtk/{gtkmenuitem.c,gtkmenubar.c,gtkmenushell.c}: #define
+	GTK_MENU_INTERNALS to preserve access to GtkSubmenu*.
+
+	* gdk/gdki18n.h: Deprecate contents. (Darin Adler.)
+
 Tue Jan 29 19:32:47 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktextview.c (gtk_text_view_get/set_property): 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fa2baa284..fbf6159a9 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,17 @@
+Tue Jan 29 19:51:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkenums.h: Deprecate GtkPreviewType,
+	GtkSignalRunType, GtkSideType, GtkSubmenuPlacement, GtkSubmenuDirection
+	(#68183, Matthias Clasen)
+
+	* gtk/gtkmenuitem.h: Remove _gtk_menu_item_set_placement() from
+	the public header to avoid having to use GtkSubmenuPlacement.
+
+	* gtk/{gtkmenuitem.c,gtkmenubar.c,gtkmenushell.c}: #define
+	GTK_MENU_INTERNALS to preserve access to GtkSubmenu*.
+
+	* gdk/gdki18n.h: Deprecate contents. (Darin Adler.)
+
 Tue Jan 29 19:32:47 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktextview.c (gtk_text_view_get/set_property): 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fa2baa284..fbf6159a9 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,17 @@
+Tue Jan 29 19:51:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkenums.h: Deprecate GtkPreviewType,
+	GtkSignalRunType, GtkSideType, GtkSubmenuPlacement, GtkSubmenuDirection
+	(#68183, Matthias Clasen)
+
+	* gtk/gtkmenuitem.h: Remove _gtk_menu_item_set_placement() from
+	the public header to avoid having to use GtkSubmenuPlacement.
+
+	* gtk/{gtkmenuitem.c,gtkmenubar.c,gtkmenushell.c}: #define
+	GTK_MENU_INTERNALS to preserve access to GtkSubmenu*.
+
+	* gdk/gdki18n.h: Deprecate contents. (Darin Adler.)
+
 Tue Jan 29 19:32:47 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktextview.c (gtk_text_view_get/set_property): 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fa2baa284..fbf6159a9 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,17 @@
+Tue Jan 29 19:51:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkenums.h: Deprecate GtkPreviewType,
+	GtkSignalRunType, GtkSideType, GtkSubmenuPlacement, GtkSubmenuDirection
+	(#68183, Matthias Clasen)
+
+	* gtk/gtkmenuitem.h: Remove _gtk_menu_item_set_placement() from
+	the public header to avoid having to use GtkSubmenuPlacement.
+
+	* gtk/{gtkmenuitem.c,gtkmenubar.c,gtkmenushell.c}: #define
+	GTK_MENU_INTERNALS to preserve access to GtkSubmenu*.
+
+	* gdk/gdki18n.h: Deprecate contents. (Darin Adler.)
+
 Tue Jan 29 19:32:47 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktextview.c (gtk_text_view_get/set_property): 
diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index a7788fcae..5880af769 100644
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -136,6 +136,7 @@ typedef enum
   GTK_ICON_SIZE_DIALOG
 } GtkIconSize;
 
+#ifndef GTK_DISABLE_DEPRECATED
 /* side types */
 typedef enum
 {
@@ -144,6 +145,7 @@ typedef enum
   GTK_SIDE_LEFT,
   GTK_SIDE_RIGHT
 } GtkSideType;
+#endif /* GTK_DISABLE_DEPRECATED */
 
 /* Reading directions for text */
 typedef enum
@@ -262,11 +264,13 @@ typedef enum
   GTK_POS_BOTTOM
 } GtkPositionType;
 
+#ifndef GTK_DISABLE_DEPRECATED
 typedef enum
 {
   GTK_PREVIEW_COLOR,
   GTK_PREVIEW_GRAYSCALE
 } GtkPreviewType;
+#endif /* GTK_DISABLE_DEPRECATED */
 
 /* Style for buttons */
 typedef enum
@@ -284,6 +288,7 @@ typedef enum
   GTK_RESIZE_IMMEDIATE		/* Perform the resizes now */
 } GtkResizeMode;
 
+#ifndef GTK_DISABLE_DEPRECATED
 /* signal run types */
 typedef enum			/*< flags >*/
 {
@@ -294,6 +299,7 @@ typedef enum			/*< flags >*/
   GTK_RUN_ACTION     = G_SIGNAL_ACTION,
   GTK_RUN_NO_HOOKS   = G_SIGNAL_NO_HOOKS
 } GtkSignalRunType;
+#endif /* GTK_DISABLE_DEPRECATED */
 
 /* scrolling types */
 typedef enum
@@ -346,6 +352,7 @@ typedef enum
   GTK_STATE_INSENSITIVE
 } GtkStateType;
 
+#if !defined(GTK_DISABLE_DEPRECATED) || defined (GTK_MENU_INTERNALS)
 /* Directions for submenus */
 typedef enum
 {
@@ -359,6 +366,7 @@ typedef enum
   GTK_TOP_BOTTOM,
   GTK_LEFT_RIGHT
 } GtkSubmenuPlacement;
+#endif /* GTK_DISABLE_DEPRECATED */
 
 /* Style for toolbars */
 typedef enum
diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index ee143de36..84a40da83 100644
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -24,6 +24,8 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#define GTK_MENU_INTERNALS
+
 #include "gdk/gdkkeysyms.h"
 #include "gtkbindings.h"
 #include "gtkmain.h"
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 5495e391c..85369a24f 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -24,6 +24,8 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#define GTK_MENU_INTERNALS
+
 #include <string.h>
 #include "gtkaccellabel.h"
 #include "gtkmain.h"
@@ -356,6 +358,9 @@ gtk_menu_item_remove_submenu (GtkMenuItem         *menu_item)
     gtk_menu_detach (GTK_MENU (menu_item->submenu));
 }
 
+void _gtk_menu_item_set_placement (GtkMenuItem         *menu_item,
+				   GtkSubmenuPlacement  placement);
+
 void
 _gtk_menu_item_set_placement (GtkMenuItem         *menu_item,
 			     GtkSubmenuPlacement  placement)
diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h
index cf254b842..99c746573 100644
--- a/gtk/gtkmenuitem.h
+++ b/gtk/gtkmenuitem.h
@@ -95,8 +95,6 @@ void       gtk_menu_item_set_submenu          (GtkMenuItem         *menu_item,
 					       GtkWidget           *submenu);
 GtkWidget* gtk_menu_item_get_submenu          (GtkMenuItem         *menu_item);
 void       gtk_menu_item_remove_submenu       (GtkMenuItem         *menu_item);
-void       _gtk_menu_item_set_placement       (GtkMenuItem         *menu_item,
-					       GtkSubmenuPlacement  placement);
 void       gtk_menu_item_select               (GtkMenuItem         *menu_item);
 void       gtk_menu_item_deselect             (GtkMenuItem         *menu_item);
 void       gtk_menu_item_activate             (GtkMenuItem         *menu_item);
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index fd88cbfbb..dbb6a5f89 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -35,6 +35,7 @@
 
 #define MENU_SHELL_TIMEOUT   500
 
+#define GTK_MENU_INTERNALS
 
 enum {
   DEACTIVATE,
@@ -802,6 +803,8 @@ gtk_menu_shell_select_item (GtkMenuShell *menu_shell,
     class->select_item (menu_shell, menu_item);
 }
 
+void _gtk_menu_item_set_placement (GtkMenuItem         *menu_item,
+				   GtkSubmenuPlacement  placement);
 
 static void
 gtk_menu_shell_real_select_item (GtkMenuShell *menu_shell,