Commit a4cd4535 authored by Matthias Clasen's avatar Matthias Clasen
Browse files

Don't mention GdkDeviceManager in docs

It is going away.
parent 480ea400
...@@ -32,12 +32,12 @@ ...@@ -32,12 +32,12 @@
* SECTION:gdkdevice * SECTION:gdkdevice
* @Short_description: Object representing an input device * @Short_description: Object representing an input device
* @Title: GdkDevice * @Title: GdkDevice
* @See_also: #GdkDeviceManager * @See_also: #GdkSeat
* *
* The #GdkDevice object represents a single input device, such * The #GdkDevice object represents a single input device, such
* as a keyboard, a mouse, a touchpad, etc. * as a keyboard, a mouse, a touchpad, etc.
* *
* See the #GdkDeviceManager documentation for more information * See the #GdkSeat documentation for more information
* about the various kinds of master and slave devices, and their * about the various kinds of master and slave devices, and their
* relationships. * relationships.
*/ */
...@@ -1375,7 +1375,7 @@ get_native_grab_event_mask (GdkEventMask grab_mask) ...@@ -1375,7 +1375,7 @@ get_native_grab_event_mask (GdkEventMask grab_mask)
* gdk_device_grab: * gdk_device_grab:
* @device: a #GdkDevice. To get the device you can use gtk_get_current_event_device() * @device: a #GdkDevice. To get the device you can use gtk_get_current_event_device()
* or gdk_event_get_device() if the grab is in reaction to an event. Also, you can use * or gdk_event_get_device() if the grab is in reaction to an event. Also, you can use
* gdk_device_manager_get_client_pointer() but only in code that isn’t triggered by a * gdk_seat_get_pointer() but only in code that isn’t triggered by a
* #GdkEvent and there aren’t other means to get a meaningful #GdkDevice to operate on. * #GdkEvent and there aren’t other means to get a meaningful #GdkDevice to operate on.
* @window: the #GdkWindow which will own the grab (the grab window) * @window: the #GdkWindow which will own the grab (the grab window)
* @grab_ownership: specifies the grab ownership. * @grab_ownership: specifies the grab ownership.
......
...@@ -93,10 +93,9 @@ typedef enum ...@@ -93,10 +93,9 @@ typedef enum
* be an associated focus indicator on the screen. * be an associated focus indicator on the screen.
* @GDK_DEVICE_TYPE_SLAVE: Device is a slave (or physical) device. * @GDK_DEVICE_TYPE_SLAVE: Device is a slave (or physical) device.
* @GDK_DEVICE_TYPE_FLOATING: Device is a physical device, currently not attached to * @GDK_DEVICE_TYPE_FLOATING: Device is a physical device, currently not attached to
* any virtual device. * any seat.
* *
* Indicates the device type. See [above][GdkDeviceManager.description] * Indicates the device type.
* for more information about the meaning of these device types.
*/ */
typedef enum { typedef enum {
GDK_DEVICE_TYPE_MASTER, GDK_DEVICE_TYPE_MASTER,
......
...@@ -50,20 +50,17 @@ ...@@ -50,20 +50,17 @@
* *
* - To manage and provide information about input devices (pointers and keyboards) * - To manage and provide information about input devices (pointers and keyboards)
* *
* - To manage and provide information about the available #GdkMonitors * - To manage and provide information about output devices (monitors)
* *
* GdkDisplay objects are the GDK representation of an X Display, * GdkDisplay objects are the GDK representation of a workstation, consisting
* which can be described as a workstation consisting of * of a keyboard, a pointing device (such as a mouse) and one or more screens.
* a keyboard, a pointing device (such as a mouse) and one or more *
* screens. * Most of the input device handling has been factored out into separate #GdkSeat
* It is used to open and keep track of various GdkMonitor objects * objects. Every display has a one or more seats, which can be accessed with
* currently instantiated by the application. It is also used to * gdk_display_get_default_seat() and gdk_display_list_seats().
* access the keyboard(s) and mouse pointer(s) of the display. *
* * Output devices are represented by #GdkMonitor objects, which can be accessed
* Most of the input device handling has been factored out into * with gdk-display_get_monitor() and similar APIs.
* the separate #GdkDeviceManager object. Every display has a
* device manager, which you can obtain using
* gdk_display_get_device_manager().
*/ */
enum enum
......
Supports Markdown
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