Commit b1354417 authored by Benjamin Otte's avatar Benjamin Otte

menu: Deprecate GtkTearoffMenuItem

parent 165fc241
......@@ -104,7 +104,6 @@
#include "gtkmenuprivate.h"
#include "gtkmenuitemprivate.h"
#include "gtkmenushellprivate.h"
#include "gtktearoffmenuitem.h"
#include "gtkwindow.h"
#include "gtkbox.h"
#include "gtkscrollbar.h"
......@@ -113,6 +112,11 @@
#include "gtkwidgetprivate.h"
#include "gtkintl.h"
#include "gtktypebuiltins.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtktearoffmenuitem.h"
#include "a11y/gtkmenuaccessible.h"
#define NAVIGATION_REGION_OVERSHOOT 50 /* How much the navigation region
......
......@@ -49,13 +49,17 @@
#include "gtkmenushellprivate.h"
#include "gtkmenuprivate.h"
#include "gtkmnemonichash.h"
#include "gtktearoffmenuitem.h"
#include "gtkwindow.h"
#include "gtkprivate.h"
#include "gtkintl.h"
#include "gtktypebuiltins.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtktearoffmenuitem.h"
#include "a11y/gtkmenushellaccessible.h"
#define MENU_SHELL_TIMEOUT 500
#define PACK_DIRECTION(m) \
......
......@@ -26,6 +26,8 @@
#include "config.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtkmenuprivate.h"
#include "gtkmenuitemprivate.h"
#include "gtktearoffmenuitem.h"
......@@ -50,6 +52,9 @@
* as a dotted line which has a left pointing arrow graphic indicating that
* the tearoff menu can be reattached. Activating it will erase the tearoff
* menu window.
*
* <note>#GtkTearoffMenuItem is deprecated and should not be used in newly
* written code. Menus are not meant to be torn around.</note>
*/
......@@ -82,6 +87,9 @@ G_DEFINE_TYPE (GtkTearoffMenuItem, gtk_tearoff_menu_item, GTK_TYPE_MENU_ITEM)
* Creates a new #GtkTearoffMenuItem.
*
* Returns: a new #GtkTearoffMenuItem.
*
* Deprecated: 3.4: #GtkTearoffMenuItem is deprecated and should not be
* used in newly written code.
*/
GtkWidget*
gtk_tearoff_menu_item_new (void)
......
......@@ -37,6 +37,8 @@
G_BEGIN_DECLS
#ifndef GTK_DISABLE_DEPRECATED
#define GTK_TYPE_TEAROFF_MENU_ITEM (gtk_tearoff_menu_item_get_type ())
#define GTK_TEAROFF_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEAROFF_MENU_ITEM, GtkTearoffMenuItem))
#define GTK_TEAROFF_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEAROFF_MENU_ITEM, GtkTearoffMenuItemClass))
......@@ -72,6 +74,8 @@ struct _GtkTearoffMenuItemClass
GType gtk_tearoff_menu_item_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_tearoff_menu_item_new (void);
#endif /* GTK_DISABLE_DEPRECATED */
G_END_DECLS
#endif /* __GTK_TEAROFF_MENU_ITEM_H__ */
......@@ -38,7 +38,6 @@
#include "gtktreemenu.h"
#include "gtkmarshalers.h"
#include "gtkmenuitem.h"
#include "gtktearoffmenuitem.h"
#include "gtkseparatormenuitem.h"
#include "gtkcellareabox.h"
#include "gtkcellareacontext.h"
......@@ -47,6 +46,8 @@
#include "gtkmenushellprivate.h"
#include "gtkprivate.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtktearoffmenuitem.h"
/* GObjectClass */
static GObject *gtk_tree_menu_constructor (GType type,
......
......@@ -43,12 +43,13 @@
#include "gtkmenutoolbutton.h"
#include "gtkseparatormenuitem.h"
#include "gtkseparatortoolitem.h"
#include "gtktearoffmenuitem.h"
#include "gtktoolbar.h"
#include "gtkuimanager.h"
#include "gtkwindow.h"
#include "gtkprivate.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtktearoffmenuitem.h"
/**
* SECTION:gtkuimanager
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment