Deprecate flag macros for toplevel, state, no window and composite child

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

diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 7fd86d666378a3df7fb4822d0ebd118e1e97cfc9..32e9ba2f37534c4f283226d4b1714a185f0d2769 100644 (file)
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -140,22 +140,30 @@ typedef enum
 
 /* Macros for extracting various fields from GtkWidget and GtkWidgetClass.
  */
+#ifndef GTK_DISABLE_DEPRECATED
 /**
  * GTK_WIDGET_TYPE:
  * @wid: a #GtkWidget.
  *
  * Gets the type of a widget.
+ *
+ * Deprecated: 2.20: Use G_OBJECT_TYPE() instead.
  */
 #define GTK_WIDGET_TYPE(wid)             (GTK_OBJECT_TYPE (wid))
+#endif
 
 /**
  * GTK_WIDGET_STATE:
  * @wid: a #GtkWidget.
  *
  * Returns the current state of the widget, as a #GtkStateType.
+ *
+ * Deprecated: 2.20: Use gtk_widget_get_state() instead.
  */
 #define GTK_WIDGET_STATE(wid)            (GTK_WIDGET (wid)->state)
+/* FIXME: Deprecating GTK_WIDGET_STATE requires fixing GTK internals. */
 
+#ifndef GTK_DISABLE_DEPRECATED
 /**
  * GTK_WIDGET_SAVED_STATE:
  * @wid: a #GtkWidget.
@@ -165,8 +173,11 @@ typedef enum
  * The saved state will be restored when a widget gets sensitive
  * again, after it has been made insensitive with gtk_widget_set_state()
  * or gtk_widget_set_sensitive().
+ *
+ * Deprecated: 2.20: Do not used it.
  */
 #define GTK_WIDGET_SAVED_STATE(wid)      (GTK_WIDGET (wid)->saved_state)
+#endif
 
 
 /* Macros for extracting the widget flags from GtkWidget.
@@ -176,24 +187,34 @@ typedef enum
  * @wid: a #GtkWidget.
  *
  * Returns the widget flags from @wid.
+ *
+ * Deprecated: 2.20: Do not use it.
  */
 #define GTK_WIDGET_FLAGS(wid)            (GTK_OBJECT_FLAGS (wid))
+/* FIXME: Deprecating GTK_WIDGET_FLAGS requires fixing GTK internals. */
 
+#ifndef GTK_DISABLE_DEPRECATED
 /**
  * GTK_WIDGET_TOPLEVEL:
  * @wid: a #GtkWidget.
  *
  * Evaluates to %TRUE if the widget is a toplevel widget.
+ *
+ * Deprecated: 2.20: Use gtk_widget_is_toplevel() instead.
  */
 #define GTK_WIDGET_TOPLEVEL(wid)         ((GTK_WIDGET_FLAGS (wid) & GTK_TOPLEVEL) != 0)
+#endif
 
 /**
  * GTK_WIDGET_NO_WINDOW:
  * @wid: a #GtkWidget.
  *
  * Evaluates to %TRUE if the widget doesn't have an own #GdkWindow.
+ *
+ * Deprecated: 2.20: Use gtk_widget_get_has_window() instead.
  */
 #define GTK_WIDGET_NO_WINDOW(wid)        ((GTK_WIDGET_FLAGS (wid) & GTK_NO_WINDOW) != 0)
+/* FIXME: Deprecating GTK_WIDGET_NO_WINDOW requires fixing GTK internals. */
 
 /**
  * GTK_WIDGET_REALIZED:
@@ -302,14 +323,17 @@ typedef enum
  * mechanism.
  */
 #define GTK_WIDGET_RC_STYLE(wid)         ((GTK_WIDGET_FLAGS (wid) & GTK_RC_STYLE) != 0)
-
+#ifndef GTK_DISABLE_DEPRECATED
 /**
  * GTK_WIDGET_COMPOSITE_CHILD:
  * @wid: a #GtkWidget.
  *
  * Evaluates to %TRUE if the widget is a composite child of its parent.
+ *
+ * Deprecated: 2.20: Use the "composite-child" property instead.
  */
 #define GTK_WIDGET_COMPOSITE_CHILD(wid)          ((GTK_WIDGET_FLAGS (wid) & GTK_COMPOSITE_CHILD) != 0)
+#endif
 
 /**
  * GTK_WIDGET_APP_PAINTABLE:
@@ -777,14 +801,6 @@ void          gtk_widget_size_allocate       (GtkWidget           *widget,
 void       gtk_widget_get_desired_size    (GtkWidget           *widget,
                                           GtkRequisition      *minimum_size,
                                           GtkRequisition      *natural_size);
-void       gtk_widget_get_height_for_width(GtkWidget           *widget,
-                                          gint                 width,
-                                          gint                *minimum_height,
-                                          gint                *natural_height);
-void       gtk_widget_get_width_for_height(GtkWidget           *widget,
-                                          gint                 height,
-                                          gint                *minimum_width,
-                                          gint                *natural_width);
 void       gtk_widget_get_child_requisition (GtkWidget        *widget,
                                             GtkRequisition    *requisition);
 void      gtk_widget_add_accelerator     (GtkWidget           *widget,