[gtk+/gtk-2.90] Deprecate GtkInputDialog
- From: Christian Dywan <cdywan src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2.90] Deprecate GtkInputDialog
- Date: Fri, 16 Oct 2009 14:21:54 +0000 (UTC)
commit 80c55c851f1a3a223ab4668ef1fad447994e4e0b
Author: Christian Dywan <christian twotoasts de>
Date: Fri Oct 16 16:05:13 2009 +0200
Deprecate GtkInputDialog
Deprecate the widget and adjust the documentation.
https://bugzilla.gnome.org/show_bug.cgi?id=594903
docs/reference/gdk/tmpl/input_devices.sgml | 7 +------
docs/reference/gtk/tmpl/gtkinputdialog.sgml | 17 ++++++-----------
gtk/Makefile.am | 1 -
gtk/gtk.h | 1 -
gtk/gtk.symbols | 2 ++
gtk/gtkinputdialog.h | 8 +++-----
6 files changed, 12 insertions(+), 24 deletions(-)
---
diff --git a/docs/reference/gdk/tmpl/input_devices.sgml b/docs/reference/gdk/tmpl/input_devices.sgml
index 21a2fa1..b905921 100644
--- a/docs/reference/gdk/tmpl/input_devices.sgml
+++ b/docs/reference/gdk/tmpl/input_devices.sgml
@@ -57,12 +57,7 @@ devices without having to keep track of complicated per-device
settings.
</para>
<para>
-Various aspects of each device may be configured. The easiest way of
-creating a GUI to allow the user to configure such a device
-is to use the #GtkInputDialog widget in GTK+.
-However, even when using this widget, application writers
-will need to directly query and set the configuration parameters
-in order to save the state between invocations of the application.
+Various aspects of each device may be configured.
The configuration of devices is queried using gdk_devices_list().
Each device must be activated using gdk_device_set_mode(), which
also controls whether the device's range is mapped to the
diff --git a/docs/reference/gtk/tmpl/gtkinputdialog.sgml b/docs/reference/gtk/tmpl/gtkinputdialog.sgml
index 99021b8..e17b244 100644
--- a/docs/reference/gtk/tmpl/gtkinputdialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkinputdialog.sgml
@@ -5,15 +5,6 @@ GtkInputDialog
Configure devices for the XInput extension
<!-- ##### SECTION Long_Description ##### -->
-<para>
- NOTE this widget is considered too specialized/little-used for
- GTK+, and will in the future be moved to some other package. If
- your application needs this widget, feel free to use it, as the
- widget does work and is useful in some applications; it's just not
- of general interest. However, we are not accepting new features for
- the widget, and it will eventually move out of the GTK+
- distribution.
-</para>
<para>
#GtkInputDialog displays a dialog which allows the user
@@ -32,6 +23,9 @@ No actions are bound to these by default.
The changes that the user makes take effect
immediately.
</para>
+<para>
+As of GTK+ 2.20, #GtkInputDialog has been deprecated since it is too specialized.
+</para>
<!-- ##### SECTION See_Also ##### -->
<para>
@@ -55,6 +49,7 @@ to #GDK_MODE_ENABLED.
@inputdialog: the object which received the signal.
@deviceid: The ID of the newly disabled device.
+ Deprecated: 2.20: Don't use this widget anymore.
<!-- ##### SIGNAL GtkInputDialog::enable-device ##### -->
<para>
@@ -65,6 +60,7 @@ mode of a device from #GDK_MODE_DISABLED to a
@inputdialog: the object which received the signal.
@deviceid: The ID of the newly enabled device.
+ Deprecated: 2.20: Don't use this widget anymore.
<!-- ##### FUNCTION gtk_input_dialog_new ##### -->
<para>
@@ -72,5 +68,4 @@ Creates a new #GtkInputDialog.
</para>
@Returns: the new #GtkInputDialog.
-
-
+ Deprecated: 2.20: Don't use this widget anymore.
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 7b2dbba..4518053 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -233,7 +233,6 @@ gtk_public_h_sources = \
gtkimmodule.h \
gtkimmulticontext.h \
gtkinfobar.h \
- gtkinputdialog.h \
gtkinvisible.h \
gtkitem.h \
gtklabel.h \
diff --git a/gtk/gtk.h b/gtk/gtk.h
index aefff62..44453cd 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -113,7 +113,6 @@
#include <gtk/gtkimcontextsimple.h>
#include <gtk/gtkimmulticontext.h>
#include <gtk/gtkinfobar.h>
-#include <gtk/gtkinputdialog.h>
#include <gtk/gtkinvisible.h>
#include <gtk/gtkitem.h>
#include <gtk/gtklabel.h>
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 212dbf1..0e23df6 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -2107,10 +2107,12 @@ gtk_main_quit
#if IN_HEADER(__GTK_INPUTDIALOG_H__)
#if IN_FILE(__GTK_INPUTDIALOG_C__)
+#ifndef GTK_DISABLE_DEPRECATED
gtk_input_dialog_get_type G_GNUC_CONST
gtk_input_dialog_new
#endif
#endif
+#endif
#if IN_HEADER(__gtk_marshal_MARSHAL_H__)
#if IN_FILE(__gtk_marshal_MARSHAL_C__)
diff --git a/gtk/gtkinputdialog.h b/gtk/gtkinputdialog.h
index 4c1647b..6e95356 100644
--- a/gtk/gtkinputdialog.h
+++ b/gtk/gtkinputdialog.h
@@ -34,9 +34,7 @@
* distribution.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
+#ifndef GTK_DISABLE_DEPRECATED
#ifndef __GTK_INPUTDIALOG_H__
#define __GTK_INPUTDIALOG_H__
@@ -92,11 +90,11 @@ struct _GtkInputDialogClass
void (*_gtk_reserved4) (void);
};
-
GType gtk_input_dialog_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_input_dialog_new (void);
-
G_END_DECLS
#endif /* __GTK_INPUTDIALOG_H__ */
+
+#endif /* GTK_DISABLE_DEPRECATED */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]